From 7c9154f31d4b9622343bb3e9df4499a3d19099fa Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Thu, 21 Sep 2023 13:59:11 +0000
Subject: [PATCH 01/28] Passing on all non-corpus tests

---
 ...da0d96e1d1296182b6818ba28cf8603a22ae3.json | 120 +++-
 ...b19a44b16074bb1322d9d25512abfe121daff.json | 120 +++-
 ...19b8455bdc9522d984d038cc104096619802b.json |  85 ++-
 ...b275e6ffa699466621733a7e0ff7e2d01bd19.json | 120 +++-
 ...687967c45f710b5f5b53ea6cfcdef2d2c48c0.json | 120 +++-
 ...50e32edc1062fcc9522332e894cdad594b139.json | 120 +++-
 ...bc58b487d6a1ae58c2472ef0c51b282c17e65.json | 120 +++-
 ...3d83d9b74ad8b57acbfd9771edf5e55421ec8.json |  90 ++-
 ...2e411e8989f19f3282f9c840c90a53b6d43b0.json | 120 +++-
 ...7f1506d505e1f9364e4379bbeeb8d8b38d482.json | 120 +++-
 ...9370f4834c9c70ceb5837b847673e05b4d111.json | 120 +++-
 ...2a267879d14f88be8deb00f1ad2c8bc504daf.json | 120 +++-
 ...b2efb0a033854325d8cb0380655592b5ee0e1.json | 120 +++-
 ...d24aa9ce1072ccc65dddfcd8b1a7e375787a6.json | 120 +++-
 ...a72e766e49cbee2a3142b67d97e199dcec2ce.json | 120 +++-
 ...1a89fbf150dd7b0577a17c0e4ab3d89e59b34.json | 120 +++-
 ...083f3b76fbddceb11ebd87326cc2d9bc5a6aa.json | 120 +++-
 ...16a6d495ee188df2575a8539c351fe235ad58.json | 120 +++-
 ...49223197987f55c4eb3a434db07b1d23a377a.json | 120 +++-
 ...fc16957f384b0168838937ca001e56f6b2eb6.json | 120 +++-
 ...2fe2400dc489f2e65e374b47c55ca6bce99b7.json | 120 +++-
 ...831a33c04c85f8cf1efe16875826a19fc5cc5.json | 120 +++-
 ...3a890a7c564ed07a4df40f8d745880de33071.json | 120 +++-
 ...b9ef9898f3e8cc9ea967e5a05677582eca81e.json | 120 +++-
 ...49e575600a4072cf52de8a144d1c88ec8ad91.json |  40 +-
 ...28ca780763f86b2c24cfdbd7a98bc0df23e2d.json | 120 +++-
 ...6cff06b0efb65d458965ce9095ec86f759608.json | 120 +++-
 ...0b20e062093c32358fa6b1e78f8221aaedb96.json | 120 +++-
 ...991841bc058457fde347ac473efe52a2b0999.json | 120 +++-
 ...d38f3357bc4079ecf1dc9fff65f6c695727fd.json | 120 +++-
 ...7827b0c8f44d3f517ac0c52409b0a80996b39.json | 120 +++-
 ...c5a37b575d3dbabeaae9997b2f94c42061491.json | 120 +++-
 ...a21c759ff09b3dae102ad967195f336889551.json | 120 +++-
 ...b8774dce503da2421cd6d038f69c5601734bc.json | 120 +++-
 ...4bae36ea3c93f493e67cc4c72c44f50889906.json | 120 +++-
 ...a1bcd7902c19b6eeb3d710d3dcc6d68618ce8.json | 120 +++-
 ...ed1c2d50c473008af7815d07cc9326fe67aa0.json | 120 +++-
 ...ed0f7d7a47846d5c8d26f0a33e25d33c14b64.json | 120 +++-
 ...26f78ef331236ebc0b35ddddd77765e90c719.json | 120 +++-
 ...ed0c2a3b26e996cd9857050b5cb568f3c55a4.json | 120 +++-
 ...5cc85e0bfd0be2cb5ee9732223370e8137faa.json | 120 +++-
 ...eb561e42a4b8f2775ceae9a4732013813160b.json | 120 +++-
 ...ebaed8129359774e0f4012e4064f8afa592cd.json | 120 +++-
 ...9688d1657ab7c11fe5e9cab8cd3bdeabf40a7.json | 120 +++-
 ...975dcdf0bf583ff3e5326f7cbeeb9359aa016.json | 120 +++-
 ...ad2040eed9fcf9c742a76d0cdba45c413e4ed.json | 120 +++-
 ...2ad216c4c962428c4e1f6f94a1db8247af415.json | 120 +++-
 ...6d9d020ff8d224d8108b8b626d0d96cf5c696.json | 120 +++-
 ...021d379ba0cc92ffbb243a9024b20a9dac326.json | 120 +++-
 ...93ed14b5d21cc49f2e9e5ec072467bb247284.json | 120 +++-
 ...152a71ffade6c368d2ac46d9eb3782373911d.json | 120 +++-
 ...f234c0c72dc1f8e3ccbd93f4b03820a6c11f5.json | 120 +++-
 ...909fdcb280e369e36bfc125632c8898d151af.json | 120 +++-
 ...8a8cfabada6bb90447010829e8e73fc84580d.json | 120 +++-
 ...f51dc66ab2eaaa92c7afafc54bdf533d386a2.json | 120 +++-
 ...1f9d8ec765af8242685b3dce67d7b4f358ec2.json | 120 +++-
 ...b486148964f32e28607e08eb5d34c5c37c382.json | 120 +++-
 ...8cceb544b3bfcb7069ef1840a5147c926c4d6.json | 120 +++-
 ...c7ab83766f808626cd347840932ef74ed67a8.json | 120 +++-
 ...00c1c65e96341b3eef33c68658af8078fd824.json | 120 +++-
 ...9650f3af53764ac1783c8e7e6d57b54114ec5.json | 120 +++-
 ...d19004f5dc68c8707347fab6f817bc33f0df3.json | 120 +++-
 ...97eac230b3d3f0877670ac672eaeff6b040b0.json | 120 +++-
 ...fa6486228632965012d5656e4af0bbd08b4fa.json | 120 +++-
 ...0aa0f6afb81dfd4b5b00b97a02783c9337d10.json | 120 +++-
 ...833aed4e31e2f3e0acc0e3026ea9f7c020fc6.json | 120 +++-
 ...ba12b4f5c65c43dd6f6ec2ba0e59642149b25.json | 120 +++-
 ...68b2aeb2e68c3e39d7ef30236da0ceb720de0.json | 120 +++-
 ...4deab2631977826e591319301567a917009b8.json | 120 +++-
 ...6db1af99d55f35cde7641356a729d7dd01a6b.json | 120 +++-
 ...51e320de150e9a7bcfbaa0b1c3256e4025cec.json | 120 +++-
 ...9dd819ecf631af113d714801745fd24192814.json | 120 +++-
 ...2da6b4da559794a2106d47bb08defa83df7e5.json | 120 +++-
 ...e9d198c15f603144afd42693151c4f63c4f15.json | 120 +++-
 ...286518e9d6c03de240d7e672e4412411473f8.json | 120 +++-
 ...0677b3f0180d3edc9e4e2b9247c20fe6667cd.json | 120 +++-
 ...7f53251425c9d8f3f0bcb9ececdfbe65fbaac.json | 120 +++-
 ...181d83134f6a128eacb2e9bda0c54197e0d50.json | 120 +++-
 ...49feb22c3085af29fe1f1a49a47ebea0fc72e.json | 100 +++-
 ...e0114ef0d24841bd57f41a5914cbc114184dc.json | 120 +++-
 ...ca9afefa830d3be46d7e7cf1017e5b4ac3d08.json | 120 +++-
 ...4a052045072582b439dc5c9b80a3d8bb97296.json | 120 +++-
 ...777cdd6151d7e1f444ff3ac045d45e99de86f.json | 120 +++-
 ...67b79cc920e0feaf83ea234081b5ed3e76fa5.json | 120 +++-
 ...a5ddcbb4629791f1793c7b0a683972bdbe0a6.json | 120 +++-
 ...04a6e9b059221d5f7cadc7c33b075f40fa27c.json | 120 +++-
 ...b41fe69138ffded4b2a80cf4615208b9ca7ca.json | 120 +++-
 ...af207b4203e78d906424710b02a535efc7e76.json | 120 +++-
 ...0cd1c61dd709bdeb1a9090b8a8f8f81a772d0.json | 120 +++-
 ...6a8756b45ab3f6d4b50050ef4e20452dcf49f.json | 120 +++-
 ...b180d44c3ea563be94afe3958632a3a4b6266.json | 120 +++-
 ...271720a5368c8cf8d56e70243f821ea755c58.json | 120 +++-
 ...8dad0b5a647ae0a7c1dd48d2bfb403009d4eb.json | 120 +++-
 ...7119feea9deb66035e5df79a86f4b7c8fa580.json | 120 +++-
 ...9380d0206e60dc83bc69a8f1802916f53f63a.json | 120 +++-
 ...62f9123a3f835c7dc1004515f79b1609d2e58.json | 120 +++-
 ...bd61ae5a54f7abc1890148c6f5b9c389afef8.json | 120 +++-
 ...7f6c224018df9fc00f3068dc4a4cb198b78e1.json | 120 +++-
 ...21ba46a7f2a9d02dc34b4f2876f50cb7eb4c5.json | 120 +++-
 ...6d747c763a5a1c6266cb4a4e7ae80cc8d6234.json | 120 +++-
 ...a95ae783b3b3350d89a013ec071fe2be8cdea.json | 120 +++-
 ...444f7ad4d486497918c7fcb74584bd6ae41b8.json | 120 +++-
 ...c7942e09695b70e209e67e8df5655de990003.json | 120 +++-
 ...926a401aafb1e4f5723ba817fd79792b4541b.json | 120 +++-
 ...baa21f1aaa8c1d6de2c2ae846a2ba15d9f84f.json |  40 +-
 ...ea06c714dbebcb199fd92684892b0df616040.json | 120 +++-
 ...da01fb6c34dcedb5838eec5c05901d946b6a8.json | 120 +++-
 ...f7c4afef4ace6a940adb20431810eb5925195.json | 120 +++-
 ...cd998b35b276ab130e82d0b618ed9ee17c343.json | 120 +++-
 ...2b4b025e0ef19724f6d8589d0786227300bb0.json | 120 +++-
 ...e1eaad04a5af7eef1d9a6f9052cbb6cc0c438.json | 120 +++-
 ...060b4ffba618daf4f70e4a718653493f1b3d9.json | 120 +++-
 ...63c6e406ca8e5bd9d4957af1c32cb531a23e6.json | 120 +++-
 ...9832d6fe60145fb72dd1421e11f29c6b8b666.json | 120 +++-
 ...4cf8b49a82bad491ded018f8acb6aaa8005dc.json | 120 +++-
 ...182b2ecd666d9f19c637648c660463069f3b1.json | 120 +++-
 ...9c78d7129da3081c0e775922e200814aec43c.json | 120 +++-
 ...a8d3f2768e2d6b9418905be71bb2b90b893db.json | 120 +++-
 ...2345b4a58a174e8bcc73f4426d04432a46493.json | 120 +++-
 ...80c2b5bf30ca368724495c797a520d073aa45.json | 120 +++-
 ...78b9a425393db10ad8b788501d61f44fdba5b.json | 120 +++-
 ...f76b366b2306738303807e1936a89f7f2762b.json | 120 +++-
 ...4e48d6330fa784673907ee1460d41a4e2659b.json | 120 +++-
 ...95d614c44c554c6f335fd59c6e95cbd0ad9cc.json | 120 +++-
 ...462189bb7ca5db202dc588306cc7785334710.json | 120 +++-
 ...8be36f22253120a30e9f784383e2be0b005e1.json | 120 +++-
 ...065cf3741fb0c5e55a960037b1a499946d27e.json | 120 +++-
 ...98c1a51be833bbaf6cb341851e2ff30a8223b.json | 120 +++-
 ...aa465818b2da2f72d88d491dbbb20d0fe58bb.json | 120 +++-
 ...24424e78073eb033bd799898f71cd5d022b0d.json | 120 +++-
 ...83b8120617ff2c6781d31c8c787af29d10bd7.json | 120 +++-
 ...8db927ec3f39159de65acbdf453fc0a2310b5.json | 120 +++-
 ...fbf832dfe0294b580b983ca1aecaa0ab3249f.json | 120 +++-
 ...43f50af0a75480ffdaceaf71b379e1d66df18.json | 120 +++-
 ...63f0ff844401488c49316ba8cb82f870c3caa.json | 120 +++-
 ...fc431b6957914aa4b850fb121510f470d316f.json | 120 +++-
 ...1103f55b41633bd2465963f25a783b98d46ac.json | 120 +++-
 ...538477382f362742140e665a05a6e99bd8191.json | 120 +++-
 ...5e61ef680e881f21af3c89ace6b019ec4f78b.json | 120 +++-
 ...41567b88033bb0775f7ad9bdef157ce618cd9.json | 120 +++-
 ...7c637ecffec277a3c3e60acb3ef3df4d6c508.json | 120 +++-
 ...d02adbd72854bf697fbfac04efd194b01775f.json | 120 +++-
 ...24eb0d0d15e8d7322eaaa3eff361b4dbe506a.json | 120 +++-
 ...71aaed3d2383487a702432cab7c1dab719c80.json | 120 +++-
 ...083371b5763682e22beff81ec7dc11208e336.json | 120 +++-
 ...9d084ecfec7fa9186c8d8ebfaed6f289d346f.json |  40 +-
 ...321bd733beac1a5d200b39f1b1bf3b4009275.json | 120 +++-
 ...da68a1884c31cd8bfdd2e7a2ac5e9a3ddea7c.json | 120 +++-
 ...37047727ca7d0c2d7ce7be3a30d78e25c1313.json | 120 +++-
 ...4af6121f7ff5362748cebac0a29ed0c9c62b6.json | 120 +++-
 ...db4c31a471e0e6e4fa5eab01e3edf73aeb2af.json | 120 +++-
 ...049e91f396ebf938fb47fd7f0432b4db1e2b0.json | 120 +++-
 ...992ac81a16c5bba204e9ba8e7b5b4f15f3c49.json | 120 +++-
 ...fd4b64989cfb9967626b279b90ef46cf8fe5d.json | 120 +++-
 ...8dd8f9f3eb287902c3fb4936841d8a2415a58.json | 120 +++-
 ...466057a2b0d393044c1cb000aea4a624cb320.json | 120 +++-
 ...1549a1d0b75951d202ad6bad25c85a594bba8.json |  80 ++-
 ...4b70eb7f065316e50f3a750afbbf6e9c242ee.json | 120 +++-
 ...5a63e1055ea02e36e593a0c57620b26341c5f.json | 120 +++-
 ...68072f20aabadd9a184797bf67efb9c07ad98.json | 120 +++-
 ...277820fc165579ff72b027629c616ef7a1708.json | 120 +++-
 ...a22b9e2eae9a5db91db8c064db7dbc4976235.json | 120 +++-
 ...6d594c30461a66c4b4de040aae25480691034.json | 120 +++-
 ...e3581f3ffda7cc77969e6876952e8b36806d5.json | 120 +++-
 ...44f45cb8cddea6e0db0604a9ef71731a517cc.json | 120 +++-
 ...84086f0fb865ed25ea07f776b9882c39624f4.json | 120 +++-
 ...43877edec804d9108a7f1030dd6bf625d2f96.json | 120 +++-
 ...0e254d6158bdeefa9ac394b9721b87c26d20b.json | 120 +++-
 ...022020bf2be6068a0dcb7e9e9184dc855d5d8.json |  40 +-
 ...6848b2ef612f366035575c1c9557a4688746b.json | 120 +++-
 ...c563d980fdc60cd35b4446cf175798ab1733d.json | 120 +++-
 ...ee2407bdd9f8f63baa8d55a8044d5b0b60069.json | 120 +++-
 ...acc4c653f5f2d95123532747b774eee13f840.json | 120 +++-
 ...23ce573215d221a260ab089a3eade7736dccf.json | 120 +++-
 ...ffea7904c3d95cbc5e489417c331004b8b10d.json | 120 +++-
 ...5f1424d35a2cbe0426ad84c57761d16f5637c.json | 120 +++-
 ...cbb29df5f7f28be216376e2fa55fb1bb28403.json | 120 +++-
 ...be4b90f1e0114f2201dbe7bbf8e943cf7bd00.json | 120 +++-
 ...2ee43424d84ac48ec1b2b43975b8adc7d5687.json | 120 +++-
 ...3f18a65dafe6bc111ad12c0de50aa56bf5179.json | 120 +++-
 ...56e7301e522fcea1df4a95ae0ef13cc16f2ee.json | 120 +++-
 ...ac84a704c0e014cdc1fa3265d08a23a0634f8.json | 120 +++-
 ...382ff356028e27023a3d08c87e642619f6fb6.json | 120 +++-
 ...a749b84fb1394652f7860174b0eeff142774f.json | 120 +++-
 ...c15353c3261b6f53162583408aebbf8d259e8.json | 120 +++-
 ...1c9469c2df291a3ad39308ebd42a2a7c41092.json | 120 +++-
 ...73ec0a248a595b1dde9b9a357404233b05583.json | 120 +++-
 ...4edb50fe03f03ae8ff1b2c65d81471b079062.json | 120 +++-
 ...6d0ecf8bcdccadcf11f9c01742360b1f5cbfd.json | 120 +++-
 ...e4a8ba9c69657e4f1a7ea2f7e52f4aa11cbde.json | 120 +++-
 ...3773bd41281fd1ef4bad379b0f734ee9fe4b2.json | 120 +++-
 ...81f57e323f996e54685db960cb28ae80301ad.json | 120 +++-
 ...b0b533527c47fb8e910f2df27351817ca364b.json | 120 +++-
 ...16f9503f9b1bfbca657dac937d7ff65e1c357.json | 120 +++-
 ...fb0d25adfd0ba48b9759273247ce82f8da3e5.json | 120 +++-
 ...0dbcb9b9121975d3398e1e6a2893b6361cbea.json | 120 +++-
 ...eee047b45a55f065f42609975d13466df1003.json | 120 +++-
 ...a004e023d395b498c548942b5706371bd5e58.json | 120 +++-
 ...03b58dcbee74c4827290d2f66cd4040b54e09.json |  50 +-
 ...80dedb574067e8fe1339c0f36c2c31fe2930e.json | 120 +++-
 ...a9bd1fc711d24a412baf0ab811a2052bb4e9b.json | 120 +++-
 ...2fd9578557687c21fad0da1757d106731d0bb.json | 120 +++-
 ...2151e17c381a5fa3d8934a5ba360339968f04.json | 120 +++-
 ...2f99bd2bca10ab16f9f78768fdd849c1f930a.json | 120 +++-
 ...c86e06597f6e0416b884fc15a81bffa608603.json | 120 +++-
 ...bef5a05ccc64ef430dc86f6dc9a6254170eaf.json | 120 +++-
 ...e63b6ddd9405b01a3d922b3999147beac2fa9.json | 120 +++-
 ...b056842fdd78326d60a76db6c9ac2ca096d4a.json | 120 +++-
 ...41b1bc18a6b2b3f1ec00b9781f18a1dfe9dd3.json | 120 +++-
 ...be35f573d7d1955f3a95af4f940cc6f4fe290.json | 120 +++-
 ...6c9706239dd78335e11047422d3beb0ca799b.json | 120 +++-
 ...f3648c4747c20ca5a99a1859e68a8feac3c1a.json | 120 +++-
 ...44ac1deaec0d3a28c91865339f159bc69bb89.json | 120 +++-
 ...5d214b5fa238610b6e3b5e0376f9e30de9220.json | 120 +++-
 ...477303c48393a52f4d9b02581a9c8d70b7b4e.json | 120 +++-
 ...bfd4adae9475431f26acad714a64fb10bb048.json | 120 +++-
 ...a47630d60a4aa8f8e54b61d736d8952c4a7f9.json | 120 +++-
 ...e07c987be353018d565e8e6efd95c7c100ef5.json | 120 +++-
 ...77d26bdaecebb3d618c30dd7055ed9373eab2.json | 120 +++-
 ...2fbd08967045da86af33b2147cb4305f65ca2.json | 120 +++-
 ...8b3c7fb59a601bc5818c21286e9e25742e0b5.json | 120 +++-
 ...d5f5214b3fa3fe3e118070ab74295dd0c9fd7.json | 120 +++-
 ...90bbf8422f2532c15c37a5f34dd6c28814fb8.json | 120 +++-
 ...dc14823e42409dac2149cd417c42a96ad49e1.json | 120 +++-
 ...58d5fc152aec138c91355f29f55459971ad7a.json | 120 +++-
 ...4f15aa3b7c011ba1e7c57d79d6b131f9f64a3.json | 120 +++-
 ...6650d46522897c4be29fc10851c277273823e.json | 120 +++-
 ...71f1bcb3e7db91651dda47425d30e8fa717c0.json | 120 +++-
 ...b0697d387aa2a2b379ef1ed3c46c03dac89cb.json | 120 +++-
 ...037b53e5039a2617c7dc68486cb12cc43e43e.json | 120 +++-
 ...07785df28376a2976a62ec8185f2b73df5c07.json | 120 +++-
 ...9b21f34c47ce718869777f6bec7341de7e0b8.json | 120 +++-
 ...abd401950859a4fc3fe5f82182ed5cd403d17.json | 120 +++-
 ...79e33ffcbb24ecc0309855ce390a342c7cbb1.json | 120 +++-
 ...e92bfe69a4c847df6ca869e01c1ac1038e5e9.json | 120 +++-
 ...55fc1b09948347a10b2517a2bb436c6451bb6.json | 120 +++-
 ...801b00e79ed2e44f08cc699ca7e766266fbf5.json | 120 +++-
 ...48e4b0b465a544b92e1a913262948f0a1fa97.json | 120 +++-
 ...8e1594f18009a1088a3f3d460896119ae245e.json | 120 +++-
 ...b42e8b0c7232dfbe275d0b03c7fb0be5f1888.json | 120 +++-
 ...d0a749445ed17a1000b585509607fc2b87a7f.json | 120 +++-
 ...12bec5e1fe2fbc923f91bf85875f7f8a4ddc4.json | 120 +++-
 ...4a182031e98aa6a6fca4afeb5e43b150a3886.json | 120 +++-
 ...ca6533b288f8a0bc952f5777475b38eba2a54.json | 120 +++-
 ...dab875772d1225e1517bed1634f565ce97b02.json | 120 +++-
 ...92ff0f6ef3d799723c536734d846d1c78a197.json | 120 +++-
 ...5fa6f8a865d109cc7e2da855040ee80099c9b.json | 120 +++-
 ...aa19c98e274060191f11f908374c00596c59d.json | 120 +++-
 ...25a30760c363b387849a8c4c3cbba75313ec0.json | 120 +++-
 ...aa374664b3c61ac0316bde4984195fa29ab2d.json | 120 +++-
 ...b45d00bcb1c2429e428ea268f631fa5ef626e.json | 120 +++-
 ...501e7afe41f99231f469c48b00c0971e7ba84.json | 120 +++-
 ...7f2d0faf23489ec76added7882c5cedb16fa7.json | 120 +++-
 ...504c448b53f0ca04eec7c7c2e95bbe6349146.json | 120 +++-
 ...1025a6f4b8a759b0234cec2a64f21d7f31f4c.json | 120 +++-
 ...a1a6ccec424d0c222eefee5d87bc6e2988797.json | 120 +++-
 ...bea468a24ef02741251907f89fe5165b1b7b5.json | 120 +++-
 ...cda004d780b9da54d3d3740f66bb8d2773875.json | 120 +++-
 ...d63d81965dc91095e15c1828a492ceca7f219.json |  40 +-
 ...a1cab0ed510b921e1277889a891d845f19386.json | 120 +++-
 ...0fdd9c56f74f7ddf8ee29b2f7737a6e33a70d.json | 120 +++-
 ...149a4a8004219a52422f61df14589c83382ec.json | 120 +++-
 ...fea16c36dd7d47f341a225a0d128e5b55e255.json | 120 +++-
 ...a223b4f6b39933ab85bfd2f5412cda75d5580.json | 120 +++-
 ...751441be1af538d726a9dc0095d0d32a5a4e6.json | 120 +++-
 ...befc0cdc3ca369e50d8ad8e7e02fdd1ada405.json | 120 +++-
 ...d7265526991a750a796535cebd2affe962356.json | 120 +++-
 ...830fd9423f8de3ddc676eaea3bc442a68fe12.json | 120 +++-
 ...ae71ac571077560328329952bd2cc5744eafe.json | 120 +++-
 ...0bb0abe3e54013677dcccf7b04f96fb0be285.json | 120 +++-
 ...f63c71d3849f3100d4100b20c3da8832edc98.json | 120 +++-
 ...5cfcda5ecacf34130172e5c1d482f75c5ff03.json | 120 +++-
 ...957d677eb2e94f531e9a2807e533952572469.json | 120 +++-
 ...dc8ec66ae24655885489ce18e4e1ed8d8b0b9.json | 120 +++-
 ...71e9fbe9a6df39d7da362318dccc30c36afb1.json | 120 +++-
 ...efb74bf03f491d43ec29bc2370673d8cb9a7a.json | 120 +++-
 ...8898944b1db80f3d122e1c91357f0895940e8.json | 120 +++-
 ...91adf643671b6a56d0286918ffe88af4841eb.json | 120 +++-
 ...e7853fae2ea13998c5bbff4380fa4736d05bd.json | 120 +++-
 ...81f40923f9bed77b1554dd71f0c13d0d0a08d.json | 120 +++-
 ...96c657852232c265a56e24b9d12ee242fa477.json | 120 +++-
 ...2a33ec169a9d5d4f08602156ca79bcb9ae755.json | 120 +++-
 ...9b834ab5bcb99cdb7050100c28a9b421cf492.json | 120 +++-
 ...094e7c55158d15d4b8ad3a2900b44cacdd859.json | 120 +++-
 ...7da6826bf5a7404b811b6948b326725337f4c.json | 120 +++-
 ...a9fa0fb81c1ea84f2c745faa7437e42b691b5.json | 120 +++-
 ...423e730f2241a57e0c47d2966eedc87ad734c.json | 120 +++-
 ...58ad3bd458097fd0a19b29f16e2435339f87f.json | 120 +++-
 ...852068851eff3d2ac701a81ddc671e346f0fb.json | 120 +++-
 ...43a94a589a278779f275e33ce27df9bce935f.json | 120 +++-
 ...aecbeb520e625e4fb499d4020a6c66db79d3d.json | 120 +++-
 ...01921cf1b30900cab66e49cb20fea18b23cc3.json | 120 +++-
 ...2a0a79c92959ca359751d8de6dfbe1dc0babe.json | 120 +++-
 ...70a29a476251738d85165757de0a961c68f7b.json | 120 +++-
 ...4dc91a56bfaf8d12d58b647a0a7d6e51bd8ed.json | 120 +++-
 ...bc697e6a4307319167e11381a5264e8da8746.json | 120 +++-
 ...3948403ce9144fb57f1df45e657229368e1bb.json | 120 +++-
 ...0dbdef1754d180cb4858be9dcff0cd3be653e.json | 120 +++-
 ...fc2caecbcaf4c09a99ef3a2cc3f156112e495.json | 120 +++-
 ...f5976ba2de3e7a4113188816841635e7ce9ef.json | 120 +++-
 ...f8c5159544988a0b9a9e3cb449aabcbd76e19.json | 120 +++-
 ...730f03e17dff06a3b162a5bab74a5a8b443ef.json | 120 +++-
 ...1a9dd1edaeddb62b729a0f6b80e670300517b.json | 120 +++-
 ...208bd996226a839e67bb936b7a0311fa45e5f.json | 120 +++-
 ...3f67331b256fccd0dbf0e8cb616b64a5e2886.json | 120 +++-
 ...dc2f9cc6324fe07bec72a98ac623cbdecfa12.json | 120 +++-
 ...ef9bbd4a39187d62cd78bc8cff5db1d5c2703.json |  80 ++-
 ...eef893ce30fabc766d84a556edd70f9749fcb.json | 120 +++-
 ...f8405e4eb5dca742c420943a4d237a90f3dc7.json | 120 +++-
 ...ce51bfdf8340949c83d5216899ead6d0cff7b.json | 120 +++-
 ...de5fbaf5460864156bcda3ca470783782523f.json | 120 +++-
 ...149e2e167a7b8c67c06a68578c86e24971a67.json | 120 +++-
 ...5c0b59d4013ce1145e6f4fa165f847aae82f2.json | 120 +++-
 ...23549a312eb48a4a6d247e1d27bf876d9c394.json | 120 +++-
 ...bf1e01f710500d499dc15cc5b1ec2a663875d.json | 120 +++-
 ...47f49e49d76b32039604ef3b6a9a14db1d3b0.json | 120 +++-
 ...bd936f79ec4730edf3ff478298079d0f1c774.json | 120 +++-
 ...c6819d3964bdcc8380be582566d314be29903.json | 120 +++-
 ...4e6adb816e399febf4b58bee52dcf52408490.json | 120 +++-
 ...42aa8f44a1b4c9a9c4e0037eef0d324f50172.json | 120 +++-
 ...a78135f731d99845eb1db7002184213ff7a6c.json | 120 +++-
 ...cdc4abf5662a82a7f8503418b11e737369800.json | 120 +++-
 ...551a580d1c09170f5fbfbdfa1339d757e36e7.json | 120 +++-
 ...fc8d30b5448db2732113e3807647a0b3b8328.json | 120 +++-
 ...dfa7040e05eacefa4c9ad4ed26555beb7433e.json | 120 +++-
 ...0e80eded244e4e85d7bd1344cc621bee9e305.json | 120 +++-
 ...b27e3674a66cfe5e5dcd7b339a0a7b67298e5.json | 120 +++-
 ...8960eba87a93d580d9f308e89b94716cb1c4d.json | 120 +++-
 ...1dffdd3a1ea802e024b5dff4991ac868a2602.json | 120 +++-
 ...5e27e335e266ee0f5ca87b8e7d2d975de124d.json | 120 +++-
 ...7f98cc8cef0c9e1dff218f5a7ab0fdb3ba0f0.json | 120 +++-
 ...6680bbb9766c861069bf469051e43f6c6d9f8.json | 120 +++-
 ...b75efdada2eb6574fb25c99286236d7da72f1.json | 120 +++-
 ...4305f34656526ad76d538ca92a30f8dd7f787.json | 120 +++-
 ...89fa566a0c0200b65f768e03955cc56073945.json | 120 +++-
 ...87e74bf62f23c5d247dea697977b23720cc3c.json | 120 +++-
 ...815d620753bfc48df590b1e7e157ffd86932b.json | 120 +++-
 ...0d4d7f76a06f43f5fd89a323855b98dd33630.json | 120 +++-
 ...6de8a02febaf27017c36fda55b014df7f46c5.json | 120 +++-
 ...a9b80d12ea32a9c75a00947821df2bddbaf8a.json | 120 +++-
 ...dfe5d90bbcbfee44c1dcb1fa7300bb37ef9a2.json | 120 +++-
 ...9613909304c44134d611ad69d72b474ee46e3.json | 120 +++-
 ...c1dba8276b82395d85d8bff2da91103f9f272.json | 120 +++-
 ...240eadef0c867b6154d470b0e7182ffbca850.json | 120 +++-
 ...d42aeebe4235b607ec620224210d394e169b6.json | 120 +++-
 ...9f81f5953dccba2a97c7f97f4c5fc46be27ca.json | 120 +++-
 ...990f481360f9792cfb7c7c7feca7291cbc310.json | 120 +++-
 ...318d1185cadb972352f0fd6df3a6801b6df44.json | 120 +++-
 ...f0318003a5f7405d9be4285bcad0e73234cff.json | 120 +++-
 ...f61b4d81394cf50e3228ce1bce32da88862f5.json | 120 +++-
 ...c33ba490261b421556236cbdf3c8a78b02709.json | 120 +++-
 ...0428c0e69a6c0d117385bb428d90b87727d08.json | 120 +++-
 ...807e196ad66c1db5196b3a30992ada55b6d22.json | 120 +++-
 ...8b7ca6f5196693fd24c6f3cdbb627d8a2cfa7.json | 120 +++-
 ...2e49e789a6339ee9470e61ff03a3fd374b3a9.json | 120 +++-
 ...de146bf89ead70984d79c687672b07fe8688d.json | 120 +++-
 ...8dc2a745bacfb69d84c7787444decdaa2d5fe.json | 120 +++-
 ...a58c4e871e3d31a067809a98b1d6baae6af34.json |  50 +-
 ...1301f229f701463ccb88679111a6ee8ec5f3c.json | 120 +++-
 ...9f3fb4358bddc1dac1aa750ce1a17e8fed5ed.json | 120 +++-
 ...c8e39436421f57d284ffc9da9160e430d1748.json | 120 +++-
 ...4a36a832a2c109875c4482a1c757c07e7689a.json | 120 +++-
 ...94913231a0c1763cf0519062419837a2d57e8.json |  40 +-
 ...de9c2116b0f8e994c76ed68805f489f24046d.json | 120 +++-
 ...9ebc3065747fbc30b6ef8ff72d7c461aea32c.json | 120 +++-
 ...88a0d43f07656dd70781417c7bad5b05a4764.json | 120 +++-
 ...7da6b1d7c162c41f57c178ea845a2baf5d2bc.json | 120 +++-
 ...4dfebce65ae9a05be5d59bdc10ee5d4d756dc.json | 120 +++-
 ...14b2226b344165e2b0bfddda558ad08183d84.json | 120 +++-
 ...e55628e201183633520a571bee2ea8e44f70a.json | 120 +++-
 ...1eb9343c6973a49a3d8e09787970693505a0d.json | 120 +++-
 ...8127d570b3df790b767d9521379cebf56f2b0.json | 120 +++-
 ...1fcf284cdf4f1c53cb41c358b757918075cc0.json | 120 +++-
 ...fe4c1c5a135e45453f22f50bc144f1b576bd1.json | 120 +++-
 ...204acdefac94867af9dd006a51a4773709753.json | 120 +++-
 ...6d8b81ea7add70c41de29fa49a7eae2992fc1.json |  40 +-
 ...10c282d59af031138d9d5c4a34fb72ee09942.json | 120 +++-
 ...320fbd52194b13fa26e8f971001d9f710c4ed.json |  40 +-
 ...25f1656b5b6b58d6ab231ac5592c55781c0ba.json | 120 +++-
 ...6b7a23a22c49ff6d3b49e0ef9c41840c07441.json | 120 +++-
 ...55e64c93a32d13ae513181176d1769f7c9a61.json | 120 +++-
 ...580df8ad4aa5957fb8a24896dbf7fe4a1ef70.json | 120 +++-
 ...be7f7f0cf48c209b352eb056595af84119c3a.json | 120 +++-
 ...9e8d2f341ac0ed163d93913263a19a622fce2.json | 120 +++-
 ...3d32c802b205472c72110a5b81b20a505f7ef.json | 120 +++-
 ...71207f4cd211aa19031dedc06f50d8ca584cb.json | 120 +++-
 ...81612f6960c26ed5052ea9d78db86b326bb7b.json | 120 +++-
 ...a25af5b727ce4dd50a3f9fdb8065c1efc2d55.json | 120 +++-
 ...80e815e9862d1c3e514155ac87ae740a19216.json | 120 +++-
 ...6afb11e33926e2cb1dc54cf36e174ab7414e5.json | 120 +++-
 ...08a3dfbcbda787190470df772019a5f81d7d3.json | 120 +++-
 ...5c7c5f21236beb923bb3b497f21e215b05303.json | 120 +++-
 ...cae408ac4ec7cf82e19f801891541c54f8e44.json | 120 +++-
 ...68243eb643d9339793f4bc155ac2828ab860d.json | 120 +++-
 ...1176e99540ef52dd4daacf1eb70d71ecdce0b.json | 120 +++-
 ...04fbd0ca2eae78b2dff027d8c9a7278caf317.json | 120 +++-
 ...b1e469ee9944b3481a2a17500eff50f90fa8f.json | 120 +++-
 ...c2e23156d25cb6edb89b64ac639cce1d65bb3.json | 120 +++-
 ...7e31ddca44e918597c1626cd4e662328203ff.json | 120 +++-
 ...2b0bd7d31d589039ea349f2461b7a90c8238c.json | 120 +++-
 ...34a1db124f10d7f5cc0a12156f7d4de1545ab.json | 120 +++-
 ...059ed8326d059b6e6a00261c099c633d8efd1.json | 120 +++-
 ...634896540861f1eaa5dced860ca24b38ce552.json | 120 +++-
 ...e040244b04439e604f4bc68db039890f4fc15.json | 120 +++-
 ...7217c9c8e8d5aff2d052aa2047e5822b71b09.json | 120 +++-
 ...d68b4af7ad00f858003e793a209c2755563e6.json | 120 +++-
 ...a85d7813bf5e4eda9f5d796c838025e1e3695.json | 120 +++-
 ...951c32b8cc2ced0d43ee0387d8c3d4933f5ad.json |  40 +-
 ...1a82958bcbdb29cbf5f6484151423d17f73d8.json | 120 +++-
 ...c1d09710a15a2e915c4be60ec4c9755322cf1.json | 120 +++-
 ...e48d2cc7268c89f217b05d96c68087eebec1a.json | 120 +++-
 ...ffca287c3df90bc95ce6c90cc5fa524b6d997.json | 120 +++-
 ...07a276da82a88c7ca84ee7a2707e3dabb60e9.json | 120 +++-
 ...cf966b39a2e156d00c3d1bf96af90c89c0ee8.json | 120 +++-
 ...7d9c089f2d548fbe1dc274b9ea5a81a1bd482.json | 120 +++-
 ...6f048ecfe5ab938cea0224dac0a5b3e1fb998.json | 120 +++-
 ...9ae8abf6cbd88f196b47738a3eb19d6150691.json | 120 +++-
 ...c706ec30800296e59c197bc0b57cca67e690a.json | 120 +++-
 ...86215db8ab6f898e05b2d9d42da7a189d69ea.json | 120 +++-
 ...053c1416c941469f10c33aa234dc0245665d6.json | 120 +++-
 ...d7a1c10e8f73b07964cc389aeac2a26364f36.json | 120 +++-
 ...0eb97896da06eadf20906b9e82cd670e0eb62.json | 120 +++-
 ...e94546d3cebfdefdb52c437e3a7b91a38fcca.json | 120 +++-
 ...08515ed95ea8e4b5a58e5c06dc0233554f8bd.json | 120 +++-
 ...6d8aabac70355cefffd94c1cdd0c8632bd415.json | 120 +++-
 ...e6b7dc70669824b8a9f41b0ce477464b69d75.json | 120 +++-
 ...1d3cf86466ac28b1895e4661050b46903c7a8.json | 120 +++-
 ...b0ffba42bc51579c020cef13dd8e226b1838c.json | 120 +++-
 ...3703d388cd9b69ca17c95a29a89cadff67ba4.json | 120 +++-
 ...5409b18d589862941b8e943a52c8a0a229fac.json | 120 +++-
 ...d84e6d367c88bde42d53e756d528905a4d4fc.json | 120 +++-
 ...b93e7ff96634977e53d3f7b0b183f35a5291a.json | 120 +++-
 ...414c9f886f7fc05131ff28e7e2e1fe5dc98f8.json | 120 +++-
 ...7e182dc897acdefc83bb0e8d17dad400d84b5.json | 120 +++-
 ...2f079059c8e73f72310634b475881b4ebb8ab.json | 120 +++-
 ...20d33fd4859c3997248e38c3c2b706cfd290d.json | 120 +++-
 ...5e34243cc2a879f292b2413914b7dcb124a27.json |  40 +-
 ...f064ced0e79f8e26a9d482d1201c68c3b8dfa.json | 120 +++-
 ...3249bc82e1922148ebe40da27638a1d8f3e45.json | 120 +++-
 ...fe03150bfedb110650a025dfc3cbf1026144c.json | 120 +++-
 ...fe689c6591ef101c51473492bd596e3d5ffce.json | 120 +++-
 ...d557b4f611937f98306c623d4ec7e75ca652a.json | 120 +++-
 ...2a992ca276f1e585951dff5ac730f8ffcbbd2.json | 120 +++-
 ...29f7ee3baccbd111596405523cd365fd7a332.json | 120 +++-
 ...56b6e982653162a69d3c87fceb21f39ef6f74.json | 120 +++-
 ...d75aa47e6ff8463496a8af28b64f280165056.json | 120 +++-
 ...94343b4cf31a6b829959eee9a00f26622c9f6.json | 120 +++-
 ...f18cddaad9fb3bc84e5eb2f0128dc04a14939.json | 120 +++-
 ...bf26e074c78254f9f05cdadc1e87b1c145a98.json | 120 +++-
 ...8fb79db64ae19a222a5b4473fd1573a0f4c45.json | 120 +++-
 ...7346e3c33f5bfa1225277634c5d7d8272ec31.json | 120 +++-
 ...ff70f1e13f9c08aa33ae1b7987b641816ffd0.json | 120 +++-
 ...b4554c995e3a939dfb9c9a8c6dbecb8fa5688.json | 120 +++-
 ...a284848778e4b40c74fb093209b78e9eade2a.json | 120 +++-
 ...2a82e7f7990680c87651d1aaa02d12d4cf237.json | 120 +++-
 ...1c2fe905a94188504b0ee99a49459170ee478.json | 120 +++-
 ...b4abb9c1958bbf5ba0f8f19564ab82ab9cbed.json | 120 +++-
 ...7ea864f87d288a04dccf9e5b193ec1bee64fd.json | 120 +++-
 ...2138de0cacab9b03c955cc57d50a516fbf855.json | 120 +++-
 ...60048712580b0091ff28853c825c17b4996ad.json | 120 +++-
 ...3f0390a09debab2c1b5cddb98335b930d4ec1.json | 120 +++-
 ...beb8dd922c2e9149a992a8f284d8fce8cd762.json | 120 +++-
 ...d087908efdf7dbdc6f52607eba655bf5fddb2.json | 120 +++-
 ...32df9e6afa436b8c177221426b97fa245df56.json | 120 +++-
 ...d88e70a9eeda25ce3c6c80ad221cb2ce5517c.json | 120 +++-
 ...756b231a1a31d21cebbab1d767706e6e1af87.json | 120 +++-
 ...729a46d258bcaaf394e5c69445e2c3eb2cfd7.json | 120 +++-
 ...cfc10ef864cc7f8c6e7d67036c8c1781844ad.json | 120 +++-
 ...466ac9e298b4a1a776d92ab79d7cb0d2a8f7c.json | 120 +++-
 ...a6da426a0a138877cfd664d06efd6966c0d7d.json | 120 +++-
 ...35d3eab0f3053c4da1e7a75abb6d7c72281d6.json | 120 +++-
 ...be8f3bf73363d3c54f85eaacb8e4cf09e4851.json | 120 +++-
 ...7c26628392440b88712bd642da9881e829fd1.json | 120 +++-
 ...54a223eea1a1e5ae5334c1a5e784459d02001.json | 120 +++-
 ...89024d3b0ea460b729fe30f9613cb1f87fe0d.json | 120 +++-
 ...fb82ef63f92808034c17256f9be78161b84d0.json | 120 +++-
 ...0126cc1c3cb0023a576d6f726f19f667b4144.json | 120 +++-
 ...8fad648bcffd3a08423cb89c1886b668ed9ed.json | 120 +++-
 ...919dff0ea2935085baf1d32dfac599df26619.json | 120 +++-
 ...69b289305dae08c5fd44c2e8f9806b012993b.json | 120 +++-
 ...782a089afb0b73e45ba4b1c0697f8bad28ed7.json | 120 +++-
 ...eadff64691c2fabe84335637947046a07af31.json | 120 +++-
 ...a0880e8c4d426ccde9f64911d1dfbaa51fe9e.json | 120 +++-
 ...2b384a40672e51691593bab92fcb170160508.json | 120 +++-
 ...b64b3377b5f4f87acd0a3462b36d964b2b87a.json | 120 +++-
 ...4c388b3a3b16748e1a87b5370cd7e4e1b21c2.json | 120 +++-
 ...ccee551b4da9723f0bd925c0e6ba122edc2c1.json | 120 +++-
 ...33235e53c66d03ea15afcd6c3e07770e60d96.json | 120 +++-
 ...6e5dfaf0885bd803a65751e7d6e4df70b5428.json | 120 +++-
 ...b990163e9e5713bcaaf635d3556508760cced.json | 120 +++-
 ...354f596e7d0e151a5ae9e566ceb2b34bf1fda.json | 120 +++-
 ...c8267dfa38260a94e56997bd3d32397ddafc7.json | 120 +++-
 ...d3e6ff1141d938a2b678f182bc560e7512938.json | 120 +++-
 ...3a45bcbd02ed275d6a4f9a1a7e3e59ad7b84f.json | 120 +++-
 ...8267d6c692d51457074bdbdabf0d766eb415c.json | 120 +++-
 ...1f9af8f34ec7092c461766c881f600ffb4f71.json | 120 +++-
 ...c51d692ca6265086b5acf63a8ff7f8e9da31c.json | 120 +++-
 ...79c5194afcf24ed4dd644b8146b04ec212f78.json | 120 +++-
 ...237f576091e1bee1fe087fe515a0f9299cea6.json | 120 +++-
 ...f1052c7dde563dbbc0de4ec169d961f4ca5c9.json | 120 +++-
 ...b9d104867ca37be3d2b673c999a1ef884e18c.json | 120 +++-
 ...7471123d5d2fcc845ad62f0a378747d1a8a3b.json | 120 +++-
 ...5dd953c772afec1afee2f596e2cbd1418eb14.json | 120 +++-
 ...401e9849200d10391c1ccf380b48545805619.json | 120 +++-
 ...dd9c33af63be9c8eda6aa7ce0561f03f2d2f2.json | 120 +++-
 ...0edce6ed72c4b835ccd121bb928855c95dce4.json | 120 +++-
 ...777c4c35da461f76ed7df317c337149dce7cf.json | 120 +++-
 ...3b96a72686f4c773c52b125184ff2b31fa6ec.json | 120 +++-
 ...03763a4b74f0734f201742b257a5c3ef77826.json | 120 +++-
 ...6e3d450ac86ca6e9725bd433e113ced63d2b6.json | 120 +++-
 ...8aedf11f25810b9188269b87398c065e56bc4.json | 120 +++-
 ...9d64422d2c14fcfc9d543825652a3f4f6d41c.json | 120 +++-
 ...d395d1c89ddc20bb893a2cb1736e00ecbc574.json | 120 +++-
 ...98b0f164c64387ef81d5852a0ac07fd76c394.json | 120 +++-
 ...9ef26ee4259c97464c0d816cd0f5ee20cf269.json | 120 +++-
 ...019fe747f205f1a039359193063ea1bc55915.json | 120 +++-
 ...c9ab77e4079e780601dea7a76263027b5ab69.json | 120 +++-
 ...a9f77ff054ace350a45f645717d9db0dcd05d.json | 120 +++-
 ...c4e1419abd839789e5a013473f5b24dfef7f3.json | 120 +++-
 ...c58e1256c0fcd836305b87097c80140f81ec3.json | 120 +++-
 ...38eccb32802ba26926de91c3c01098fb1f5e7.json | 120 +++-
 ...c1809882aa069966e45653f72eaa2ead38322.json | 120 +++-
 ...f7922d7f2575b6f30800f05f273038b1ada0b.json | 120 +++-
 ...d43cc4dd6ddff2167d82132c7617d46c3e05e.json | 120 +++-
 ...e1fc223eb6743cb0d58410c4ccf00063b83ca.json | 120 +++-
 ...afc45d7c82b68c02d19e48f6575c957849644.json | 120 +++-
 ...e966b4ded22f5b2de78026a3ffab45249c626.json | 120 +++-
 ...fe2faa9613612d2f87eebe9b3a37c3d0c4726.json | 120 +++-
 ...9903b4c7a5070b089a052d2dfd8bd21bd483e.json | 120 +++-
 ...a08e9d979bad6e44cc399fd4ba616cb84cad3.json | 120 +++-
 ...28fbf92e2773629b6cc1e1c2cc674300784c9.json | 120 +++-
 ...0b71442cc53b16af47425ff1b2305c83daca4.json | 120 +++-
 ...d64fb783c8001157622299aaf07604b074261.json | 120 +++-
 ...f97efb842328e87f25d4fd5ca3a59982fdd96.json | 120 +++-
 ...1bdbcb06b91cc69fe942ed42126030ab76245.json | 120 +++-
 ...72c4fde0d52b6941af1e722e15e03c51d13a2.json | 120 +++-
 ...b68ab4077e66b57fe10c02e4930a4a5167efd.json | 120 +++-
 ...c42d5e27ea598981872d3dea68f2cc892fe2a.json | 120 +++-
 ...c0a1b6e646612c265d655bc5e8c9cb5f9fddd.json | 120 +++-
 ...5596bc50659d884313c90631726e19cd0e04d.json | 120 +++-
 ...561c25c3da949ee5e512f2ccd85af57ba9502.json | 120 +++-
 ...c49893ab1147dc7febeda5d35646d75f9279a.json | 120 +++-
 ...5dc2f0578b39656e5ae8ca26c01e0d05c9ad7.json |  40 +-
 ...48823844281a98febe12f7427961cd1dab4ba.json | 120 +++-
 ...c710e6e16941d5fb9a7ea274bb847b6ea1492.json | 120 +++-
 ...f306cab4c32bfcccb9fe72bb92e6e637dba01.json | 120 +++-
 ...14b8867ce5ed85dd8f30e97a54cd834e77627.json | 120 +++-
 ...ec050f175508c8f798ba60af64e2b1e4242f8.json | 120 +++-
 ...674e150b4ad2d396a2e517a4675286ab4e8d7.json | 120 +++-
 ...6d8fe3357406fbb4463cdcd30b605640519e6.json | 120 +++-
 ...582cd5ea55ce28d1f6d2e6a096baac5cf10ab.json | 120 +++-
 ...46144b3a9f536491ff2bf056a614ae755fa00.json | 120 +++-
 ...c7b55a6b59d2d4cdffbc67edae64efe5ac1f7.json | 120 +++-
 ...92e379439f016b9cedf9327e585608a5f57ab.json | 120 +++-
 ...af321d34a8330373a5a4c21c140bd6e330cd2.json | 120 +++-
 ...0c020f8c3792ec28f53bcd0a918c961106bdf.json | 120 +++-
 ...4d9311bcdf16e69d505374f59e457440a8aa2.json | 120 +++-
 ...0369e64a8aea495d82b7cf5fe68532611c57f.json | 120 +++-
 ...6644b95d1d90914158aae1f95a3df07def303.json | 120 +++-
 ...d96f86187dc6fb7ca8b3896f225b66318b7c7.json | 120 +++-
 ...7cfe0e1f8f9067164d7fb9f13e8b5da276ba5.json | 120 +++-
 ...4e165b69dd35205c7ccf223a4e8c9bfc7b8ab.json | 120 +++-
 ...652a4c05f9b6d0b92999377d7a635f409b73a.json | 120 +++-
 ...a433cf9916b10d67701bc8d26db33fcd7e178.json | 120 +++-
 ...a7f8910cea29398561f2d32e50317cdd7cfb5.json | 120 +++-
 ...82c6ccae3727eadd2c0c94efa9ee0726687f7.json | 120 +++-
 ...bf2c87350d4a6416a4329908fcbb247f1b331.json | 120 +++-
 ...fe227a7493baf3168cb5e148ea5c85de96139.json | 120 +++-
 ...3ef210c552e84809af769a1f426379fe1090c.json | 120 +++-
 ...99c03f45c37423e486ab414eb6eb5288ef00b.json | 120 +++-
 ...cda16bc312a956945e93d2cbdc8024f09afd4.json | 120 +++-
 ...7f6406f64415729cbdfb64df1aed9e55091aa.json | 120 +++-
 ...d053969ab751cfa9df38e096805ffcafb1e2d.json | 120 +++-
 ...47d78d2a6fbaf05198b9519d2004fc922ecee.json | 120 +++-
 ...40ee189078376c726568c27559ab1dd4439c2.json | 120 +++-
 ...2e62a63ec7159ac56cccc6f6ea6a218cff77b.json | 120 +++-
 ...4496d037a943c75c566696badf47230b3f99a.json | 120 +++-
 ...1934d3b7aac23efbac0239b70091420e324d0.json | 120 +++-
 ...41e36a01f47a8b6a069a0bac82efe0b926571.json | 120 +++-
 ...dc81292f0d8dbcf7f8150459c4d62dd9a7841.json | 120 +++-
 ...458bd79d848abfeaaf047832375983b281840.json | 120 +++-
 ...109ea615dc3004acbb62b10c847905ae6b4e3.json | 120 +++-
 ...23b61d2d547463f4acc82290a4546c43a1f62.json | 120 +++-
 ...5af43be1829c480ff5a68e7e014a5dc1668b8.json | 120 +++-
 ...b971dbb6de269470eb3f39f016ee6c86e3a3d.json | 120 +++-
 ...0ceb430b87a6433ab7e2ea69ee5b51243d21f.json | 120 +++-
 ...26cc601268dd506e394ef2ab467a302267409.json | 120 +++-
 ...a30d31760d8352c69bd9de176eff0f3e102c4.json | 120 +++-
 ...3a9d55eee49d43010321b95a98f3f9a30e2db.json | 120 +++-
 ...577df7eb687cac8e595257a72cd5d1fd670f1.json | 120 +++-
 ...0c468b9d2c31ce3ad1f639ce3f2324b3aaf1e.json | 120 +++-
 ...097484e8cf6f246daa0d48fd046328f5cfb41.json | 120 +++-
 ...5f0c7b573e2a15e5581185cd6874f01d9da7f.json | 120 +++-
 ...e65275c8bebc22d36a958acbb1651fa208b11.json | 120 +++-
 ...000e7f1540ba4c90f6a110288612212e12707.json | 120 +++-
 ...ded9418e07bbbbee532c7a270313a941c12c3.json | 120 +++-
 ...4d9f3cd916cbfb24b2847d264e5d26ea36026.json | 120 +++-
 ...8c2597f35cff88479a9c34c7ee20f6afc3525.json | 120 +++-
 ...c5d05bfd5474dd95c05d07eeabf0cef876388.json | 120 +++-
 ...84c7407a82c3fd17fb71f7bc50b4d4c94cd4b.json | 120 +++-
 ...c448e178db343b9ac195ae32a98c65ab61592.json | 120 +++-
 ...5403e4dd3959be0326292d1070386da5a1e37.json | 120 +++-
 ...a5818ceaeccd6d026f5ea287d848e1d47e04d.json | 120 +++-
 ...0e1028ef9da7356fec30491cd6aa4dd670ac7.json | 120 +++-
 ...1f9276f5872c28f3003f06fe42996c9977589.json | 120 +++-
 ...70d8b04c1d3e79596b827b8e74a3313c202af.json | 120 +++-
 ...0c65b3670d29e1044f6220de6d98f0b57d8c6.json | 120 +++-
 ...5352ad43448eb478955c2ba900de91d184435.json | 120 +++-
 ...af38d0d8fb6b81c5accc280487456140799ef.json | 120 +++-
 ...aa37dca1d195c21ff22ba1d1b37fffc70a8e1.json |  40 +-
 ...f43e48c3d29e6d4a95ada9734f3086e67fe80.json | 120 +++-
 ...c11c34b2bf708ee41de0b188ec771a8605a46.json | 120 +++-
 ...8bf1ea231406e6a57dfbf898c91e5887b9e2a.json | 120 +++-
 ...60717214e25c1178d39b89fa235fb5444312b.json | 120 +++-
 ...a41216284beed5afa69f4b724c92d17b36812.json | 120 +++-
 ...c9e765d3ed119989ee5e35171b99c1291b67d.json | 120 +++-
 ...4dabdf25d37e442d77c727145271fb9edeae3.json | 120 +++-
 ...51d7140cea972984d740f037e2ff585b033f7.json | 120 +++-
 ...24929f43da456cf0bf9901cc6756667bb4741.json | 120 +++-
 ...d5552565e6c5dd6d1263ae298a28d7ac6b76d.json | 120 +++-
 ...642cbd99199661c5583bc2127e40283315a2d.json | 120 +++-
 ...2eb6b6bec792e748119b6fc853aba1ec23c48.json | 120 +++-
 ...d9858f9152c7d5f1b16acbda599b1126ec1da.json | 120 +++-
 ...078741a0cd4895a3191daa6841627e1e0f875.json | 120 +++-
 ...239be881909941babb336171be8d781444b20.json | 120 +++-
 ...247402d75283f835fbfa50d8f2fd08b230a18.json | 120 +++-
 ...6214b2bed06031da258d01afa620957fc8f3f.json | 120 +++-
 ...5b927cbadeb03eb8cbe5df983957b08b8eaae.json | 120 +++-
 ...7966ca468f51a54bd8c76ef50d030f1586aeb.json | 120 +++-
 ...a7807095991392a5f67e06f9a894bcee81fbc.json | 120 +++-
 ...f1df31b84511fd971e742e30ca6a7154d3fce.json | 120 +++-
 ...16c7d61a110e80e1bae89f57424161302dd67.json | 120 +++-
 ...63d0ed447657187a9c69d3024f7c85f457c4c.json | 120 +++-
 ...156ac4fff56421b32744f2ac8b14b89cf642b.json | 120 +++-
 ...9324e3c80fbd138d1b75acff1aa1c53ef4e2e.json | 120 +++-
 ...27ea3bb60c5035c9c9fc113460f30f16d972f.json | 120 +++-
 ...bb2345cdf1b18279c69b7433b8098bdad9806.json | 120 +++-
 ...2b41f48e2b3cd6878b7bf0e984fc90b9004db.json | 120 +++-
 ...dda22e80e12625b773d7dde59e1dc894c53f0.json | 120 +++-
 ...b08739251410fd0264acae27eea2ca8bce572.json | 120 +++-
 ...c6f895c90347181745b2e86fbfea9f9c9f3e9.json | 120 +++-
 ...c0271cd069748ed419e5ab693efec6f5f4a01.json | 120 +++-
 ...9cea9895d1ff489f18e5f608ec604f7359e02.json | 120 +++-
 ...b79a523b93798bfeb96edc79a3f81a28f28c3.json | 120 +++-
 ...6091559a40a09a53f633f18677ce292b71fcc.json | 120 +++-
 ...e02bf4082650dccc079322f436d4b6331fe88.json | 120 +++-
 ...70607451f1279c40d6731740912bcc8b7db42.json | 120 +++-
 ...a5bef11cc63fab1662853de28b7c1a3e9c1b1.json | 120 +++-
 ...2c90795c1e85512ed437b8a4f447421eb6684.json | 120 +++-
 ...90b525026bfd4dfe73b0657fa6c0347dd74a1.json | 120 +++-
 ...41a239147613edda56c85a5fe6c8f6cfb2aa1.json | 120 +++-
 ...5f63b53b6783dbf4d4bb4e97b8a95b4c2b7ac.json | 120 +++-
 ...7ad80c51c5bfa56e22a5c11073a26fa23143d.json | 120 +++-
 ...3e332f40c74f23abfd8baf2bc17fc80417214.json | 120 +++-
 ...9189acee4bd4b0369b67ee964a96291c4cb50.json |  80 ++-
 ...64b3581d4f1bb3143a0cc6ebf6919af364cd2.json | 120 +++-
 ...636dafde83ef3857d84000e2a3b8d93970194.json | 120 +++-
 ...e345c95570901c70a5fb2f4f16af13dcc9e65.json | 120 +++-
 ...f584a311fec91ca2593d2a8c50cd4c37c6523.json | 120 +++-
 ...f9f38dc6c2d2e17c7b8055a0f46d9f05bab57.json | 120 +++-
 ...70a3933efa0dfd70a0ac4138cece8ba937255.json | 120 +++-
 ...911ff65c57a6917f690361350668b20fb0919.json | 120 +++-
 ...1c1e1487af296bb372cbe1ef80a62f0d03740.json | 120 +++-
 ...18f2eefc7de93d2490f6452c804087a99b619.json | 120 +++-
 ...4806f09362aae1d6fcbbd2d46b6e318274d19.json | 120 +++-
 ...64054ff4608130dfc03ad0646f329205daa8d.json | 120 +++-
 ...c3304577b5101215d70be7e3b2decfb3073cb.json | 120 +++-
 ...f7f301b4fa13998d7837e8b5e770050b2ab5f.json | 120 +++-
 ...dc32722e37c0a57f23149549981d951f5ea29.json | 120 +++-
 ...b208b8f03e544f493056524148799476874dc.json | 120 +++-
 ...ebdc28bc7bb0b9fde031dd6d2966ce46eddea.json | 120 +++-
 ...5796d4dccd760c485e3cb89f45cbab82527d2.json | 120 +++-
 ...e9453786f2fc93c9edcf3df9e10a9e63370b2.json | 120 +++-
 ...1d9a2ecdfcfee6cce4ff1f90ee25865ba761a.json | 120 +++-
 ...368edab7dbe12bd7306465c125b29971d8b32.json | 120 +++-
 ...631c6c95119acf45b4b20267488ac7a700b02.json | 120 +++-
 ...4a182df03f0aac385f34679e4c3c20137d479.json | 120 +++-
 ...a4af315a692202dd173f97a2332896d49e692.json | 120 +++-
 ...41647b14ed47571fe950f2fbda31127455843.json | 120 +++-
 ...3c5fb1ef322b8f01e0ab9652bc294e36db2fa.json | 120 +++-
 ...05134ca667831ffd1e2633bc903c171c8bc27.json | 120 +++-
 ...418396e090ede0881c9cd4144898403c3ebbc.json | 120 +++-
 ...0d8de7f543465fbf4d89e1e2b6f6ae0616e82.json | 120 +++-
 ...d1b9638b00d05d7795dd89b30162da95c9441.json | 120 +++-
 ...53a1267dedc8cca5e2bcf8053e0004bbe90c7.json | 120 +++-
 ...9d7dcf0429428e6e566ea67e90cd2a92c0606.json | 120 +++-
 ...764209b7d9aa251bf79f721ac35c9cbbd3eae.json | 120 +++-
 ...e82a987352dc8dcce60ddabe05da8409325bf.json | 120 +++-
 ...87ff93eaf47694db647e9981122e6f71896cb.json | 120 +++-
 ...63e4ae007e7f7dac2eacabae5954b61b0fa9a.json | 120 +++-
 ...7b7d5396f2e5850df4a465f8ee22385254062.json | 120 +++-
 ...85935b72b96cef2480563a8b387fbe994645c.json | 120 +++-
 ...775c309f54696e29118db9d532a48f35f79ae.json | 120 +++-
 ...6c9279f1c5e69a767457ec2006f22e3966fe2.json | 120 +++-
 ...329d5b193d19c6512dbddb1a50128e34ce690.json | 120 +++-
 ...51aa544f3347ee2555c7157554cfef53c48d3.json | 120 +++-
 ...716bec960cc0a84556d82e5f5475b59192344.json | 120 +++-
 ...55f921806bc574050a450b7b8faa303c9f3fc.json | 120 +++-
 ...c2e19564dc9b5d218fb1b7c5387cf4ff164bd.json | 120 +++-
 ...05639a846fa66cbb84d304bd0fdb02a941f71.json | 120 +++-
 ...9c3e38920168a198b70b6d04c853866146440.json | 120 +++-
 ...7104bd2645f6d8da6fb3b46cac26ec681221a.json | 120 +++-
 ...e7e91c57a86a78c4b78b8d7ea11c198a11fc5.json | 120 +++-
 ...9236a6b94b54ed6bde936d3a073a02a6a6376.json | 120 +++-
 ...9fc31e46817318751745ca182faa912a002f0.json | 120 +++-
 ...5f0b3fe354bafdcc5e920c4331321fa57780d.json | 120 +++-
 ...9cb5117c6fb1fb9971f546ff4a718f545aa25.json | 120 +++-
 ...0f1549b17696747e5cba66bb4997ff843d81f.json |  40 +-
 ...62d99a95be2f5acd33b1d6072299cfab24505.json | 120 +++-
 ...8189e2fe88662dc06a04df0676824c692e94a.json | 120 +++-
 ...a0eed1ebff6ff86c8b11a288329d3c6058d52.json | 120 +++-
 ...9315f6f0894fb9a66f68a3ce989a8df283dcb.json | 120 +++-
 ...00876d9546ead0a4fc26858db3e0b22985791.json | 120 +++-
 ...b64a2f2bfe9838dd219497fd43af7a945e63b.json | 120 +++-
 ...7c9224c7bc61c360c980314c8846dfe6b6d42.json | 120 +++-
 ...ac38d9141511e7691466bdfde0c88f66090a5.json | 120 +++-
 ...8f2589f53af052906ae69136a7479ba446ec1.json | 120 +++-
 ...4fe6ed6a265145c056d17295c0cc32006db90.json | 120 +++-
 ...4584f3d64e4a462729a2952f283b5a6bfe3ea.json | 120 +++-
 ...e7c4e709364b4251fe7988f3c8a48ba15b7da.json | 120 +++-
 ...0f7c100bac2cc5512c6d78dc7c4bd2c3ff426.json | 120 +++-
 ...46e5f8a98d5e4828b68a428f9e537251c830e.json | 120 +++-
 ...a9b2b2a3db0cf42997827f581619cb12acfd6.json | 120 +++-
 ...5b71f1265742f8ee5657f60c8608688370960.json | 120 +++-
 ...26d9b0b475e3fc2096b9ef2e4abd11bf0f3fd.json | 120 +++-
 ...d19cc28b9abfb181b66e4ad631dfcdda2790c.json | 120 +++-
 ...5653a76b963d961091dc312be4d67c4e3b070.json | 120 +++-
 ...93c4e67eec37a551e7aab906e26bdaf479475.json | 120 +++-
 ...1969cd47bf1f523502dcc01998d220df2594d.json | 120 +++-
 ...09692588e0571b635451fc1b3763246eec60f.json | 120 +++-
 ...3031002cb460a1df9b6d9a169f4ccb76b70d3.json | 120 +++-
 ...d091a7026855d819c74f94ad2c1b3aecb7f82.json | 120 +++-
 ...512c893ab675ebce92d613df4c15f820334fd.json | 120 +++-
 ...b1c7bc7c5cd009274db3878641b5f68615989.json | 120 +++-
 ...c6528dec498d8409c8a72a7f24be4f27e1888.json | 120 +++-
 ...e417ab7d038ce58b8dc106bab99fa76eadd17.json | 120 +++-
 ...4afe3451c9e6592df5042bfc0bd519c12468e.json | 120 +++-
 ...f2966b4141044d5f3a1b1737132c905d07ac4.json | 120 +++-
 ...91579ecaf381eb36bdbe0e57b539cc6d3fd05.json | 120 +++-
 ...a7fb6f7ae6bb13f1e334dbf73b8219b915f57.json | 120 +++-
 ...47b98788febe22f67d562e70c983ef7b6cf81.json | 120 +++-
 ...7bec7370822f1887e7ccadf05ffd1e24921f3.json | 120 +++-
 ...0b8d3728a0b54b7d8ad5e18adecfe9f71c3f8.json | 120 +++-
 ...d6af30778d678da7849f82db71d278c02d7a1.json | 120 +++-
 ...a4880f4e99a191e53a03ef16da22fb02bc397.json | 120 +++-
 ...183abe57b42df274fdc83a8adc4a76a86e972.json | 120 +++-
 ...a0ec48009d3e86ce13407ee52ec66eb7fb4d8.json | 120 +++-
 ...5f3baa9f05ec3f8031da871969c004074be89.json | 120 +++-
 ...762b782fd4f6c322d1ec3c9dc8b4a2bfa8909.json | 120 +++-
 ...e994b3aed1e7755ea250064c70256e12d2f22.json | 120 +++-
 ...6eab468f4b3f5425417050c27371a62259b00.json | 120 +++-
 ...08836eae103c79faa5430bb540443ada6b188.json | 120 +++-
 ...60eec88dc6c6ebe6d152e2f31aecfef2c8ef0.json | 120 +++-
 ...c0d33302970609091b9cbf36e8f5983e9ed57.json | 120 +++-
 ...7f54975c9f3359639b96c27b9927dd628da05.json | 120 +++-
 ...60e4b0629689724e27ae7261b0fd2f7d1dfd9.json | 120 +++-
 ...6019f6506e218ba90c883acb9d9eeadee19f5.json | 120 +++-
 ...781d02ac0279776ed46250f81c57bfae604ed.json | 120 +++-
 ...f72a1adf8dcc76f8bcc6e3f78fcb738583ec5.json | 120 +++-
 ...fbc4805de88ec4530a67a60551980f29106f9.json | 120 +++-
 ...6cd6fef262b30541dcf601bb6b829a6147542.json | 120 +++-
 ...94109dbfcb981c399e46a8654508464eb9ae5.json | 120 +++-
 ...3f1ebab364d0464751c4e692049eebc7884b3.json | 120 +++-
 ...cb406a2478ad3cab821f05de51194d858110e.json | 120 +++-
 ...6eafee5c27b4be49c894923a72008dd32edc5.json | 120 +++-
 ...6dc287b333b74145e3812acca38315b888cd5.json | 120 +++-
 ...548c540ab8e24e820d02ec0e6bd38c823c317.json | 120 +++-
 ...fa6a9f31eb328da35f6e47331fdee10e41a18.json | 120 +++-
 ...20304effab67d62ee64404284039250203aa5.json | 120 +++-
 ...f59936ed79973c005e36c9ef55c5326d9ce66.json | 120 +++-
 ...89572bbbeebd8f64e2e8ae9773b02eff6c7a1.json | 120 +++-
 ...5c93748788ee3682ccb5c38b7e9e0daabc374.json | 120 +++-
 ...cf07a92c1881c48212c5318767c5e80b2f814.json | 120 +++-
 ...3868b9c4dd125773856602c9883d76442cabb.json | 120 +++-
 ...2b13be44f9b010cac82960fadc5ab7a3305c9.json | 120 +++-
 ...6dce0ed8937af4f3341e8d78ebb9de967563b.json | 120 +++-
 ...1b2db594cc56ad84353cc76e1fdad524005db.json | 120 +++-
 ...5e95198ea64b9c9fcc3de85681a7b37de99a0.json | 120 +++-
 ...16784cf9e60631768b35cb7a7e15ba6d01c05.json | 120 +++-
 ...989b521214bd643a5be5ed6157ec1ebb07ff3.json | 120 +++-
 ...a0adcf9a94ba713b2b01a3e63f16cdc5a6463.json | 120 +++-
 ...bcbbc7a191f346a4b355e999c0e7af112f464.json | 120 +++-
 ...db2c6c02a5973392e44c285dda262d41e93ae.json | 120 +++-
 ...d48ea9fea21713719621d39a49bce6a884913.json | 120 +++-
 ...a4e29605b66e49b6344c8cfe34084f2c0c5bc.json | 120 +++-
 ...4e0067e81ec637d7a2eb9a4c1d03e6ea74ebd.json | 120 +++-
 ...04e83f6eb53159536f545664138a9139de58a.json | 120 +++-
 ...6e43a5b649553003524a121d788581e8b519b.json | 120 +++-
 ...42a6198f4194ccc81cf6be143dd118bc2fd29.json | 120 +++-
 ...d4dea53dc2243566328f40cb2bd97ffbbdff8.json | 120 +++-
 ...848ce836993ff836dd884591a6ae2ea97250e.json | 120 +++-
 ...50515e56779a3cda79dcc3ffb3f6f1bc8c16e.json |  40 +-
 ...6c65ea774eb97a4608436b16ed472963403ee.json | 120 +++-
 ...2ec581db89c9402aa5dc621dd9cab1c5c2aad.json | 120 +++-
 ...2dbe121e6b9f46e46c164b14c997bde13304b.json | 120 +++-
 ...4278cfdc6c47035c40e414192bf0eef7028ad.json | 120 +++-
 ...7df399c3a3d595019128b600198bd0bb368ef.json |  40 +-
 ...45a5af2c43e384fee0bb2520166cc2a89f0b7.json | 120 +++-
 ...967a70a851c46c4de2ce306b3654d2dfc8be4.json |  40 +-
 ...50f77996e5262f09093185cb7a9ff74935036.json | 120 +++-
 ...9e66f0f9e3cd6d923fadea94a4d79f28bc13b.json | 120 +++-
 ...b303c0a078d7b3ec3fa9d5fb0afa6bdbc1d7a.json | 120 +++-
 ...ad9939f8607228e8fa6d489f56e0f21e7e647.json | 120 +++-
 ...6fb3a43cc9ddb6fea6f1920b863b7cc3f5b79.json | 120 +++-
 ...b0c162ff3c41fd812d3e6fcd35a43160ab053.json | 120 +++-
 ...7d33658a504a738b57487d367015a07bb96b3.json | 120 +++-
 ...96b214a3c4a30c80dee1999b81cda0214d3e5.json | 120 +++-
 ...f7bc48b745460951322d29033e15a37d81517.json | 120 +++-
 ...63280b38e3ae0b4ae15829f53fcd5b8937b62.json | 120 +++-
 ...5b0951ef5748665395b4d678c76faa1724d17.json | 120 +++-
 ...9272e63b684cbd301222ad09ab1223599b534.json | 120 +++-
 ...0f300740c1204c67346b23b10d4c86ccb744e.json | 120 +++-
 ...781fa771e6743817dcaf47588007711137bfb.json | 120 +++-
 ...c9748537ccf9230eaa8c70c538a16a0e54c86.json | 120 +++-
 ...009a9dc094ed3d54cade9ae525f147f457dd2.json | 120 +++-
 ...28bfdaec02e2a97f5043dde1bd539e357fcaa.json | 120 +++-
 ...182cd4ad1e94be57a6309c88dd2d69d5fffaf.json | 120 +++-
 ...91b78bbb688f3635982e54913d2a8f32a3e92.json | 120 +++-
 ...b5df4fdd4474a32e5d6080e82c1e2a461a125.json | 120 +++-
 ...d534f87b8929fa9df96a378fa6ca599e0e149.json | 120 +++-
 ...612257aa8b074982ab4cdd68dd44f94c71a7f.json | 120 +++-
 ...46ce1eaa9870071829c822ef11ec27470d5ba.json | 120 +++-
 ...354d2421280e40716e95fb84bbcd4d0d20f99.json | 120 +++-
 ...e05f48f8fb596cdcd7bfcfe99f995c4a4012e.json | 120 +++-
 ...631470611911cad0aef42e5761d7dc69c64ad.json | 120 +++-
 ...73100920bd4652f5fa8618bc0253ead9ef34f.json | 120 +++-
 ...0009729d4fe23f1ca9992ea9311b61228b36a.json | 120 +++-
 ...d390d362297d194d6680a9d0022be50071447.json | 120 +++-
 ...96094a7d88d71a4a7b7cbe8d92117cb97f6c0.json | 120 +++-
 ...ebac24f5aa87cfbcd4e7356047ee94335bcbe.json | 120 +++-
 ...280c350074a677889fb77ec7849eb89d4d304.json | 120 +++-
 ...e2c0c18a235290b93acbf1640314f6218792e.json | 120 +++-
 ...7731c1f88066e65f32ca42ad015cd295ca475.json | 120 +++-
 ...1598fc8849db48f87ae0e2451d84cfef21a0a.json |  80 ++-
 ...2992aa599755d03ee771d9916fe0aa5bcd2ba.json | 120 +++-
 ...23b37c9609c57029d4b2217d8ed6f19504ef4.json | 120 +++-
 ...9dc3608bd9a3b4dcb97a74e219d48b1de6f5e.json | 120 +++-
 ...1d156b5b9aa6d27c9394971b2757aee759ba0.json | 120 +++-
 ...41f5ea0f77e2b817e38052fd58b2593c09f9f.json | 120 +++-
 ...d5550a7987fccee6e5d66cbafdb33a167ae18.json | 120 +++-
 ...7b6f5dfec8cd097e5be7e0bc4671be261086e.json | 120 +++-
 ...8db717e8ce5d5c2eae1f530d4f2bc3de2eef6.json | 120 +++-
 ...d3a0145d6b20088d1bd3044de51e229ca13a6.json | 120 +++-
 ...91c7c564be966dcd647fe9514670cc398150b.json | 120 +++-
 ...e31bca0778b20851e4eec1a4b60f2554faae2.json | 120 +++-
 ...7a31c52c12c4059d6573bc0f3495392c496dd.json | 120 +++-
 ...0a199b63876773d3ae8683ff767f7857b6116.json | 120 +++-
 ...4560b43a0a1d09c22b61edede50be15077139.json | 120 +++-
 ...842e37350ffc25126fd71342ec46a248ba340.json | 120 +++-
 ...c25a990be727397d9239cd5a34f904c341e77.json | 120 +++-
 ...02e9c047a7bda9986e7b09c06b23dd02dedbd.json | 120 +++-
 ...bb70abee31a9fc92403d4e9d05ff5e9d216bb.json | 120 +++-
 ...5024362258be1b1485c414d7cb2d3a77bd3f4.json | 120 +++-
 ...3bbac77ad98fca11a0df2f4d2ee266f0a465c.json | 120 +++-
 ...f4020c41510daceeb3111f98ec1393c2a4106.json | 120 +++-
 ...2544c9190cd90ebfc98eeee8fc0482628730f.json | 120 +++-
 ...716dc4d577af974592c0d379d18e2f2fc691b.json | 120 +++-
 ...54732ff8c1610ddd340cf53aeeae79e33d222.json | 120 +++-
 ...a3dc86d3876f088f69277280cbad5283fd9d8.json | 120 +++-
 ...7c7e768ffb56f9cbd17b64c9406503b7c514e.json |  40 +-
 ...e543a35ed13de3dc6e368575b1873114207bb.json | 120 +++-
 ...faaec78187b7e68e9ddd7ba4772e5786c89bd.json | 120 +++-
 ...27cdc11bcd048f4ca03485eabd7f6dbf18cb9.json | 120 +++-
 ...af85fdc4cc68f97e4bc481b4368e61d1ec35f.json | 120 +++-
 ...555f9830641f8a81b973563f6a7a96ec9751f.json | 120 +++-
 ...3fec3b348145d73322847f3cf3fd49189b925.json | 120 +++-
 ...a3966b3c49ea8d1c895941cae13c6f0a7fac6.json | 120 +++-
 ...3928d0b2ed43f8d66f0732e23554803e3c570.json | 120 +++-
 ...206baab5492fa446b2a91fc661c08b66f7470.json | 120 +++-
 ...ff6d3e6a73a76952bb1fc2d3a599de9d94594.json |  50 +-
 ...4bf3f47fc1c97d27efe16e9cf12d469ab65e3.json | 120 +++-
 ...f968982f6d5392e68021134740c39e0c45396.json | 120 +++-
 ...125be5758ac323d48e23f26efec75cceae6b8.json | 120 +++-
 ...4ebd47d7917bd7bbff21387a19e83c2c66c79.json | 120 +++-
 ...854fd364fa6b25df281d285211edf8e88b60c.json | 120 +++-
 ...73555cca905ef154d5b974b2882911b10c013.json | 120 +++-
 ...9da22bf3e14fc5beacba0ca1d505943eb5282.json | 120 +++-
 ...20ba7898af3bc24d8367ad128ab0fa1f2459b.json | 120 +++-
 ...15be721bd036c5218e7540fc43a8b339e1254.json | 120 +++-
 ...d407be8a95d636f719051caba1509fa2828f4.json | 120 +++-
 ...ca5e1fd6e3a0e977cddc8421b6566261e8147.json | 120 +++-
 ...8fb47f07ac9b58b2763b1020e5a2e2e4acf79.json | 120 +++-
 ...6035fd556368746cadc0f161f7b650cca9cd6.json | 120 +++-
 ...f6fc9d56cfe86b9834fcb950ceaea54a1aa18.json | 120 +++-
 ...b4935a849167455195de3b9d6cababc61c05b.json | 120 +++-
 ...892c9f8a57554f1fc08c8ede88a9787f873e8.json | 120 +++-
 ...9a85da746c9c606aa228be7b25a7639142db2.json | 120 +++-
 ...0ae5c9a5b26b2af81854b107fc75dfc3be492.json | 120 +++-
 ...48b9fcca970f83aaf76afb16a4c7ba2afa0e8.json | 120 +++-
 ...33bca2c9c6d3ba3b0094c47a6e64372d84f59.json | 120 +++-
 ...9cb550ff0ef7473d1b148e9b7e8ee88f5908c.json | 120 +++-
 ...be63b2dfe8b0977f20105145fe5112b23aebf.json | 120 +++-
 ...fa6e09d836dedaeb71e79585d2bf8e3ef8bcc.json | 120 +++-
 ...47f9870ea3a64bd67bc0ade488897d116a315.json | 120 +++-
 ...3062b22cd9bcbfc3bcf31aefa150b54094b76.json | 120 +++-
 ...680ad7a0e2e82660c1615cb612d4330afcfc5.json | 120 +++-
 ...e34f00d35e2e63a43eb79a561f416a9299039.json | 120 +++-
 ...815ad76c410ffe775dd9f418c45a13df5d3ee.json | 120 +++-
 ...a8dd71968997861794d08fc5a32d135f848ee.json | 120 +++-
 ...0c7fe8af50938e13e7bef3d60bf4bc236c773.json | 120 +++-
 ...94680726921adf01d87fcef5aedc39e1ce6b1.json | 120 +++-
 ...f6fb356e870b0ab44b3271cc76e30390be46a.json | 120 +++-
 ...cf975e110df56490cb26f61917213f63d0936.json | 120 +++-
 ...a02b422d65d6962af1bed755f5590ba94563b.json | 120 +++-
 ...b5630c98aa1977ad6c2c490ef730b09ac1599.json | 120 +++-
 ...b10b8ca5fd556344310903fb0c83483339255.json | 120 +++-
 ...47ecf52ca72be7bfb43c495de2616baf18731.json | 120 +++-
 ...95922eb26aa4ff33a704449c5dca95cc9d0e8.json | 120 +++-
 ...1208cfdb1a32bc3faea9856ccdee0de923e7f.json | 120 +++-
 ...7df8f4e7f9ad3421b8f5d6fd2e57babee7043.json | 120 +++-
 ...7dae0065e5a38cf03ed93e366f8e7de0f9393.json | 120 +++-
 ...1cdaa82bc60fc9960379614d5fa0d5da113f2.json | 120 +++-
 ...df03cbe884e8fa30d82feb500d576e6488fcb.json |  80 ++-
 ...90806521341a9dab4b6e1c3b202e99375b498.json | 120 +++-
 ...cacebaa77afde6e1994e0cbd9ad9e8972dd8a.json | 120 +++-
 ...9c787d43b0c5facb2f8ec16ce02056fde8bc9.json |  50 +-
 ...c746e731c3ace559a77d13f72dd3215c2611e.json | 120 +++-
 ...8e32f4fcb3799929299c061ef5bbf5e05877c.json | 120 +++-
 ...0519ce2283cfeec18cbbd341db4bd9fc56423.json | 120 +++-
 ...1206b02b916d38f5e063947e24c57363a865b.json | 120 +++-
 ...3f452e8ee9c7482beaec7bd4a4f1bdc9f3f6e.json | 120 +++-
 ...caf60cd9ab6f3fd571755cb2c619d601bc8a1.json | 120 +++-
 ...830a6a4ef9e7673ff3c2b38e0f8195911a5ba.json | 120 +++-
 ...5bcfd444e81d0a54b9f46dac2a5b7cc2f3ded.json | 120 +++-
 ...d6737130d9efa9f8a803b797118cac84e6b73.json | 120 +++-
 ...ed181d5b21b08c88375d23f0ca2206aea2eb0.json | 120 +++-
 ...4062f6d09c68d2d9c28648af46c9e3827b006.json | 120 +++-
 ...dfd337ccf0412600b478aeb2ec982ef624919.json | 120 +++-
 ...ccf0f7d6daab0a55e3d8f7931e70abed0556a.json | 120 +++-
 ...aa6f782faadb5a8a615325bf80d8d943d4e7f.json | 120 +++-
 ...58b7017a37b573f8a205f08b7077d6587c640.json | 120 +++-
 ...ad044ad6b5540b4c877e68c4a6e802b36a01a.json | 120 +++-
 ...fb9372732615d0416270b347ca5f732c17dd1.json | 120 +++-
 ...be69eda5e79fd772b447f062a7d9d543097c3.json | 120 +++-
 ...f3f01090424768ca035ac35c1040d5e460756.json | 120 +++-
 ...0be79f2fdbf7665d653e48e8c770bed3d74df.json | 120 +++-
 ...7107a5e0ad11e0193f726ad3ba85db64beac0.json | 120 +++-
 ...1ab0699264fbb5eafc162905fb5200072fe87.json | 120 +++-
 ...22c341ce992d2f23bd1594f5fafbd01ce6fd5.json | 120 +++-
 ...d608355e635217808896e538df0697c0d0d53.json | 120 +++-
 ...80734934226e0a88cb165c51cac873b366c06.json | 115 +++-
 ...6efb049d43923e0dc8fba8f48168cf6dd1e52.json | 120 +++-
 ...3134308565c39162f625f739243a86608c8b0.json | 120 +++-
 ...d3e9de3aa8f15b17f855ffd831ac8c1b9632f.json | 120 +++-
 ...eec7160aaf77e2c58eb965a43edf371548d71.json | 120 +++-
 ...3313cfd96e483bd43192c666fb381bc00b9b7.json | 120 +++-
 ...45b568adfcefb4b35e422bad25902d71b49f9.json |  40 +-
 ...e29828c432b49c8f1e6e96292f4aa1d28964d.json | 120 +++-
 ...3f3116d0a2863b0014b2760b84ae20555f640.json | 120 +++-
 ...daad086b33aad22548eea44163eb2895861f6.json | 120 +++-
 ...3ecf641a15ca829ea2ebe4e789148bf1d0cfa.json | 120 +++-
 ...f4782b62c480d9b818d7641eeaa41c81ef5a6.json | 120 +++-
 ...9df77416bd7412963a4f13fe64a9f282adc77.json | 120 +++-
 ...48837a6cfe6fcf5837958fb701bc558be2db9.json |  80 ++-
 ...5107ff92205097024e3179e70162e2140609e.json | 120 +++-
 ...5ea8110fd942a8aff42be1e4b8d1f7ad9e98b.json | 120 +++-
 ...cdb5a989451af145fda48ed60b28661bf1130.json | 120 +++-
 ...cee9e86297375f8bca3b9b1e9b4fc7124dfd0.json | 120 +++-
 ...8018f65ba67ab04238d0cd84e657bcfd2e4c2.json | 120 +++-
 ...82aa2b2130d3ad1060fd3b7d2a541064bc614.json |  40 +-
 ...6e486d0a985498b74fb69703ff9dbe397e965.json | 120 +++-
 ...3835b005fb616280bc6d6e1e2c62fed2655af.json | 120 +++-
 ...e5a35bee62922f12dbacd1a07dd34007dddb7.json | 120 +++-
 ...86fcf921d0ab33f03b7f1e0f2d5c383cde36c.json | 120 +++-
 ...e7b14b784766a659aab7a7a49ac3ca2dfdf54.json | 120 +++-
 ...7bbfdb6e920b94e2f5940ae498c088336d67f.json | 120 +++-
 ...0d7aee36713f1a63f2b91c444e013949f1cf0.json | 120 +++-
 ...ddcb2e4023e402af8cfe7ca253b756bccffa4.json | 120 +++-
 ...16543bd8998923ac6f94a910800990ab0ecb8.json | 120 +++-
 ...a17759f9a7ae0dbe084623918cbcb1325b548.json | 120 +++-
 ...d899ba65717065b83bce346b0c53e57fdc164.json | 120 +++-
 ...2a4802b9d0889173964d21b2a63126f31d94f.json | 120 +++-
 ...390b61a62b2ee11318ec317eb252b6ee223f9.json | 120 +++-
 ...014bb61edcb995cd44da5fd160c6639fa0ccb.json | 120 +++-
 ...36e2436000e32c831a68ab5e8ab38102b910b.json | 120 +++-
 ...5589e73bf3330a31b529138b4a61a0a5918e0.json | 120 +++-
 ...808be68fa4ade27c2dd719d8d3bed024c0efb.json | 120 +++-
 ...9b8dc68881102f184363b5b6df6153a2ff5fe.json | 120 +++-
 ...1d76e68dfe77e5d919f373e1ca270092f0b14.json |  80 ++-
 ...735b65cac7bbeb208a71005493bc36f3c3dbb.json | 120 +++-
 ...d48f121661b1f12380de738bb9e52d98c5f6a.json | 120 +++-
 ...fe496d6bf481368f0dc5de0a9992f17276db2.json | 120 +++-
 ...497ef6011984bdf055e29fad4bfe660e82bd9.json | 120 +++-
 ...55ffb9a194011c48662c8392cb91f0b1c4fc2.json | 120 +++-
 ...a212b70378bf1433d4b49c52df64c1398b8cd.json | 120 +++-
 ...dac4b5e28cc86db794732f1a2db6be9e18a0e.json | 120 +++-
 ...04dc752902d853fcb2b9491ea8943edaad795.json | 120 +++-
 ...ca98f581b4ef94b815572be787be546d99ce9.json | 120 +++-
 ...4c8d70fd82c5552208d45ae72c69f11f598d8.json | 120 +++-
 ...08a846df604daa636403c267203ff2284d091.json | 120 +++-
 ...c579f9c3a81af0f81f4fc66fa8164ff39a0b6.json | 120 +++-
 ...24d85bb124c72cb65fa6d849d057ea3e59436.json | 120 +++-
 ...2422955c9d8ead1676ef13b0a28980cd27eed.json | 120 +++-
 ...ac7d6cae0d5e05635469c985c01f9a22e0d1b.json | 120 +++-
 ...18b254afe6ee11295e6076bcdffef907e2f57.json | 120 +++-
 ...b0e9489663d11ba0b18dc6c295586054d890f.json | 120 +++-
 ...83d82ba301840ca5735f1cd71479507f1be99.json | 120 +++-
 ...215d3d845b1c2c2ed582e46dd53c55c74b1ec.json | 120 +++-
 ...08896b94e41d9f73b740298285c0caa6cff9d.json |  80 ++-
 ...8370f0df2823e97e385eba2a8ae7106f923dd.json | 120 +++-
 ...dffc95a866861e43df9e9012d6be10996ed36.json | 120 +++-
 ...64672e3bdac32c20bff3b3a0bfa8da2d9e8ba.json | 120 +++-
 ...ea5ee4c2e11650b673b3de9b6923a9c2b4d6a.json | 120 +++-
 ...0013fd364d25be4f6d50fd14e97c39ad600c2.json | 120 +++-
 ...9abed6ce7d188a287c308ab84a60d2abee4a8.json | 120 +++-
 ...c21662ae11397c3676997c668326235093b42.json | 120 +++-
 ...d739955479dd973a11169342840d58c77101f.json | 120 +++-
 ...522350d3834fa1f5ff8c9513993a027eec041.json | 120 +++-
 ...0e2d1ff1ec2f341027f22fe929ac8d1bbf1bf.json | 120 +++-
 ...7413265eab443e94605d8084ce2e5d68f80b6.json | 120 +++-
 ...b5ebfe43720d72298b5a5bc00dba586d0f996.json | 120 +++-
 ...2561a4f8f6c04814be2e41154a1c8b516d1dc.json | 120 +++-
 ...bdd023a6b54e27b4680eedfd01333a57319fd.json | 120 +++-
 ...51867c4cc2ac509c85a2bd56dbeed7cc3855f.json | 120 +++-
 ...b589b0d4e870cb47c3280f1de5ec2264829ca.json | 120 +++-
 ...348d2b02de73347a50d257afe7947d0b0b8ac.json | 120 +++-
 ...680bd683336a6602a2981a21b7d49bd4e9aae.json | 120 +++-
 ...e7c71d9a369baeeae438e37491867ebe8f706.json | 120 +++-
 ...a88b1403530e6065abbeb59bbe1b3ca879fcf.json | 120 +++-
 ...b826eb029b8cbbd35458232473d4b0a03313f.json | 120 +++-
 ...157ddf99a2985c5adf4af031f93dc34037e74.json | 120 +++-
 ...5f02c579a54eb5b951054c68bd1b66010ed82.json | 120 +++-
 ...640f8d20b7b2676cb78e50d30a58a8d984c3a.json | 120 +++-
 ...b8e58a33c17557a7a5ca81a40528b91f12127.json | 120 +++-
 ...05e1b24db821f7a9a7672918d58a4c6d7d532.json | 120 +++-
 ...35f0fed60bfe960a1a01dd3bacb35531e2dbe.json | 120 +++-
 ...257185fb23a9c0a90adde68f13406ecb679e1.json | 120 +++-
 ...131e67b54ee0f2967a76c2bea2fa49bb4442d.json | 120 +++-
 ...25c38d3d45cf512b9e1553fa857ce9adafd6b.json | 120 +++-
 ...afb80f7885cbfef046a3a9afeacecb85354d3.json | 120 +++-
 ...6f4aa49485035973a6d5cb9514a9d4cc996b3.json | 120 +++-
 ...aaab8c65092eccb2f7549b8cf267a73e35a50.json | 120 +++-
 ...8a0f21fc70ea9462d31de012cf3c2151d9cc9.json | 120 +++-
 ...3912ab1401f9cc3ac864f868d3d747c0edda4.json | 120 +++-
 ...477fd5e4b8306848f0e5733814928756cc9b4.json | 120 +++-
 ...f9c6bdd7a65aad28eea03eaef38ef77f3914f.json | 120 +++-
 ...af662d9307881939fdb3948822b3be6620cce.json | 120 +++-
 ...6945828158d5e9660026876c9978689c098de.json |  80 ++-
 ...5eaf2971db213ce1b1716d0e088b80ae6959b.json | 120 +++-
 ...eeea2c9b1b816cba003732da8fe1ae9bb12c4.json | 120 +++-
 ...61206cfbf724488baa4a9cd83863ae519abd3.json | 120 +++-
 ...1815a860cf73e32d9e348beae43039df1c2cd.json | 120 +++-
 ...d3ef84a6332dc404d6d9785f468b0204c274c.json | 120 +++-
 ...e10570f30a6d811e9cbd4d17eca3239eb7ba6.json | 120 +++-
 ...3996b98bd10c0501c4e6b1114a59c1df7ab42.json | 120 +++-
 ...8f8dfb449583535685709a7d9fa1355e32e89.json | 120 +++-
 ...34b4a0bae150ab6a591014b93cee198e4fd9e.json | 120 +++-
 ...21196776a4e91e71f1aea65176b4f1e3ae983.json | 120 +++-
 ...6a059732046e9062e072b17117f14f7d470b1.json | 120 +++-
 ...0ab11593571ef6c4ac31dff8bb1e6919548c7.json | 120 +++-
 ...eeca062f586c523963246d1762f1b3f9826a5.json | 120 +++-
 ...d0f3bb35dfaafc92756b6a2e71a6d02d8bd76.json | 120 +++-
 ...b6b9fe492bdd0c3e41e011921a5960d92bd06.json | 120 +++-
 ...48e613881d5c8ef76a9b4d2daaf5391f604ca.json | 120 +++-
 ...2445aa92865caed7a3bfd0f1daed35d6c28cd.json | 120 +++-
 ...fb528d34791d0da895a0bbfb9f4a30c9da306.json | 120 +++-
 ...5ab0a661a3ff66ab845596fdeefcaaa2232fc.json | 120 +++-
 ...523a76464dc4cdbc49f69c8028989e301e6f7.json | 120 +++-
 ...c37ed3ee621ef38fd0620cda673cc3c76ba93.json | 120 +++-
 ...332e8417b2d0f3f98e810965de54f38d16ec0.json | 120 +++-
 ...b03bd9ed4c18a4d9346098593027c12180c97.json | 120 +++-
 ...34bb71ea2c2b440c290ac0a95cc0599bd8148.json | 120 +++-
 ...757dff29c824709e5fcd3aeacdf2aa8cfebae.json | 120 +++-
 ...e60afeb8db1fed2a125cc52b40297b7219269.json | 120 +++-
 ...129e6673079a29c3d31194c0a5fa5f35b811f.json | 120 +++-
 ...cc3c4ca57bf8bddb318a4387ed4381c1b87c4.json | 120 +++-
 ...c79a3eec07b04aa1c95873391b6aeb87f2f83.json | 120 +++-
 ...bb06aa3fe36f3f82b8ab373d3a9eeba170538.json | 120 +++-
 ...907a4bd628ee45bc5da47bfc4724281b772d7.json | 120 +++-
 ...eaa64313a15a7b6e9f6fe8cd0ad0d19ae4d79.json | 120 +++-
 ...a8c799f6f251cf64654360a670c71564f2e79.json | 120 +++-
 ...f74e880792fd63ae1068f22554fd8d3dce2e4.json | 120 +++-
 ...f1361a8f55899e5690f4edb3f63f151eb4345.json | 120 +++-
 ...6c469b11bb65de265771a4ce262eef2da607b.json | 120 +++-
 ...4455c7698ba851904d0fff952ae4edc7e76c4.json | 120 +++-
 ...22dd75db087080957e0009c870263691379a2.json | 120 +++-
 ...cddc926fd9164a6bc92dd03fe08d46080cc27.json | 120 +++-
 ...2794d09b22b46bd014d7a8c820d070ed730ea.json | 120 +++-
 ...df42a94c24da0082192add3e33cc4f77e4cb2.json | 120 +++-
 ...62d3caf2edb027c4de066f9ca76d267a2b6d8.json | 120 +++-
 ...09d438f68b0565007a4f5d5186d550022dcf4.json | 120 +++-
 ...dd4eee2aebd24d6f979a378eb7aee76453ae2.json | 120 +++-
 ...1e0917f706a71e24ebaacd4689e15b0c9b6bf.json | 120 +++-
 ...972afc0145471ebb54468d69e5ee27e3d8542.json | 120 +++-
 ...1cb6993afdd6f64d424ea051c57c3990a0077.json | 120 +++-
 ...60abd5a0e59a2ab3d8f11479b6e4afbe5c22f.json | 120 +++-
 ...3ed70ecdb5f18671b256d118caacb1cf1244c.json | 120 +++-
 ...5004eda3202c7270bbf092480ee6c4fb15ace.json | 120 +++-
 ...24f4b0007706d639f6b6214d5a2621963681b.json | 120 +++-
 ...2605abdad67cc856398795a680266f794494f.json | 120 +++-
 ...cc9597f44c1ec8b139752fc4292ebe66ce710.json | 120 +++-
 ...fbf26c2855d5aaf75f48b29b649bd05692a10.json | 120 +++-
 ...600996bbc368f455e1c739f499c4cd9b77fc0.json | 120 +++-
 ...0db88a7f37324e6c885200699a54b47768294.json | 120 +++-
 ...4686eeaa8a8c6ca06164decd6776f55c5ee96.json | 120 +++-
 ...568c97753068fff36e91d05581efbc24563c0.json | 120 +++-
 ...c05795139db386bbeb2c04e5f59813aee588f.json | 120 +++-
 ...dfb197982f0811f33f0379c9a6353fd85edc3.json | 120 +++-
 ...c67d1713bca35a2ef40518399e6d3af5f342b.json | 120 +++-
 ...ff96bdcaf6552d9f0763e382daa001b6cdb40.json | 120 +++-
 ...da091a8eed99d190d1653722ecbdf451e5415.json | 120 +++-
 ...fc5c38b367f9289c0a642fd60e531de2f3b57.json | 120 +++-
 ...35a4c59c7b94df6c961749a09f12d8a58a352.json | 120 +++-
 ...fa0eb74c897ada3e7d2d19f725267a96c95a2.json | 120 +++-
 ...2ff4c4f1361b328a242db69959e408a494694.json | 120 +++-
 ...90984e3da2e79598e3fb4eba4fdb41989c984.json | 120 +++-
 ...41923c27f22a96bfd76a9a8a3b2569b91a53e.json | 120 +++-
 ...a56cde55e6c6371c50bfa2a93a381cdc32495.json | 120 +++-
 ...022745562f50975056c368a84a733ddba5319.json | 120 +++-
 ...0c814a9da144f7c44fecc61aa19c899e14908.json | 120 +++-
 ...c050c89c695099088ec2c50e89094ecf2683e.json | 120 +++-
 ...3e7c0d07b08c6b94c5330ee508aa02b976d79.json | 120 +++-
 ...48b892bd661b95b085cc5aea3c789d06f4c7a.json | 120 +++-
 ...e13e2dfb0404e1fc0caa0e0abede544de5cbd.json | 120 +++-
 ...9feb1214ecdeeca4643f1724304e90f0c5b52.json | 120 +++-
 ...ed3d993954e1122aba91bca73575cb9ef259a.json | 120 +++-
 ...d4a844da9e80d56caf2319d0b09d9746274f6.json | 120 +++-
 ...df5f8969de06b11f9fe69168f746032eca879.json | 120 +++-
 ...3140125d5a63832b560a8ceca4e9824da293d.json | 120 +++-
 ...c535ead0b171e75e413ad7a22add8b94fe12e.json | 120 +++-
 ...b165e1e51019db4f32dc3960a3856509e6b10.json | 120 +++-
 ...ab34a4e77453be45d5743cce301254b9d4f70.json | 120 +++-
 ...b72b174aded01b6b866bbeb34751b7297733b.json | 120 +++-
 ...f1b0ae1eee0fecd5a7c46c3487f3b6dc6b057.json | 120 +++-
 ...05ef1a95d6d84b653de740d0688824e6cc958.json | 120 +++-
 ...5948a70874cd4556e6b60cd794cd9285feb22.json | 120 +++-
 ...498fe461062e23f64aa092d6f868d712fcc85.json | 120 +++-
 ...1cf53e38305a659a1e2d048f9613d35acf097.json | 120 +++-
 ...34b83b9dfec592e7806ef6612a86a5c3310a4.json | 120 +++-
 ...a2e319baa13c4bfc3207cfed423d5b235c7a3.json | 120 +++-
 ...1a53ba07e60e2feb4257d374d179818c0e1a7.json | 120 +++-
 ...9c25a7f3d95ad0453a77d9b202e6200d675d8.json | 120 +++-
 ...f0e7119ff8a7854787659ba6486ed5dd160b0.json | 120 +++-
 ...17d2a0f00a6ecc4ddca36bdc64bc3fd302075.json | 120 +++-
 ...367629c47a7bf4856cf0658f53e8ef6bd4012.json | 120 +++-
 ...c1d4785707448f03dc5a5dcf34493a76ef134.json | 120 +++-
 ...7e1d0a5408c81734469f4629f830e78ddef79.json | 120 +++-
 ...1573781ed4992f1172af07a4084a2458fd243.json | 120 +++-
 ...75f1d0fce1b205972bc991638b47f459c86e8.json | 120 +++-
 ...a215cc72585d6691218771c28bbfd40bad2bd.json | 120 +++-
 ...23f387efebcb2fb744d589da5eb60ac8b5a2f.json | 120 +++-
 ...8ae9492a59923e7dee4d59d378648b4b8c272.json | 120 +++-
 ...d7ecd8056ac97a3c1081cdbe2bcbc48832bce.json | 120 +++-
 ...f629c792d661f4c4bddbd32df911464282586.json | 120 +++-
 ...7789e9c3cd200a626d2f5ad9b8cb496564749.json | 120 +++-
 ...28c08fe3641d2fc2bb7a3d997cfe37559603a.json | 120 +++-
 ...520d68f13b97bb55aa1a50859609e785bbe94.json | 120 +++-
 ...6f53e96b13c4e1daf4dbb82a0b65061c9ac99.json | 120 +++-
 ...5a4d25c15badc7ac66b97f7c279979bce2725.json | 120 +++-
 ...bf509a757aaf3abc19937f723c7914545bc61.json | 120 +++-
 ...eb2d5856d53c84b344d82608ba83c0c06f013.json | 120 +++-
 ...7b9745f8381d0b00264149e5683504bf463ce.json | 120 +++-
 ...122bef1ed48427641aa2ba120554dedf15bba.json | 120 +++-
 ...0fa2c05cf6d66862e0e63a375a12f6dca9d45.json | 120 +++-
 ...adf50c73122ba2eb6f1684bf6e249d16e9a08.json | 120 +++-
 ...54ca437e5986646f9bb67b54eca04a728c310.json | 120 +++-
 ...d93ae23da1e6bbaf51234f0e34b9603bd151e.json | 120 +++-
 ...8b6c95baeb0f32fff0171c4032ae9a99a585c.json | 120 +++-
 ...248c91d47d68ac560a81aebfd0ede344ad285.json | 120 +++-
 ...84eccf126c884dcfb17a3d773511d09ff8a7d.json | 120 +++-
 ...a0cd046f46175d9c494da778329fb92e1b1c8.json | 120 +++-
 ...02a049395e0a0f5861308d63cf968a6dfe177.json | 120 +++-
 ...8d6feca161c723f28929d6cbb30479f6924ae.json | 120 +++-
 ...e19b3c147885c792ad04d896258f6800adc01.json | 120 +++-
 ...d87ce7c6c3bca381073a32ddf47de29f6c23a.json | 120 +++-
 ...b0c182011c2acd90ddd555ba2a818c3097c59.json | 120 +++-
 ...b355a1bf226a09064499762b03cea811236f5.json | 120 +++-
 ...6328a2ae4547692bb6a08f5ee2dc2ce4b25e9.json | 120 +++-
 ...6234b4693881a5e4ef898cd5b11a123ab4d13.json | 120 +++-
 ...94d26d2fcf63c2c0bf4c0b1d783f53ea4e52f.json | 120 +++-
 ...fcc8b3847d347f710f4a46ae1ac192986c981.json | 120 +++-
 ...24b8211fc5e04a8a41541f7da05df048166e7.json | 120 +++-
 ...207c3066f1ffbd151959fd7bdf29c07b02298.json | 120 +++-
 ...85e0c1b79dbcd88df62d430e23b2ecbc41685.json | 120 +++-
 ...c7b19b6fb6e468a21d8fd17c07b3676f7e568.json | 120 +++-
 ...8e52bb813c138683e38f2e1ebc7dfd3131ad7.json | 120 +++-
 ...ef5fe04a8594071227b50ba4e4f1c67070ca3.json | 120 +++-
 ...66ff1ac0c9b4d4cf4108a2172ab49254e9992.json | 120 +++-
 ...8300156d7b101f3fabdb9a5b66650eef37d04.json | 120 +++-
 ...ba300ccd3f8a8ce43172dbb79394076c4ccde.json | 120 +++-
 ...1b27f8b8e179db4fc826a1ac81a70c7f0f014.json | 120 +++-
 ...efef754fb8ff1c9a48cb40254d24e4b021932.json | 120 +++-
 ...fd67ace59edf84c2d95fce4f8836571d6ac18.json | 120 +++-
 ...06a3e13cd549e165c8bad694c59a6687e9424.json | 120 +++-
 ...c8b6f90bf849e3adc20f2b2e24ccd1c128465.json | 120 +++-
 ...eb67eb0bd87437d450690c1cb44032123b3dd.json | 120 +++-
 ...a101c4a38cafd034acbf494600294eec9b1e6.json | 120 +++-
 ...a9bc9b547563249b2c43dffb33dc95829c5fa.json | 120 +++-
 ...46deb49ee466bc4288792d0e4342dc80896f3.json | 120 +++-
 ...6415309c3b229c7d40bff8a3b9cf0cd58071a.json | 120 +++-
 ...ab20725b791a5660f678694db33cb4a1ccefe.json | 120 +++-
 ...752d749a28ba01382db7bb02a0a972d2c401a.json | 120 +++-
 ...8bd41ab202db204cea1f32221d6eaf35d8cd9.json | 120 +++-
 ...aea79dc2fd325bef3fa0df4b811a6f746ef34.json | 120 +++-
 ...d0d3bd104ad2aa88641b7b6704cc14de00fa2.json | 120 +++-
 ...2aeabb79ad9249ef0960923b730c571327ffe.json | 120 +++-
 ...dde94fdc76cf2ba5c1ac07e02a291730daf56.json | 120 +++-
 ...4e98a5b8a09ad280c6d382affcd06ec248aee.json | 120 +++-
 ...9abe88143eac23364f5aa0e8bec52eb83b465.json | 120 +++-
 ...a3bb152ac556d10011963b2543c28bede4f4f.json | 120 +++-
 ...efdc8162eb23ea015be57b9d18094521b1551.json | 120 +++-
 ...9a30f3793be19e8fa9dfad276edc57705ac89.json | 120 +++-
 ...eb076d2594dfc30f6c2b6abba097fbc9ddbff.json | 120 +++-
 ...7443a5a447a1dd4060b87a0b2a1e6ebb8720c.json | 120 +++-
 ...9802ae024b42034c30c09b782dd85b260450c.json | 120 +++-
 ...a779a6eaa498e69b648767ef394de194387f5.json | 120 +++-
 ...db13b966c9eb3b197e601f867b59aeb753000.json | 120 +++-
 ...89bae634b3e3a7f603883c65d4b1f99f417f3.json | 120 +++-
 ...e387dee17b1c906a9b53c95f4752441d5f4e9.json | 120 +++-
 ...829d08b3bf661e5f3c36155c1e46fb033075a.json | 120 +++-
 ...4f17312ea3b15a9f38b1aad4ed37d1880ac09.json | 120 +++-
 ...8dfbfa938aa71e4877cf59d50a66fa4bade4d.json | 120 +++-
 ...1530e6c63665594f5a9552b1a49b8e6446e2f.json | 120 +++-
 ...74d1463f86358c828c6b42b08169133d7a9e8.json | 120 +++-
 ...aed5424af094435eca1de3f47ca9827d3c879.json | 120 +++-
 ...d7ed64a2ac5a8331d45ee955ede225209d69d.json | 120 +++-
 ...5520d000d77c2667260fbacc08d70aac0dd96.json | 120 +++-
 ...cf2fe310fe43127a335434b687a3838a12e79.json |  40 +-
 ...aa3b07f492919881b4b1c365353efff902a68.json | 120 +++-
 ...155edcd9d349266c30abc408a7a69e36baa63.json | 120 +++-
 ...bf1576fc516da59b95787c4e86e22bceaa2f2.json | 120 +++-
 ...e0eacd91a90aef1f5a41cd0c44cb32814bd4c.json | 120 +++-
 ...84023c6fee7b6a8d8b93dd10119065e46edfd.json | 120 +++-
 ...7e2298e77b88e1c25cf5efb2f048a18475ba3.json | 120 +++-
 ...19d5d03c6d67f35702459eaf182a1b36471ad.json | 120 +++-
 ...48e68db99c71ec27a21d912a4b0233d9328d2.json | 120 +++-
 ...e11d829036d6e027f4a4227fa9c8a9f0cff08.json | 120 +++-
 ...c8db96265dbac4913b5b6292e3146c515e073.json | 120 +++-
 ...56cb9be56068dd0dafea4ea23cf7f44c7afc9.json | 120 +++-
 ...5a2b4b6b737adf181d3ef1dadaa55a446dbd1.json | 120 +++-
 ...88a8bb1f154853a4c0b04e2cd2443f650d71f.json | 120 +++-
 ...bb5bece5ee9a65e9cf7f2095446fc2b37677e.json | 120 +++-
 ...188b8ac4d4f2191db06c508ee38bd1eda54a3.json | 120 +++-
 ...f8d81aaa78ecbd1a7548fb809518d851d4153.json | 120 +++-
 ...350c687fa4a5bace39a9e449eb98f3e5d829b.json | 120 +++-
 ...59c0c01de0263f75cfe881d291c300e921716.json | 120 +++-
 ...d23d149e88f8c1f22e7ff754ea830991fc3bc.json | 120 +++-
 ...60087a8383d30a43c88bb5343997f73973e18.json | 120 +++-
 ...9f1386d9a37a56828e2f7adcde859ff2e7573.json | 120 +++-
 ...bd14e00106a71304c6235f5086baf3967b3c0.json | 120 +++-
 ...f2dcfcaf1078ac26d626b32fe4e55d108a62a.json | 120 +++-
 ...ac7e6da4d23ff344137eebfa4ca251676b6cd.json | 120 +++-
 ...ea430902a547482bc3ff849be108adf4ab799.json | 120 +++-
 ...a476517cba574bfa6cec43675c0e83e2ff88e.json | 120 +++-
 ...ef4bc690f842dab4e57f05e83ba0331adc190.json | 120 +++-
 ...cb36b5454c8f63855d5c424ff8232c048da87.json | 120 +++-
 ...7fb3b8b37d643ee901083e797a4b99fad0724.json | 120 +++-
 ...cd471cae5ad7ab536c06e6ddc78badb805266.json | 120 +++-
 ...8fbb855e21cdb1c869dfe918d50f54c5a75b9.json | 120 +++-
 ...43b856eef1bb3d96c6dc51e54d4c46672842b.json | 120 +++-
 ...ff5a505f8daaa53753fbc50a295f82ac9cc01.json | 120 +++-
 ...1999c22aeadc0ebf9ec3ba1f3fc2a8c0089ee.json | 120 +++-
 ...1d4289e152b51cb11aa164cd6bf24920fe4b2.json | 120 +++-
 ...adcfd6e77d66bef3e752d68b059d250b428ed.json | 120 +++-
 ...38441b7a3773023463c49719d465909d868d6.json | 110 +++-
 ...a1d4b4df4746dc42a9f0cb848799bebbe9eea.json | 120 +++-
 ...6886fb46344cb1ed2440eb7d9159e714fd488.json | 120 +++-
 ...960cb2c1b2196b11d513b4046b6fe3c8871fa.json |  40 +-
 ...b23324533d74351af9d1d3287815fb80f4daa.json | 120 +++-
 ...a8f4d875d4a3a34381e1c24c60db9dbcfd5e4.json | 120 +++-
 ...3de0be6b995f789a4670cd16f4614de8b907e.json | 120 +++-
 ...e27949148dd0012f348801d64b30d9b27ea90.json | 120 +++-
 ...51af914da80278adceae4b34153a068f7d572.json | 120 +++-
 ...13d54dc9241fb4d2ea7704d4bc0f57c533ee4.json | 120 +++-
 ...44d8da6332ce73e4e6e93fd80b99246c9504e.json | 120 +++-
 ...e04d4744930aa5c288e89dbd296ae9a51ab27.json | 120 +++-
 ...785d24decdab39f65bd89d74169d6cae6a4c4.json | 120 +++-
 ...d461dff91be35baf80482fe3405defbcaf17c.json | 120 +++-
 ...10ae77009ab1e7e6ead8fc87549c4adacc30a.json | 120 +++-
 ...6a51555f15300dd186e65a89306449da750f0.json | 120 +++-
 ...a5665590dadaa410ae37be42cf8c38ebf5228.json | 120 +++-
 ...865c2e9e9f967ec6c1d85bd1ec6b9ce81d326.json | 110 +++-
 ...a7fbd3617faa7e877b6038d722296a4b9d27d.json | 120 +++-
 ...af84c84f851f8ad08f0d1c165ac756ff361f5.json | 120 +++-
 ...a97aeccaccf888e717ebcac44c4ee680705b1.json | 120 +++-
 ...bf4ceb4c21f136ef5564dc649eaabe796d2af.json | 120 +++-
 ...c65d6a0d28a825efa2260b21fb646da2d7305.json | 120 +++-
 ...3b175b406fa918945038b82d980fddc8fb8be.json |  40 +-
 ...9c09c494d1fe4e3afd20fe702cef632f492b0.json | 120 +++-
 ...7f1c7f23871d56b18153d9f46612f39189a65.json | 120 +++-
 ...b59edfc9f9d6201f583176e0a6cf4445aafe4.json | 120 +++-
 ...9cec9fa08db715b220aaf9ab251898986e8a8.json | 120 +++-
 ...1f70a3b580008e79ad7d2f79c554604d4bf4f.json | 120 +++-
 ...736c90c6e91da980b4286805b8759e8140360.json | 120 +++-
 ...30557bcc567d0adf8ce6866d7979ff1d48256.json | 120 +++-
 ...8740c4d1065a1f7db2d69103dea6bd50cbb4e.json | 120 +++-
 ...b17e6930e959806dc8dfd9a31c36831009e86.json | 120 +++-
 ...cce3a415f8f5dfc2b237feb7cc124c01ebc5d.json | 120 +++-
 ...2c1dbe98db92a4c97fd462eb40a797cc10903.json | 120 +++-
 ...4b45d64e569bf8a44d0cb26cadd19d02bb896.json | 120 +++-
 ...8929ac20c52e6a5b9f212a83241ae6638e5ae.json | 120 +++-
 ...3a1be26de1d55c9a999fcd2bca635ab0994ae.json | 120 +++-
 ...9db8c629bdec52719f2c8d30dd323fbb2ba2e.json | 120 +++-
 ...e4c92116904b0fb6d9e3a5f5fbf168d05b7d9.json | 120 +++-
 ...6cd89a9f467a753248fecdab1afce4c35b6e4.json | 120 +++-
 ...37b05f78203ed138b10bafa0bcaecb8240e5c.json | 120 +++-
 ...5a1ff1b0982afc158333c77c32248f432b958.json | 120 +++-
 ...b369a6be00d8de248438225943338bdc28ad3.json | 120 +++-
 ...aca00ac959a2b9fc2f68db187e24290d6fa39.json | 120 +++-
 ...4c3babc42128066c12b2e61fc3f1e4f361333.json | 120 +++-
 ...e0b821a33183bb1b27c5204c767cf73046ff2.json | 120 +++-
 ...3c703fbb3741577a9fb16f3199d65bd6d7757.json | 120 +++-
 ...c0aa13f242dd5caecf75aed878d8bdf5015c0.json | 120 +++-
 ...1608663ac1df71c7a9a3508941597a8b87570.json | 120 +++-
 ...9b0f4f26c6da3de746e83a900168433acaf04.json | 120 +++-
 ...bc0de4ce3765c0db88eaa29075e491c9924d1.json | 120 +++-
 ...c1baa0ff4d7bf182af9d758aff489eb53b342.json | 120 +++-
 ...c3c69af274d51d9b2e1b8cca81aa059307a68.json | 120 +++-
 ...354a9098237c973efdf51fabca99ad508435a.json | 120 +++-
 ...a34ca93f49c044fe6bd267eb6e42e56704ade.json | 120 +++-
 ...5868edf86eb28e5cd6b133b0b4f093d8f24d9.json | 120 +++-
 ...32cc54d36e8a945ff67e28ed9aecce85c38bf.json | 120 +++-
 ...a4eb8fa4700e7a7a3070a9e457845783747e7.json | 120 +++-
 ...b2b8b520d689f91156782544ce685a8131254.json | 120 +++-
 ...32f30179c22ca32ee6b9a78b6467c4609e103.json | 120 +++-
 ...3fa7ac5bebd6af38878484430f71fca86286a.json | 120 +++-
 ...8c3b001402a861d5b7fa618d637b132abe8c3.json | 120 +++-
 ...c88c97d3574fd3d9db3eb23d531316717d49b.json | 120 +++-
 ...9f39a7eb5e9da51373ff547790271ab553d63.json | 120 +++-
 ...fd1c0506202b975092074ed485a6c72de7c35.json | 120 +++-
 ...070eea367ec82a3ccfbba21a7585c51cb63a3.json | 120 +++-
 ...a250e2aba06b4c57ebe4937327d3ef25aa6be.json | 120 +++-
 ...0682a39bf8b9563147f3e620f51b03a765bd6.json | 120 +++-
 ...7fedb7fc99865c1e8c13c2fdd812fa041f905.json | 120 +++-
 ...938f9d55ff46236ddb3f7481644229ea84619.json | 120 +++-
 ...2a671c24db31d5920a4219abaebd38738820f.json | 120 +++-
 ...751f8974775fad771c94efabf90348ff5c0c8.json | 120 +++-
 ...a33d57bbf524986b5ad8e9c77e862b1c60394.json | 120 +++-
 ...f52fde414d6b60cc8266d7cd0f8a85523d43d.json | 120 +++-
 ...6451b547ec42b894a88ac8049782ed9c8fcde.json | 120 +++-
 ...2d084ca3788830980ecb74e2c12afa681a1d5.json | 120 +++-
 ...b906de5b1bb46479ccc6d660b3a56205d46e2.json | 120 +++-
 ...0e75ce2a11931b27717f0628d176ba24ccb4f.json | 120 +++-
 ...27c36fd7c9c018ad27a106fa99044a7cc1c69.json | 120 +++-
 ...4f64a39365338a80032452226d39343fb93c3.json | 120 +++-
 ...ccca1808c2ca94e0a53914637692a5f70c677.json | 120 +++-
 ...ea9e4cbdd9d1bb0d1a310ea9722fa8aef6438.json | 120 +++-
 ...0758bb47cfede252c0aff279ca8f395b51ac2.json | 120 +++-
 ...85fb7a37ed5d97beee8eef1c78c8d584bfd23.json | 120 +++-
 ...406ba3a77c11c5dd3fe24989da26551820f92.json | 120 +++-
 ...8bea882eaa5293763b6a7135c271ea4155505.json | 120 +++-
 ...a2107b6ab6cce42b2160b170aef3b528cd4da.json | 120 +++-
 ...a5e50101bb3dad855bf18f8b67c157144eb41.json | 120 +++-
 ...65d3dfbb960c519f29e3906307d611ffaae15.json | 120 +++-
 ...be39a0e8ca56b7f860c24d898a862ce7b1641.json |  40 +-
 ...9a674e6517e62909672096a240026f2c9b7da.json | 120 +++-
 ...6a4220e6c8f359b14a71ad4dde4392685f4fe.json | 120 +++-
 ...e197beb7238d43a1ad2a90dbd42c9d9cfc44f.json | 120 +++-
 ...8ca0053e915eb0aaf2034c5a18bcd8194605f.json | 120 +++-
 ...429d1a07862e1d1dbdcc9d67d7b1122bd7887.json | 120 +++-
 ...8fbf3df419726990afb22a94eff94e1aad654.json | 120 +++-
 ...5f68cb4896eb79d0581c2d210692d1f2a3b2a.json | 120 +++-
 ...a7265aa02ddd517afbe801504d45528c6473b.json |  40 +-
 ...e4a3e117b0768333fa1cfb9511ef928b61e45.json | 120 +++-
 ...4dce35c50c45ac609f378a680b7b8caaeba71.json | 120 +++-
 ...d28618e57781b90b2cb062eb2e0c35074968b.json | 120 +++-
 ...09ed3ce3ca1bbb7581ba1f5035cff45ea969d.json | 120 +++-
 ...f63399d160023562bcf5317506bf049959ef6.json | 120 +++-
 ...abe98f71c08bfabda643b5fdb07ee5be7f6bc.json | 120 +++-
 ...d25901f66563e471830cc3992156b6cbd90e3.json | 120 +++-
 ...e00d2c1e3dba4bfcbe7533a16b216860a3b56.json | 120 +++-
 ...88d700d07ee66e9aed294ec88e256f96a0099.json | 120 +++-
 ...c16cdd10dde7bf368be9f66a13d8bfd0c5d7e.json | 120 +++-
 ...fe16ab3b3f9798a1508ab1cf6ea701e7cb757.json | 120 +++-
 ...15723bd19cfced47a6111f4b00bbd1914cb34.json | 120 +++-
 ...47e38ea5df9441922928f293efcbc4f6ba722.json | 120 +++-
 ...14134aa1ce9af0bb49f8d1fdfea528860903b.json | 120 +++-
 ...cdc2b803fe8afebeac848ef72e20eca2ede2c.json | 120 +++-
 ...a721afbe45d420d3ec127d35435c49e0813df.json | 120 +++-
 ...3110c98cad112b5100aee32dc1c44bead590f.json | 120 +++-
 ...1be0e19ff7c90ca7f8272e5c246f818809428.json | 120 +++-
 ...9f37ef3073f9d001be9f58064951fcd50ac40.json | 120 +++-
 ...6a16ed5b85032a68658f06177c34f6df00014.json | 120 +++-
 ...ca91dba601740aa810e83bf915f68342b4576.json | 120 +++-
 ...dd956b047b4891bb50fcd1196fe7ff07be347.json | 120 +++-
 ...0006036dd185ebf256e9ff21f88aa2bc720bd.json | 120 +++-
 ...6baf46d0a36f2dfeab8c192cc2d2f05b60593.json | 120 +++-
 ...18fc7ef5b82e44d498355e9f55192dc170914.json | 120 +++-
 ...094ea4aaaada209c625352c25d5a698376713.json | 120 +++-
 ...90f0e0c1e0657f8650dacd5c0672fc6110e0e.json | 120 +++-
 ...786bc93ee6c4c89dd6f523f23a2de8a4ee390.json | 120 +++-
 ...acf2669cc2037f337afa4ba73f1e07b4a9450.json | 120 +++-
 ...f90ef4c5f6bf96e92b97b4a919db6d534490e.json | 115 +++-
 ...a66a5e8d3752b3e3569c04148a8707ae7c42c.json | 120 +++-
 ...7b56767cd2bc51eeb85f5762944619a27c1a6.json | 120 +++-
 ...f52fee04d6451c0fbb54fd0e9698a0ed37b65.json | 120 +++-
 ...15c53e94ef93c32b41c2d869961f2cff2f85a.json | 120 +++-
 ...cfd40a2187a7611e6f099db17ad4c61ab0e1e.json | 120 +++-
 ...d5589c286ff2dda5865ae0a230c9ef13d90ab.json | 120 +++-
 ...2c68b117bfe1a2bf107444803980582b649dc.json | 120 +++-
 ...3479cf32a69d57cc90e21031485de6b8aee93.json | 120 +++-
 ...ea141f627d2600b135b349b67b8865a9510be.json | 120 +++-
 ...17142035535be823880e938720aaf57529996.json | 120 +++-
 ...37ed0bcf4cef38164ef8af5886926a08151ac.json | 120 +++-
 ...736daebe04bcfd20e6c0fd965104fd55ef5c0.json | 120 +++-
 ...e2ae73a80519758593d2206484b8292d2c004.json | 120 +++-
 ...c4572b2ce32105b85dc6fdb01c24b2b861ab9.json | 120 +++-
 ...bbf3d5634bff7fd8eeec171b1d07009eb1d3a.json | 120 +++-
 ...6913f9fa8b06d1b2a1b8b6c02087585d7f986.json | 120 +++-
 ...54ea00da58f9e88b5d0c37f9193392debe301.json | 120 +++-
 ...632e1f05db154fc98307f5d892a24885d5c82.json | 120 +++-
 ...beaca1968a7be4d266e384804a132493e8399.json | 120 +++-
 ...56236f75c560e53317db95265b0e5f0f65480.json | 120 +++-
 ...7f2fde87822377f06d1fd153e29b62e06f8d3.json | 120 +++-
 ...acb87614d3ba808a7e95b203cfe400d534c09.json |  40 +-
 ...b6dbdab417662086f05cf5cef4783c9527df5.json | 120 +++-
 ...6e1fbb078a7b301b99741c2c13e7648f0ba5a.json | 120 +++-
 ...00abaad107d213c8ca19cb289745b6781ae4f.json | 120 +++-
 ...11cc0296021a6f030cdfb095950c06fae3f78.json | 120 +++-
 ...554bbfd7bd35ff8ad7ff836fb4328fd0f5201.json | 120 +++-
 ...3918b812003894eaadf8eb48360bcbe08e55f.json | 120 +++-
 ...5048e41123c7389400efd99019d7a42fb70cb.json | 120 +++-
 ...36934f407e850db2cd8ac2673cf9b5ff22edb.json | 120 +++-
 ...3298a9025cabbcf814803d3a81cf93ced082e.json | 120 +++-
 ...b81812331e4010069807d549e5a9969295734.json | 120 +++-
 ...ce766fd4f34d8e68da07dea8946df560b0ccb.json | 120 +++-
 ...cc9016e893ab66204bb8a0b802a61432ab015.json | 120 +++-
 ...bdae252646a9315f7fc3c5014eb07821d7094.json | 120 +++-
 ...f633399d05fce053acfac28313be326a1cc33.json | 120 +++-
 ...7d040862fab0ebee3c62b8c96810d5b69cf0a.json | 120 +++-
 ...cbecf2f92d04516d732299b0ce7902b7566e9.json | 120 +++-
 ...59308a17eaea1b8f0eeafb7a36ac12b0f7f6d.json | 120 +++-
 ...4f695a1aa025b2d33cd869402a81812088afd.json | 120 +++-
 ...072a600dd8a6a3b7b100427c15066f1f4abb6.json |  80 ++-
 ...78e66463b8a1a89f57b5c2600623f923d00cf.json | 120 +++-
 ...ff26c81d2d23ef3cd5e9a30a37d299fd579c3.json | 120 +++-
 ...0663125e18d6e4061ff31dcaeaca64b9fe7d7.json | 120 +++-
 ...0c344cd87f7e9a5cde178394188f4eaaf7fbd.json | 120 +++-
 ...5ca95a7fabe1adf9e44fdd782d45071ca5b89.json | 120 +++-
 ...090634cf2b752698e0a212a93dc3874388910.json | 120 +++-
 ...f4d616164909bc939e3907e7dff4f7ce88571.json | 120 +++-
 ...482b861320f86dfe48c43eb2076af102273ad.json | 120 +++-
 ...7bbe9c13bf9cc55f5d27f31b86dede7e8c750.json | 120 +++-
 ...2126159e441e829d39600f12fcbfedca19715.json | 120 +++-
 ...864d0711220c5104e01ed1336f9a0d10dff58.json | 120 +++-
 ...01b42bb1f1e0433944ec6fec137eec4826d27.json | 120 +++-
 ...07c7ec30342efdb400ed2c90eb551994574f4.json | 120 +++-
 ...2b76c63cdf7e61a995a30a93d12f7aed91a2b.json | 120 +++-
 ...6a99cd59df815788e4c43d591eeeef5595c99.json |  40 +-
 ...f1cadcf770e09cf3f60829a458b0230e27eb9.json |  40 +-
 ...983d65a5e9a428f95d8026ff7aa306ce89dc8.json | 120 +++-
 ...6199a3ae1e1ac97512ce3fa10eec795b71302.json | 120 +++-
 ...cee88d3e5598a81681338e16b30092c33dc2b.json | 120 +++-
 ...99b85551ee672fc984d21d2ad02a294268de8.json | 120 +++-
 ...b16ad2735efa7f9e3d5a764bd3b59d8085bdc.json | 120 +++-
 ...4fc223403a113f3a85563c360c17fa71e3535.json | 120 +++-
 ...7a4f91770c47e0c8a8ba6b52a37a816a5c93d.json | 120 +++-
 ...4a7ae0f37a356481bfd94170d5e699c0c4315.json | 120 +++-
 ...870aef6ae5d3440e39ca160e8498ee7964ebc.json | 120 +++-
 ...58302450d25b602e878ab27e3e460a03ce21d.json | 120 +++-
 ...5e45783716ddd668030b3bbcd09ab314184cf.json | 120 +++-
 ...132f0e49156923495b7a82cce41265f095657.json | 120 +++-
 ...2898f743f1bd17d68147dd28df8525bef20cd.json | 120 +++-
 ...5f6bfb9f8404d376c144399022396b497521c.json | 120 +++-
 ...490b93e58425f8e95e6aee6d923326c465b36.json | 120 +++-
 ...a865260e727d3de17230d456dbbfc0573410e.json | 120 +++-
 ...d76eb66f3ed2e198f61e73099e822cc021d73.json | 120 +++-
 ...f66ccc4b4025afbb9dcadfc056a002d23fbd2.json | 120 +++-
 ...40bccf611aacef35d92682b472b951ccdb86e.json | 120 +++-
 ...c2229a36d09f4cf001731c30336f1b845bf81.json | 120 +++-
 ...ff546eee4c6b8ce6214b1fb44a8ac0922e1a7.json | 120 +++-
 ...c98c2a80e66f620f76b7cc8c0ea206f050509.json | 120 +++-
 ...f0ae1d2f80908d3d4839521df15a7b72ce543.json | 120 +++-
 ...04e1f16b54da2ecb9ba425cedcada8e2d3dc7.json | 120 +++-
 ...0cccf91fd4e442aee6bf2ab24d493b7dcb0d3.json | 120 +++-
 ...9316ac78f1b94eb94eaf5f265ebff767daa5f.json | 120 +++-
 ...fdece040a7781911fed00f38902354403df84.json | 120 +++-
 ...1f5f47e679e6c692e2b3b38d8d52534ff5a20.json | 120 +++-
 ...2bc050bb9f03096c23f181f5580d3de9de43e.json | 120 +++-
 ...0ec04f07c26ecbbc07d77b61ab84f61e73b74.json | 120 +++-
 ...f9a0ffb7521be078ea0d9800c27c8aaf39ee7.json | 120 +++-
 ...321ef900eaf29831efa839cb8f0ba5e431852.json | 120 +++-
 ...deadd3d188a9751dfddb6bb567d6e190152e6.json | 120 +++-
 ...b3bb7b61997bc73aa38c5229b58386ddc2606.json | 120 +++-
 ...6114dfde4a1054167ad3842044654009871f0.json | 120 +++-
 ...7eaf13be16e92be8c2465e7fd55899e0abf80.json | 120 +++-
 ...a02edf1364288d32708cb2415aac3559454df.json | 120 +++-
 ...c8c3e94a8abdf6d8ddcae599dfe50a51b2cd4.json | 120 +++-
 ...2e001e952237e012d570aa287b8cbb349d64e.json | 120 +++-
 ...b42b2e81c0bad00a33668a407915bf8a3b0d8.json | 120 +++-
 ...3e1fd9f742fe24356b3508199c42e6aa33f09.json | 120 +++-
 ...49688b05eb58deaeb21ee99e7610f80eee8f6.json | 120 +++-
 ...9680a659ae3f09376151f8d754ec0c055497d.json | 120 +++-
 ...4687cfe8e7a96150ffd9eb9601dc1eda7c66e.json | 120 +++-
 ...1f29e70f34ab27a95201a43d2a72cd392b266.json | 120 +++-
 ...9baf0cf40cd6b817574bf8256f59cf572d692.json | 120 +++-
 ...e68fb4f2bfaa027510c8ff74d6c727432f550.json | 120 +++-
 ...61281562607a66b1f81afd1749c629f8b481a.json | 120 +++-
 ...7b82554295cb700c5c7b245471f51772a3b24.json | 120 +++-
 ...d94aec00ec1a3d5cd078475d0dc3a76510011.json | 120 +++-
 ...254b1a4ee88e6658d26a5e0ff9e9da959177f.json | 120 +++-
 ...46c129260fbb2bea5debe948cb5cffe53e8d4.json | 120 +++-
 ...f38afacaa4b80b214366039f6e06dc680ae8b.json | 120 +++-
 ...dd30e89a3764e03ddea1cdd980fbfcfc7b2b2.json | 120 +++-
 ...483a27ff569d3800dbb3800d017cc1cd22fec.json | 120 +++-
 ...862d296e406c0eaa97da5ab64b63009838a84.json | 120 +++-
 ...dbd80f49ec54cc7231bc5bdf865903407c506.json | 120 +++-
 ...dca702f808cf70fe36db826a2e62ea659db11.json | 120 +++-
 ...10c9b5baef38c334a1c310679e457562b8081.json | 120 +++-
 ...73ee86354c14a47b1b9227999de3177fac31b.json |  40 +-
 ...a039227f28a92c320b1302316cf67fc28c00f.json | 120 +++-
 ...329e9a9e4ae97dda03d5e6f8dbcc1cd4262f9.json | 120 +++-
 ...ce2fa3332326bafdf017d584c07b142c7793e.json | 120 +++-
 ...0cb715d57475bc9dacda0ba0dd77c589832e8.json | 120 +++-
 ...97643b8137f84bcb4b30eb65c756a25e3174e.json | 120 +++-
 ...e4d2430b6cdb096fbd181a965b7946bf45eea.json | 120 +++-
 ...fa449052339701d1c55068e63f92c7db896b8.json | 120 +++-
 ...b7cbdbb7fcfed6d5e64fdb6e9745a6e70302e.json | 120 +++-
 ...e9a9da6121724743477e359fd3ecd4de71362.json | 120 +++-
 ...5486f77e837ca67f88749434504a48760bbee.json | 120 +++-
 ...f3d790d796bae052ac24ab93a8e4e8d9bba06.json | 120 +++-
 ...2557e80c650481f9850bc32dbd8a483ef8077.json | 120 +++-
 ...c1a74821e12d19cc295e9839d01b459d8054e.json | 120 +++-
 ...1a19560e2eeb8f15df2a030a10294a8a2e9c8.json | 120 +++-
 ...2fa77996aec4e5fdc12b347a8b8336cb24b21.json | 120 +++-
 ...fe818d8c4da7280302af3d2d73afcb4fa938a.json | 120 +++-
 ...5cb529631a3850b8e66e0fe24e26ceb11dd0f.json | 120 +++-
 ...68af24489b18f1ed93c2952787ce4d99bddc8.json | 120 +++-
 ...e050482aa564b1ba5b3833b03369c9ca414e7.json | 120 +++-
 ...1dd1ab53ca29e9659a020a649f96cdf3c4818.json | 120 +++-
 ...61375eb51a9502529d45947218325e1aa8634.json | 120 +++-
 ...18de44cefa25cec4475be3b7b4e3a8226fb37.json | 120 +++-
 ...293b453e1c23064a0f47fb42fd0710e6f1271.json | 120 +++-
 ...7e038d0f3cb47d1d6a287417251c61f5ccd43.json | 120 +++-
 ...be42147b2c967fb72a5a20c0775c178a5abbe.json | 120 +++-
 ...ddaae112b5991d33858a825aba8ea1410abe1.json | 120 +++-
 ...cab814507b52116d2e544ef7e3e940c2161a0.json | 120 +++-
 ...f21041f1571b342799b4ecc81b7f874cfe2f1.json | 120 +++-
 ...7b9b99c1468e78466752bf5cd17b68bd2c94e.json | 120 +++-
 ...88318e4e6b69694b1d6c16684f0fe0381683f.json | 120 +++-
 ...f002fe41e6c391d7e5b52a8a372fe18630f99.json | 120 +++-
 ...255f39e2eef37a9a9255922f0efaa477fd456.json | 120 +++-
 ...0936215f36b4eebfa2e90b98af6e80a373f50.json | 120 +++-
 ...b4fb7b9b4a7aafbc4b4c41675786c96e707f8.json | 120 +++-
 ...d8acf6fd77d5db9734a06b52181ee35788d8e.json | 120 +++-
 ...2795dc3a36002a8f1019a846972476afcec57.json | 120 +++-
 ...321feed22551dbe7cc85bb128b3b103968a1c.json | 120 +++-
 ...7b638604217ea652bb0c087fbb3afe27b2d2a.json | 120 +++-
 ...cb1bfb8d0d62ce600c42dbe69d0122443a02e.json | 120 +++-
 ...bf87abd8fad00a3d20364ecb4da7b19ceb31b.json | 120 +++-
 ...401575ad2bb45f81c5da1c5e9455bb38ae3e3.json | 120 +++-
 ...03c556b4f95cb09e10aacf145e4d2e8c15bcd.json | 120 +++-
 ...cc525b644fab293a5ec8c23a5cbb7684e0c49.json | 120 +++-
 ...c285085b1827722e7157fba06156c27c94ca6.json | 120 +++-
 ...09e4fb14b5b0c8878c035686e65432026e2e3.json | 120 +++-
 ...4dc319b2aa4253b6b016662127e5ad69149ab.json | 120 +++-
 ...577088881435fd9bf94779cae429dcd9def19.json | 120 +++-
 ...7588b66978d1dd2254338fbb68ed6ee64a2f0.json | 120 +++-
 ...502511056c09d7def6b94864dd4cec4693416.json | 120 +++-
 ...422baf5030e519ee155f367080211093dd268.json | 120 +++-
 ...7534b9f74d73fb3f220cf78c5a857cd0a8b19.json | 120 +++-
 ...8514e0f0114f2e28feff17fd2382765095318.json | 120 +++-
 ...7e8530a96bd2a58b8de7b480670ffdbd34902.json | 120 +++-
 ...0ebde00028c806f5093fa8b0135bdf371d8ae.json | 120 +++-
 ...4b8185dcadd8106ba7ecf614bef990e574de6.json | 120 +++-
 ...661059947830ab159b0ed8f0093f339a49d7d.json | 120 +++-
 ...e74c11891a7f12cb5572bb109bd86118a25fa.json | 120 +++-
 ...06bb12f37cc2836361c259c0eec34c848dd2c.json | 120 +++-
 ...c41d098b3fec1b79630508e98797b78438e7b.json | 120 +++-
 ...4395b1712892f51078b30ab8509f92e151ac9.json | 120 +++-
 ...aa2c2bfe7d67f818632e5db586c9004d88871.json | 120 +++-
 ...2d5d79f2b1f3dc2eacb01d5716b50e3fed11a.json | 120 +++-
 ...70a48a3ee96d3cd64840db2e892897fc8d663.json | 120 +++-
 ...aa8981889c8d7b2e901659369586259411160.json | 120 +++-
 ...11ba9c5793bb2f21903cf80dd7401b8a737c1.json | 120 +++-
 ...38335a4482bba1a886183685e4de56fd62a10.json | 120 +++-
 ...67aaf3870c7c6c5cd39c764667deffb775362.json | 120 +++-
 ...f63d216acc608101bc400cb436f26296bf478.json | 120 +++-
 ...a4cb686d10f338ec0ebce6dbdde50a49435af.json | 120 +++-
 ...c84bca96fd4eb21a657935bb955db3f241de4.json | 120 +++-
 ...354e3ba7eb40a2a786e83eba1831d1c00a8ce.json | 120 +++-
 ...c7c46f28bc271d95fce5da6c6422e9590da14.json | 120 +++-
 ...02a91691711a8be7fb43dc371d5a1d58aca0f.json | 120 +++-
 ...c5e083fd2ef98a00b97f5f8c13e384fc353a4.json | 120 +++-
 ...3ca4ef08b3ff39c1e2f4ce34a55ab243cf31b.json | 120 +++-
 ...7079bf737ea492a8a3f162500426b806c287e.json | 120 +++-
 ...1f4b347bf4969490811f09fbb2fe495c09c4c.json | 120 +++-
 ...b36a47a47b238757408e90592d612aabcdd20.json | 120 +++-
 ...2a6fa10c7e7030f995f2bc077e6ccecbeee4f.json | 120 +++-
 ...46891298893ba3b4d08c901aa65d615be3ae5.json | 120 +++-
 ...24523ee7d9a3a3dc192bf6fac1a15ac3aa723.json | 120 +++-
 ...02fa9de9b4bdbb061e07c183ff5bab73d20cf.json | 120 +++-
 ...56bf278f227911d0481fabba6afebcd204e57.json | 120 +++-
 ...9e70cc5feb386582051b75d829fc2efe22b65.json | 120 +++-
 ...e459d20b27044895c2bb1250c349fa89ace1a.json | 120 +++-
 ...5bae9c1989b7521bb52f5c61f7e3bc9eef686.json | 120 +++-
 ...25623677e7858ffe3308c0fbf2e03c59fbb74.json | 120 +++-
 ...262fa84996a553a19a60a48cc74477b0c20a0.json | 120 +++-
 ...67cf9a24d6f669bc498ce002672d38048b513.json | 120 +++-
 ...d6f770f6ea35ce8531fd4587f05de7935db29.json | 120 +++-
 ...8e0680604a1abef56806cd2b3d0867a3a2e12.json | 120 +++-
 ...2f45c5b79fb2b1c3e08f663883fc020d2f8ad.json | 120 +++-
 ...4ead5e89eb1f4cc6a1e756cbb4c377fe8f573.json |  40 +-
 ...df92babb9d6b8a7837c7b11cf923d74b43e52.json | 120 +++-
 ...136155170ca1db87756f7775d75281b5647d4.json | 120 +++-
 ...855a6b7c2e0189ede9509e242a8463c29e380.json | 120 +++-
 ...c0162c36cf2a9f7b0f1f63cba50e26b7c7473.json | 120 +++-
 ...c43fb8590b30134d3051354baca39abcc4846.json | 120 +++-
 ...8acc835ba1326b9a688e85fb82d5207d02cf2.json | 120 +++-
 ...a1af780d53db9313ac161f3fc5a7335836ba7.json | 120 +++-
 ...faf881b658a19fb59cc82cbd942a12747a9dc.json | 120 +++-
 ...2e4c8f1e0fc7dffe20c92ddee7696b523ab04.json | 120 +++-
 ...6b9ba954ed24c15e13e0b191576ff48e4e578.json | 120 +++-
 ...6c4ecb3b77a633e4127b138b788d82f45cd87.json | 120 +++-
 ...9477226aef69a6b55bec714847f7758466e90.json | 120 +++-
 ...3be3f809396eeaf59bfb08c9a9f4b034b8fd7.json | 120 +++-
 ...bb115942c7257de5f24a3985fa4f2fdd49108.json | 120 +++-
 ...d2518acef2025edd52399c6bbaf8c2642eda6.json | 120 +++-
 ...71657bf844fa7533226aa6332feb267d448f7.json | 120 +++-
 cedar-integration-tests/tests/decimal/1.json  |  98 ++--
 cedar-integration-tests/tests/decimal/2.json  | 140 +++--
 .../tests/example_use_cases_doc/1a.json       | 162 +++---
 .../tests/example_use_cases_doc/2a.json       | 125 +++--
 .../tests/example_use_cases_doc/2b.json       | 125 +++--
 .../tests/example_use_cases_doc/2c.json       | 162 +++---
 .../tests/example_use_cases_doc/3a.json       | 166 +++---
 .../tests/example_use_cases_doc/3b.json       | 166 +++---
 .../tests/example_use_cases_doc/3c.json       | 129 +++--
 .../tests/example_use_cases_doc/4a.json       | 113 ++--
 .../tests/example_use_cases_doc/4c.json       | 148 +++--
 .../tests/example_use_cases_doc/4d.json       | 115 ++--
 .../tests/example_use_cases_doc/4e.json       | 150 +++--
 .../tests/example_use_cases_doc/4f.json       | 115 ++--
 .../tests/example_use_cases_doc/5b.json       | 322 +++++++----
 cedar-integration-tests/tests/ip/1.json       |  98 ++--
 cedar-integration-tests/tests/ip/2.json       | 182 +++---
 cedar-integration-tests/tests/ip/3.json       |  98 ++--
 cedar-integration-tests/tests/multi/1.json    | 164 +++---
 cedar-integration-tests/tests/multi/2.json    |  90 +--
 cedar-integration-tests/tests/multi/3.json    | 168 +++---
 cedar-integration-tests/tests/multi/4.json    | 119 ++--
 cedar-integration-tests/tests/multi/5.json    | 213 ++++---
 cedar-policy-core/src/entities.rs             | 258 +++++++--
 .../src/entities/json/entities.rs             |  16 +-
 cedar-policy-core/src/entities/json/err.rs    |   5 +-
 cedar-policy-core/src/entities/json/value.rs  | 120 +---
 cedar-policy-core/src/parser/node.rs          |   2 +-
 cedar-policy/src/frontend/is_authorized.rs    | 523 ++++++++++++------
 cedar-policy/tests/public_interface.rs        | 117 ++--
 1639 files changed, 154810 insertions(+), 39564 deletions(-)

diff --git a/cedar-integration-tests/corpus_tests/001da0d96e1d1296182b6818ba28cf8603a22ae3.json b/cedar-integration-tests/corpus_tests/001da0d96e1d1296182b6818ba28cf8603a22ae3.json
index b66582447..accd3d973 100644
--- a/cedar-integration-tests/corpus_tests/001da0d96e1d1296182b6818ba28cf8603a22ae3.json
+++ b/cedar-integration-tests/corpus_tests/001da0d96e1d1296182b6818ba28cf8603a22ae3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/005b19a44b16074bb1322d9d25512abfe121daff.json b/cedar-integration-tests/corpus_tests/005b19a44b16074bb1322d9d25512abfe121daff.json
index 1ba958071..45ed6eddb 100644
--- a/cedar-integration-tests/corpus_tests/005b19a44b16074bb1322d9d25512abfe121daff.json
+++ b/cedar-integration-tests/corpus_tests/005b19a44b16074bb1322d9d25512abfe121daff.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/00b19b8455bdc9522d984d038cc104096619802b.json b/cedar-integration-tests/corpus_tests/00b19b8455bdc9522d984d038cc104096619802b.json
index 134ac3fff..02b821f1c 100644
--- a/cedar-integration-tests/corpus_tests/00b19b8455bdc9522d984d038cc104096619802b.json
+++ b/cedar-integration-tests/corpus_tests/00b19b8455bdc9522d984d038cc104096619802b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"0\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "0"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -19,8 +28,14 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"0)\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "0)"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -29,8 +44,14 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"0)\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "0)"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -39,8 +60,14 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"0)\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "0)"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -49,8 +76,14 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"0)\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "0)"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -59,8 +92,14 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"0)\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "0)"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -69,8 +108,14 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"0)\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "0)"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -79,8 +124,14 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"0)\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "0)"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/00eb275e6ffa699466621733a7e0ff7e2d01bd19.json b/cedar-integration-tests/corpus_tests/00eb275e6ffa699466621733a7e0ff7e2d01bd19.json
index 1f6c25fdd..175b07f63 100644
--- a/cedar-integration-tests/corpus_tests/00eb275e6ffa699466621733a7e0ff7e2d01bd19.json
+++ b/cedar-integration-tests/corpus_tests/00eb275e6ffa699466621733a7e0ff7e2d01bd19.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/010687967c45f710b5f5b53ea6cfcdef2d2c48c0.json b/cedar-integration-tests/corpus_tests/010687967c45f710b5f5b53ea6cfcdef2d2c48c0.json
index d6bb0d2e4..28011dbb1 100644
--- a/cedar-integration-tests/corpus_tests/010687967c45f710b5f5b53ea6cfcdef2d2c48c0.json
+++ b/cedar-integration-tests/corpus_tests/010687967c45f710b5f5b53ea6cfcdef2d2c48c0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\"",
+      "principal": {
+        "type": "a",
+        "id": "#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\"",
+      "principal": {
+        "type": "a",
+        "id": "#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\"",
+      "principal": {
+        "type": "a",
+        "id": "#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\"",
+      "principal": {
+        "type": "a",
+        "id": "#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\"",
+      "principal": {
+        "type": "a",
+        "id": "#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\"",
+      "principal": {
+        "type": "a",
+        "id": "#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/01550e32edc1062fcc9522332e894cdad594b139.json b/cedar-integration-tests/corpus_tests/01550e32edc1062fcc9522332e894cdad594b139.json
index 5e70d0a46..68c327a37 100644
--- a/cedar-integration-tests/corpus_tests/01550e32edc1062fcc9522332e894cdad594b139.json
+++ b/cedar-integration-tests/corpus_tests/01550e32edc1062fcc9522332e894cdad594b139.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/016bc58b487d6a1ae58c2472ef0c51b282c17e65.json b/cedar-integration-tests/corpus_tests/016bc58b487d6a1ae58c2472ef0c51b282c17e65.json
index 441255cd5..e4a83b00a 100644
--- a/cedar-integration-tests/corpus_tests/016bc58b487d6a1ae58c2472ef0c51b282c17e65.json
+++ b/cedar-integration-tests/corpus_tests/016bc58b487d6a1ae58c2472ef0c51b282c17e65.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "_m0000w3qwwwwwg::Du2xxu::a::\"\"",
-      "action": "_m0000w3qwwwwwg::Du2xxu::Action::\"action\"",
-      "resource": "_m0000w3qwwwwwg::Du2xxu::a::\"\"",
+      "principal": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::a",
+        "id": ""
+      },
+      "action": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "_m0000w3qwwwwwg::Du2xxu::a::\"\"",
-      "action": "_m0000w3qwwwwwg::Du2xxu::Action::\"action\"",
-      "resource": "_m0000w3qwwwwwg::Du2xxu::a::\"\"",
+      "principal": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::a",
+        "id": ""
+      },
+      "action": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "_m0000w3qwwwwwg::Du2xxu::a::\"\"",
-      "action": "_m0000w3qwwwwwg::Du2xxu::Action::\"action\"",
-      "resource": "_m0000w3qwwwwwg::Du2xxu::a::\"\"",
+      "principal": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::a",
+        "id": ""
+      },
+      "action": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "_m0000w3qwwwwwg::Du2xxu::a::\"\"",
-      "action": "_m0000w3qwwwwwg::Du2xxu::Action::\"action\"",
-      "resource": "_m0000w3qwwwwwg::Du2xxu::a::\"\"",
+      "principal": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::a",
+        "id": ""
+      },
+      "action": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "_m0000w3qwwwwwg::Du2xxu::a::\"\"",
-      "action": "_m0000w3qwwwwwg::Du2xxu::Action::\"action\"",
-      "resource": "_m0000w3qwwwwwg::Du2xxu::a::\"\"",
+      "principal": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::a",
+        "id": ""
+      },
+      "action": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "_m0000w3qwwwwwg::Du2xxu::a::\"\"",
-      "action": "_m0000w3qwwwwwg::Du2xxu::Action::\"action\"",
-      "resource": "_m0000w3qwwwwwg::Du2xxu::a::\"\"",
+      "principal": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::a",
+        "id": ""
+      },
+      "action": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "_m0000w3qwwwwwg::Du2xxu::a::\"\"",
-      "action": "_m0000w3qwwwwwg::Du2xxu::Action::\"action\"",
-      "resource": "_m0000w3qwwwwwg::Du2xxu::a::\"\"",
+      "principal": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::a",
+        "id": ""
+      },
+      "action": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "_m0000w3qwwwwwg::Du2xxu::a::\"\"",
-      "action": "_m0000w3qwwwwwg::Du2xxu::Action::\"action\"",
-      "resource": "_m0000w3qwwwwwg::Du2xxu::a::\"\"",
+      "principal": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::a",
+        "id": ""
+      },
+      "action": {
+        "type": "_m0000w3qwwwwwg::Du2xxu::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/0183d83d9b74ad8b57acbfd9771edf5e55421ec8.json b/cedar-integration-tests/corpus_tests/0183d83d9b74ad8b57acbfd9771edf5e55421ec8.json
index 9d2cb776a..2de12999b 100644
--- a/cedar-integration-tests/corpus_tests/0183d83d9b74ad8b57acbfd9771edf5e55421ec8.json
+++ b/cedar-integration-tests/corpus_tests/0183d83d9b74ad8b57acbfd9771edf5e55421ec8.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +51,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"zzzz\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "zzzz"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +72,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"zzzz\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "zzzz"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +93,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"zzzz\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "zzzz"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +114,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"zzzz\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "zzzz"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +135,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"zzzz\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "zzzz"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/0192e411e8989f19f3282f9c840c90a53b6d43b0.json b/cedar-integration-tests/corpus_tests/0192e411e8989f19f3282f9c840c90a53b6d43b0.json
index 160e26457..bd1712b34 100644
--- a/cedar-integration-tests/corpus_tests/0192e411e8989f19f3282f9c840c90a53b6d43b0.json
+++ b/cedar-integration-tests/corpus_tests/0192e411e8989f19f3282f9c840c90a53b6d43b0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/0197f1506d505e1f9364e4379bbeeb8d8b38d482.json b/cedar-integration-tests/corpus_tests/0197f1506d505e1f9364e4379bbeeb8d8b38d482.json
index d614a2218..1683fc68d 100644
--- a/cedar-integration-tests/corpus_tests/0197f1506d505e1f9364e4379bbeeb8d8b38d482.json
+++ b/cedar-integration-tests/corpus_tests/0197f1506d505e1f9364e4379bbeeb8d8b38d482.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/0199370f4834c9c70ceb5837b847673e05b4d111.json b/cedar-integration-tests/corpus_tests/0199370f4834c9c70ceb5837b847673e05b4d111.json
index ffc843216..5fe74dadc 100644
--- a/cedar-integration-tests/corpus_tests/0199370f4834c9c70ceb5837b847673e05b4d111.json
+++ b/cedar-integration-tests/corpus_tests/0199370f4834c9c70ceb5837b847673e05b4d111.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Vhhhhhhkkkkkkkkki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkkkkkkki::\"\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Vhhhhhhkkkkkkkkki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkkkkkkki::\"\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Vhhhhhhkkkkkkkkki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkkkkkkki::\"\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Vhhhhhhkkkkkkkkki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkkkkkkki::\"\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Vhhhhhhkkkkkkkkki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkkkkkkki::\"\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Vhhhhhhkkkkkkkkki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkkkkkkki::\"\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Vhhhhhhkkkkkkkkki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkkkkkkki::\"\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Vhhhhhhkkkkkkkkki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkkkkkkki::\"\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/01a2a267879d14f88be8deb00f1ad2c8bc504daf.json b/cedar-integration-tests/corpus_tests/01a2a267879d14f88be8deb00f1ad2c8bc504daf.json
index 72f29aabc..fb2465e6f 100644
--- a/cedar-integration-tests/corpus_tests/01a2a267879d14f88be8deb00f1ad2c8bc504daf.json
+++ b/cedar-integration-tests/corpus_tests/01a2a267879d14f88be8deb00f1ad2c8bc504daf.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/01eb2efb0a033854325d8cb0380655592b5ee0e1.json b/cedar-integration-tests/corpus_tests/01eb2efb0a033854325d8cb0380655592b5ee0e1.json
index fc336664f..bbd5781dd 100644
--- a/cedar-integration-tests/corpus_tests/01eb2efb0a033854325d8cb0380655592b5ee0e1.json
+++ b/cedar-integration-tests/corpus_tests/01eb2efb0a033854325d8cb0380655592b5ee0e1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/021d24aa9ce1072ccc65dddfcd8b1a7e375787a6.json b/cedar-integration-tests/corpus_tests/021d24aa9ce1072ccc65dddfcd8b1a7e375787a6.json
index 89d186c71..4fefc39a4 100644
--- a/cedar-integration-tests/corpus_tests/021d24aa9ce1072ccc65dddfcd8b1a7e375787a6.json
+++ b/cedar-integration-tests/corpus_tests/021d24aa9ce1072ccc65dddfcd8b1a7e375787a6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/022a72e766e49cbee2a3142b67d97e199dcec2ce.json b/cedar-integration-tests/corpus_tests/022a72e766e49cbee2a3142b67d97e199dcec2ce.json
index 0da7d019c..36a548bbe 100644
--- a/cedar-integration-tests/corpus_tests/022a72e766e49cbee2a3142b67d97e199dcec2ce.json
+++ b/cedar-integration-tests/corpus_tests/022a72e766e49cbee2a3142b67d97e199dcec2ce.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/0241a89fbf150dd7b0577a17c0e4ab3d89e59b34.json b/cedar-integration-tests/corpus_tests/0241a89fbf150dd7b0577a17c0e4ab3d89e59b34.json
index 30e4cc346..6ca7bb7f4 100644
--- a/cedar-integration-tests/corpus_tests/0241a89fbf150dd7b0577a17c0e4ab3d89e59b34.json
+++ b/cedar-integration-tests/corpus_tests/0241a89fbf150dd7b0577a17c0e4ab3d89e59b34.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/027083f3b76fbddceb11ebd87326cc2d9bc5a6aa.json b/cedar-integration-tests/corpus_tests/027083f3b76fbddceb11ebd87326cc2d9bc5a6aa.json
index 907d65626..62d28c469 100644
--- a/cedar-integration-tests/corpus_tests/027083f3b76fbddceb11ebd87326cc2d9bc5a6aa.json
+++ b/cedar-integration-tests/corpus_tests/027083f3b76fbddceb11ebd87326cc2d9bc5a6aa.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/02a16a6d495ee188df2575a8539c351fe235ad58.json b/cedar-integration-tests/corpus_tests/02a16a6d495ee188df2575a8539c351fe235ad58.json
index f5d8f02cf..f7c8708d6 100644
--- a/cedar-integration-tests/corpus_tests/02a16a6d495ee188df2575a8539c351fe235ad58.json
+++ b/cedar-integration-tests/corpus_tests/02a16a6d495ee188df2575a8539c351fe235ad58.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qm7uuupu": "",
         "A0": "",
@@ -24,9 +33,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qm7uuupu": "",
         "A0": "",
@@ -42,9 +60,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qm7uuupu": "",
         "A0": "",
@@ -60,9 +87,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qm7uuupu": "",
         "A0": "",
@@ -78,9 +114,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qm7uuupu": "",
         "A0": "",
@@ -96,9 +141,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qm7uuupu": "",
         "A0": "",
@@ -114,9 +168,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qm7uuupu": "",
         "A0": "",
@@ -132,9 +195,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qm7uuupu": "",
         "A0": "",
diff --git a/cedar-integration-tests/corpus_tests/02a49223197987f55c4eb3a434db07b1d23a377a.json b/cedar-integration-tests/corpus_tests/02a49223197987f55c4eb3a434db07b1d23a377a.json
index a68185dc4..9c224b36b 100644
--- a/cedar-integration-tests/corpus_tests/02a49223197987f55c4eb3a434db07b1d23a377a.json
+++ b/cedar-integration-tests/corpus_tests/02a49223197987f55c4eb3a434db07b1d23a377a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"j\\07\\u{1}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\07\\u{1}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"j\\07\\u{1}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\07\\u{1}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"j\\07\\u{1}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\07\\u{1}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"j\\07\\u{1}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\07\\u{1}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"j\\07\\u{1}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\07\\u{1}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"j\\07\\u{1}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\07\\u{1}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"j\\07\\u{1}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\07\\u{1}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"j\\07\\u{1}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\07\\u{1}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/02ffc16957f384b0168838937ca001e56f6b2eb6.json b/cedar-integration-tests/corpus_tests/02ffc16957f384b0168838937ca001e56f6b2eb6.json
index a9f2b2d18..1ae585279 100644
--- a/cedar-integration-tests/corpus_tests/02ffc16957f384b0168838937ca001e56f6b2eb6.json
+++ b/cedar-integration-tests/corpus_tests/02ffc16957f384b0168838937ca001e56f6b2eb6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/0302fe2400dc489f2e65e374b47c55ca6bce99b7.json b/cedar-integration-tests/corpus_tests/0302fe2400dc489f2e65e374b47c55ca6bce99b7.json
index 98ceff0ef..aaedf48d0 100644
--- a/cedar-integration-tests/corpus_tests/0302fe2400dc489f2e65e374b47c55ca6bce99b7.json
+++ b/cedar-integration-tests/corpus_tests/0302fe2400dc489f2e65e374b47c55ca6bce99b7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Gxtxxxxxj::a::\"\"",
-      "action": "Gxtxxxxxj::Action::\"action\"",
-      "resource": "Gxtxxxxxj::a::\"\"",
+      "principal": {
+        "type": "Gxtxxxxxj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxtxxxxxj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxtxxxxxj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Gxtxxxxxj::a::\"\"",
-      "action": "Gxtxxxxxj::Action::\"action\"",
-      "resource": "Gxtxxxxxj::a::\"\"",
+      "principal": {
+        "type": "Gxtxxxxxj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxtxxxxxj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxtxxxxxj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Gxtxxxxxj::a::\"\"",
-      "action": "Gxtxxxxxj::Action::\"action\"",
-      "resource": "Gxtxxxxxj::a::\"\"",
+      "principal": {
+        "type": "Gxtxxxxxj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxtxxxxxj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxtxxxxxj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Gxtxxxxxj::a::\"\"",
-      "action": "Gxtxxxxxj::Action::\"action\"",
-      "resource": "Gxtxxxxxj::a::\"\"",
+      "principal": {
+        "type": "Gxtxxxxxj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxtxxxxxj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxtxxxxxj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Gxtxxxxxj::a::\"\"",
-      "action": "Gxtxxxxxj::Action::\"action\"",
-      "resource": "Gxtxxxxxj::a::\"\"",
+      "principal": {
+        "type": "Gxtxxxxxj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxtxxxxxj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxtxxxxxj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Gxtxxxxxj::a::\"\"",
-      "action": "Gxtxxxxxj::Action::\"action\"",
-      "resource": "Gxtxxxxxj::a::\"\"",
+      "principal": {
+        "type": "Gxtxxxxxj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxtxxxxxj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxtxxxxxj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Gxtxxxxxj::a::\"\"",
-      "action": "Gxtxxxxxj::Action::\"action\"",
-      "resource": "Gxtxxxxxj::a::\"\"",
+      "principal": {
+        "type": "Gxtxxxxxj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxtxxxxxj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxtxxxxxj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Gxtxxxxxj::a::\"\"",
-      "action": "Gxtxxxxxj::Action::\"action\"",
-      "resource": "Gxtxxxxxj::a::\"\"",
+      "principal": {
+        "type": "Gxtxxxxxj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxtxxxxxj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxtxxxxxj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/030831a33c04c85f8cf1efe16875826a19fc5cc5.json b/cedar-integration-tests/corpus_tests/030831a33c04c85f8cf1efe16875826a19fc5cc5.json
index 1a7ce8add..0848a55c9 100644
--- a/cedar-integration-tests/corpus_tests/030831a33c04c85f8cf1efe16875826a19fc5cc5.json
+++ b/cedar-integration-tests/corpus_tests/030831a33c04c85f8cf1efe16875826a19fc5cc5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/0313a890a7c564ed07a4df40f8d745880de33071.json b/cedar-integration-tests/corpus_tests/0313a890a7c564ed07a4df40f8d745880de33071.json
index 9af17880e..7d7def2e9 100644
--- a/cedar-integration-tests/corpus_tests/0313a890a7c564ed07a4df40f8d745880de33071.json
+++ b/cedar-integration-tests/corpus_tests/0313a890a7c564ed07a4df40f8d745880de33071.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\"",
+      "principal": {
+        "type": "a",
+        "id": "F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\"",
+      "principal": {
+        "type": "a",
+        "id": "F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\"",
+      "principal": {
+        "type": "a",
+        "id": "F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\"",
+      "principal": {
+        "type": "a",
+        "id": "F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -82,9 +145,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\"",
+      "principal": {
+        "type": "a",
+        "id": "F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/031b9ef9898f3e8cc9ea967e5a05677582eca81e.json b/cedar-integration-tests/corpus_tests/031b9ef9898f3e8cc9ea967e5a05677582eca81e.json
index 7b11803bd..490775447 100644
--- a/cedar-integration-tests/corpus_tests/031b9ef9898f3e8cc9ea967e5a05677582eca81e.json
+++ b/cedar-integration-tests/corpus_tests/031b9ef9898f3e8cc9ea967e5a05677582eca81e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "K776": "",
         "A": "",
@@ -23,9 +32,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "K776": "",
         "A": "",
@@ -40,9 +58,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "K776": "",
         "A": "",
@@ -57,9 +84,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "K776": "",
         "A": "",
@@ -74,9 +110,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "K776": "",
         "A": "",
@@ -91,9 +136,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "K776": "",
         "A": "",
@@ -108,9 +162,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "K776": "",
         "A": "",
@@ -125,9 +188,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "K776": "",
         "A": "",
diff --git a/cedar-integration-tests/corpus_tests/03349e575600a4072cf52de8a144d1c88ec8ad91.json b/cedar-integration-tests/corpus_tests/03349e575600a4072cf52de8a144d1c88ec8ad91.json
index dabf2bd18..6e6774b65 100644
--- a/cedar-integration-tests/corpus_tests/03349e575600a4072cf52de8a144d1c88ec8ad91.json
+++ b/cedar-integration-tests/corpus_tests/03349e575600a4072cf52de8a144d1c88ec8ad91.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/03628ca780763f86b2c24cfdbd7a98bc0df23e2d.json b/cedar-integration-tests/corpus_tests/03628ca780763f86b2c24cfdbd7a98bc0df23e2d.json
index deefe3db7..52ba974d5 100644
--- a/cedar-integration-tests/corpus_tests/03628ca780763f86b2c24cfdbd7a98bc0df23e2d.json
+++ b/cedar-integration-tests/corpus_tests/03628ca780763f86b2c24cfdbd7a98bc0df23e2d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"..\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ".."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/0366cff06b0efb65d458965ce9095ec86f759608.json b/cedar-integration-tests/corpus_tests/0366cff06b0efb65d458965ce9095ec86f759608.json
index 966b1cf79..f8dac32b2 100644
--- a/cedar-integration-tests/corpus_tests/0366cff06b0efb65d458965ce9095ec86f759608.json
+++ b/cedar-integration-tests/corpus_tests/0366cff06b0efb65d458965ce9095ec86f759608.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/0370b20e062093c32358fa6b1e78f8221aaedb96.json b/cedar-integration-tests/corpus_tests/0370b20e062093c32358fa6b1e78f8221aaedb96.json
index 255d59233..e8630a8d6 100644
--- a/cedar-integration-tests/corpus_tests/0370b20e062093c32358fa6b1e78f8221aaedb96.json
+++ b/cedar-integration-tests/corpus_tests/0370b20e062093c32358fa6b1e78f8221aaedb96.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "KYdRh000akkCkkkk::A::\"\"",
-      "action": "KYdRh000akkCkkkk::Action::\".\"",
-      "resource": "KYdRh000akkCkkkk::A::\"\"",
+      "principal": {
+        "type": "KYdRh000akkCkkkk::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "KYdRh000akkCkkkk::A",
+        "id": ""
+      },
+      "action": {
+        "type": "KYdRh000akkCkkkk::Action",
+        "id": "."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "KYdRh000akkCkkkk::A::\"\"",
-      "action": "KYdRh000akkCkkkk::Action::\".\"",
-      "resource": "KYdRh000akkCkkkk::A::\"\"",
+      "principal": {
+        "type": "KYdRh000akkCkkkk::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "KYdRh000akkCkkkk::A",
+        "id": ""
+      },
+      "action": {
+        "type": "KYdRh000akkCkkkk::Action",
+        "id": "."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "KYdRh000akkCkkkk::A::\"\"",
-      "action": "KYdRh000akkCkkkk::Action::\".\"",
-      "resource": "KYdRh000akkCkkkk::A::\"\"",
+      "principal": {
+        "type": "KYdRh000akkCkkkk::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "KYdRh000akkCkkkk::A",
+        "id": ""
+      },
+      "action": {
+        "type": "KYdRh000akkCkkkk::Action",
+        "id": "."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "KYdRh000akkCkkkk::A::\"\"",
-      "action": "KYdRh000akkCkkkk::Action::\".\"",
-      "resource": "KYdRh000akkCkkkk::A::\"\"",
+      "principal": {
+        "type": "KYdRh000akkCkkkk::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "KYdRh000akkCkkkk::A",
+        "id": ""
+      },
+      "action": {
+        "type": "KYdRh000akkCkkkk::Action",
+        "id": "."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "KYdRh000akkCkkkk::A::\"\"",
-      "action": "KYdRh000akkCkkkk::Action::\".\"",
-      "resource": "KYdRh000akkCkkkk::A::\"\"",
+      "principal": {
+        "type": "KYdRh000akkCkkkk::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "KYdRh000akkCkkkk::A",
+        "id": ""
+      },
+      "action": {
+        "type": "KYdRh000akkCkkkk::Action",
+        "id": "."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "KYdRh000akkCkkkk::A::\"\"",
-      "action": "KYdRh000akkCkkkk::Action::\".\"",
-      "resource": "KYdRh000akkCkkkk::A::\"\"",
+      "principal": {
+        "type": "KYdRh000akkCkkkk::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "KYdRh000akkCkkkk::A",
+        "id": ""
+      },
+      "action": {
+        "type": "KYdRh000akkCkkkk::Action",
+        "id": "."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "KYdRh000akkCkkkk::A::\"\"",
-      "action": "KYdRh000akkCkkkk::Action::\".\"",
-      "resource": "KYdRh000akkCkkkk::A::\"\"",
+      "principal": {
+        "type": "KYdRh000akkCkkkk::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "KYdRh000akkCkkkk::A",
+        "id": ""
+      },
+      "action": {
+        "type": "KYdRh000akkCkkkk::Action",
+        "id": "."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "KYdRh000akkCkkkk::A::\"\"",
-      "action": "KYdRh000akkCkkkk::Action::\".\"",
-      "resource": "KYdRh000akkCkkkk::A::\"\"",
+      "principal": {
+        "type": "KYdRh000akkCkkkk::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "KYdRh000akkCkkkk::A",
+        "id": ""
+      },
+      "action": {
+        "type": "KYdRh000akkCkkkk::Action",
+        "id": "."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/037991841bc058457fde347ac473efe52a2b0999.json b/cedar-integration-tests/corpus_tests/037991841bc058457fde347ac473efe52a2b0999.json
index 89ace73c3..5b03e46e8 100644
--- a/cedar-integration-tests/corpus_tests/037991841bc058457fde347ac473efe52a2b0999.json
+++ b/cedar-integration-tests/corpus_tests/037991841bc058457fde347ac473efe52a2b0999.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "R::Wj::R::a::\"\"",
-      "action": "R::Wj::R::Action::\"action\"",
-      "resource": "R::Wj::R::a::\"\"",
+      "principal": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::R::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "R::Wj::R::a::\"\"",
-      "action": "R::Wj::R::Action::\"action\"",
-      "resource": "R::Wj::R::a::\"\"",
+      "principal": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::R::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "R::Wj::R::a::\"\"",
-      "action": "R::Wj::R::Action::\"action\"",
-      "resource": "R::Wj::R::a::\"\"",
+      "principal": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::R::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "R::Wj::R::a::\"\"",
-      "action": "R::Wj::R::Action::\"action\"",
-      "resource": "R::Wj::R::a::\"\"",
+      "principal": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::R::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "R::Wj::R::a::\"\"",
-      "action": "R::Wj::R::Action::\"action\"",
-      "resource": "R::Wj::R::a::\"\"",
+      "principal": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::R::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "R::Wj::R::a::\"\"",
-      "action": "R::Wj::R::Action::\"action\"",
-      "resource": "R::Wj::R::a::\"\"",
+      "principal": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::R::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "R::Wj::R::a::\"\"",
-      "action": "R::Wj::R::Action::\"action\"",
-      "resource": "R::Wj::R::a::\"\"",
+      "principal": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::R::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "R::Wj::R::a::\"\"",
-      "action": "R::Wj::R::Action::\"action\"",
-      "resource": "R::Wj::R::a::\"\"",
+      "principal": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::R::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/03bd38f3357bc4079ecf1dc9fff65f6c695727fd.json b/cedar-integration-tests/corpus_tests/03bd38f3357bc4079ecf1dc9fff65f6c695727fd.json
index f3d2765c7..254a8f901 100644
--- a/cedar-integration-tests/corpus_tests/03bd38f3357bc4079ecf1dc9fff65f6c695727fd.json
+++ b/cedar-integration-tests/corpus_tests/03bd38f3357bc4079ecf1dc9fff65f6c695727fd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/03e7827b0c8f44d3f517ac0c52409b0a80996b39.json b/cedar-integration-tests/corpus_tests/03e7827b0c8f44d3f517ac0c52409b0a80996b39.json
index 136635872..fe689ea35 100644
--- a/cedar-integration-tests/corpus_tests/03e7827b0c8f44d3f517ac0c52409b0a80996b39.json
+++ b/cedar-integration-tests/corpus_tests/03e7827b0c8f44d3f517ac0c52409b0a80996b39.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::G::r::r::\"\"",
-      "action": "r::G::r::Action::\"action\"",
-      "resource": "r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::G::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::G::r::r::\"\"",
-      "action": "r::G::r::Action::\"action\"",
-      "resource": "r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::G::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::G::r::r::\"\"",
-      "action": "r::G::r::Action::\"action\"",
-      "resource": "r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::G::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::G::r::r::\"\"",
-      "action": "r::G::r::Action::\"action\"",
-      "resource": "r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::G::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::G::r::r::\"\"",
-      "action": "r::G::r::Action::\"action\"",
-      "resource": "r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::G::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::G::r::r::\"\"",
-      "action": "r::G::r::Action::\"action\"",
-      "resource": "r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::G::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::G::r::r::\"\"",
-      "action": "r::G::r::Action::\"action\"",
-      "resource": "r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::G::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::G::r::r::\"\"",
-      "action": "r::G::r::Action::\"action\"",
-      "resource": "r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::G::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/046c5a37b575d3dbabeaae9997b2f94c42061491.json b/cedar-integration-tests/corpus_tests/046c5a37b575d3dbabeaae9997b2f94c42061491.json
index 10d599eb2..514489b34 100644
--- a/cedar-integration-tests/corpus_tests/046c5a37b575d3dbabeaae9997b2f94c42061491.json
+++ b/cedar-integration-tests/corpus_tests/046c5a37b575d3dbabeaae9997b2f94c42061491.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::D::a::\"\"",
-      "action": "A::D::Action::\"action\"",
-      "resource": "A::D::a::\"\"",
+      "principal": {
+        "type": "A::D::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::D::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::D::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::D::a::\"\"",
-      "action": "A::D::Action::\"action\"",
-      "resource": "A::D::a::\"\"",
+      "principal": {
+        "type": "A::D::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::D::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::D::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::D::a::\"\"",
-      "action": "A::D::Action::\"action\"",
-      "resource": "A::D::a::\"\"",
+      "principal": {
+        "type": "A::D::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::D::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::D::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::D::a::\"\"",
-      "action": "A::D::Action::\"action\"",
-      "resource": "A::D::a::\"\"",
+      "principal": {
+        "type": "A::D::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::D::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::D::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::D::a::\"\"",
-      "action": "A::D::Action::\"action\"",
-      "resource": "A::D::a::\"\"",
+      "principal": {
+        "type": "A::D::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::D::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::D::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::D::a::\"\"",
-      "action": "A::D::Action::\"action\"",
-      "resource": "A::D::a::\"\"",
+      "principal": {
+        "type": "A::D::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::D::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::D::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::D::a::\"\"",
-      "action": "A::D::Action::\"action\"",
-      "resource": "A::D::a::\"\"",
+      "principal": {
+        "type": "A::D::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::D::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::D::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::D::a::\"\"",
-      "action": "A::D::Action::\"action\"",
-      "resource": "A::D::a::\"\"",
+      "principal": {
+        "type": "A::D::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::D::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::D::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/047a21c759ff09b3dae102ad967195f336889551.json b/cedar-integration-tests/corpus_tests/047a21c759ff09b3dae102ad967195f336889551.json
index 2a9ea7270..ca82e434b 100644
--- a/cedar-integration-tests/corpus_tests/047a21c759ff09b3dae102ad967195f336889551.json
+++ b/cedar-integration-tests/corpus_tests/047a21c759ff09b3dae102ad967195f336889551.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sJRd3": "",
         "E": "",
@@ -24,9 +33,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sJRd3": "",
         "E": "",
@@ -42,9 +60,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sJRd3": "",
         "E": "",
@@ -60,9 +87,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sJRd3": "",
         "E": "",
@@ -78,9 +114,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sJRd3": "",
         "E": "",
@@ -96,9 +141,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sJRd3": "",
         "E": "",
@@ -114,9 +168,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sJRd3": "",
         "E": "",
@@ -132,9 +195,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sJRd3": "",
         "E": "",
diff --git a/cedar-integration-tests/corpus_tests/04ab8774dce503da2421cd6d038f69c5601734bc.json b/cedar-integration-tests/corpus_tests/04ab8774dce503da2421cd6d038f69c5601734bc.json
index a016b4274..851ad0313 100644
--- a/cedar-integration-tests/corpus_tests/04ab8774dce503da2421cd6d038f69c5601734bc.json
+++ b/cedar-integration-tests/corpus_tests/04ab8774dce503da2421cd6d038f69c5601734bc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/0504bae36ea3c93f493e67cc4c72c44f50889906.json b/cedar-integration-tests/corpus_tests/0504bae36ea3c93f493e67cc4c72c44f50889906.json
index b6ee0c8ca..18729d8d3 100644
--- a/cedar-integration-tests/corpus_tests/0504bae36ea3c93f493e67cc4c72c44f50889906.json
+++ b/cedar-integration-tests/corpus_tests/0504bae36ea3c93f493e67cc4c72c44f50889906.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/051a1bcd7902c19b6eeb3d710d3dcc6d68618ce8.json b/cedar-integration-tests/corpus_tests/051a1bcd7902c19b6eeb3d710d3dcc6d68618ce8.json
index 130f2aa32..b5d14362a 100644
--- a/cedar-integration-tests/corpus_tests/051a1bcd7902c19b6eeb3d710d3dcc6d68618ce8.json
+++ b/cedar-integration-tests/corpus_tests/051a1bcd7902c19b6eeb3d710d3dcc6d68618ce8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/053ed1c2d50c473008af7815d07cc9326fe67aa0.json b/cedar-integration-tests/corpus_tests/053ed1c2d50c473008af7815d07cc9326fe67aa0.json
index 24d4ac790..3025a3131 100644
--- a/cedar-integration-tests/corpus_tests/053ed1c2d50c473008af7815d07cc9326fe67aa0.json
+++ b/cedar-integration-tests/corpus_tests/053ed1c2d50c473008af7815d07cc9326fe67aa0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "sWqslWkgqaWMlqYdc::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqslWkgqaWMlqYdc::\"\"",
+      "principal": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "sWqslWkgqaWMlqYdc::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqslWkgqaWMlqYdc::\"\"",
+      "principal": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "sWqslWkgqaWMlqYdc::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqslWkgqaWMlqYdc::\"\"",
+      "principal": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "sWqslWkgqaWMlqYdc::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqslWkgqaWMlqYdc::\"\"",
+      "principal": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "sWqslWkgqaWMlqYdc::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqslWkgqaWMlqYdc::\"\"",
+      "principal": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "sWqslWkgqaWMlqYdc::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqslWkgqaWMlqYdc::\"\"",
+      "principal": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "sWqslWkgqaWMlqYdc::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqslWkgqaWMlqYdc::\"\"",
+      "principal": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "sWqslWkgqaWMlqYdc::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqslWkgqaWMlqYdc::\"\"",
+      "principal": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/054ed0f7d7a47846d5c8d26f0a33e25d33c14b64.json b/cedar-integration-tests/corpus_tests/054ed0f7d7a47846d5c8d26f0a33e25d33c14b64.json
index 24cfaa591..fd0a8bbb4 100644
--- a/cedar-integration-tests/corpus_tests/054ed0f7d7a47846d5c8d26f0a33e25d33c14b64.json
+++ b/cedar-integration-tests/corpus_tests/054ed0f7d7a47846d5c8d26f0a33e25d33c14b64.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/05626f78ef331236ebc0b35ddddd77765e90c719.json b/cedar-integration-tests/corpus_tests/05626f78ef331236ebc0b35ddddd77765e90c719.json
index 432d40d51..0f25c2797 100644
--- a/cedar-integration-tests/corpus_tests/05626f78ef331236ebc0b35ddddd77765e90c719.json
+++ b/cedar-integration-tests/corpus_tests/05626f78ef331236ebc0b35ddddd77765e90c719.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\":q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":q\"",
+      "principal": {
+        "type": "a",
+        "id": ":q"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":q\"",
+      "principal": {
+        "type": "a",
+        "id": ":q"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\":q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":q\"",
+      "principal": {
+        "type": "a",
+        "id": ":q"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\":q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":q\"",
+      "principal": {
+        "type": "a",
+        "id": ":q"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\":q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":q\"",
+      "principal": {
+        "type": "a",
+        "id": ":q"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\":q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":q\"",
+      "principal": {
+        "type": "a",
+        "id": ":q"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\":q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":q\"",
+      "principal": {
+        "type": "a",
+        "id": ":q"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\":q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":q\"",
+      "principal": {
+        "type": "a",
+        "id": ":q"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/05ced0c2a3b26e996cd9857050b5cb568f3c55a4.json b/cedar-integration-tests/corpus_tests/05ced0c2a3b26e996cd9857050b5cb568f3c55a4.json
index 21500baee..8269489d9 100644
--- a/cedar-integration-tests/corpus_tests/05ced0c2a3b26e996cd9857050b5cb568f3c55a4.json
+++ b/cedar-integration-tests/corpus_tests/05ced0c2a3b26e996cd9857050b5cb568f3c55a4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/05d5cc85e0bfd0be2cb5ee9732223370e8137faa.json b/cedar-integration-tests/corpus_tests/05d5cc85e0bfd0be2cb5ee9732223370e8137faa.json
index 4b21ac5e9..248c0f268 100644
--- a/cedar-integration-tests/corpus_tests/05d5cc85e0bfd0be2cb5ee9732223370e8137faa.json
+++ b/cedar-integration-tests/corpus_tests/05d5cc85e0bfd0be2cb5ee9732223370e8137faa.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": [
           false,
@@ -37,9 +55,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": [
           false,
@@ -59,9 +86,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
@@ -73,9 +109,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
@@ -87,9 +132,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
@@ -101,9 +155,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
@@ -115,9 +178,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
diff --git a/cedar-integration-tests/corpus_tests/05deb561e42a4b8f2775ceae9a4732013813160b.json b/cedar-integration-tests/corpus_tests/05deb561e42a4b8f2775ceae9a4732013813160b.json
index 1ec4d1248..de680dd2f 100644
--- a/cedar-integration-tests/corpus_tests/05deb561e42a4b8f2775ceae9a4732013813160b.json
+++ b/cedar-integration-tests/corpus_tests/05deb561e42a4b8f2775ceae9a4732013813160b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "sWqslWkgqaWMlqYdc::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqslWkgqaWMlqYdc::\"\"",
+      "principal": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "sWqslWkgqaWMlqYdc::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqslWkgqaWMlqYdc::\"\"",
+      "principal": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "sWqslWkgqaWMlqYdc::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqslWkgqaWMlqYdc::\"\"",
+      "principal": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "sWqslWkgqaWMlqYdc::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqslWkgqaWMlqYdc::\"\"",
+      "principal": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "sWqslWkgqaWMlqYdc::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqslWkgqaWMlqYdc::\"\"",
+      "principal": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "sWqslWkgqaWMlqYdc::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqslWkgqaWMlqYdc::\"\"",
+      "principal": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "sWqslWkgqaWMlqYdc::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqslWkgqaWMlqYdc::\"\"",
+      "principal": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "sWqslWkgqaWMlqYdc::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqslWkgqaWMlqYdc::\"\"",
+      "principal": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqslWkgqaWMlqYdc",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/05debaed8129359774e0f4012e4064f8afa592cd.json b/cedar-integration-tests/corpus_tests/05debaed8129359774e0f4012e4064f8afa592cd.json
index 878e18ebf..43b2cd4a8 100644
--- a/cedar-integration-tests/corpus_tests/05debaed8129359774e0f4012e4064f8afa592cd.json
+++ b/cedar-integration-tests/corpus_tests/05debaed8129359774e0f4012e4064f8afa592cd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/05e9688d1657ab7c11fe5e9cab8cd3bdeabf40a7.json b/cedar-integration-tests/corpus_tests/05e9688d1657ab7c11fe5e9cab8cd3bdeabf40a7.json
index d2eb01ea9..de2663d5d 100644
--- a/cedar-integration-tests/corpus_tests/05e9688d1657ab7c11fe5e9cab8cd3bdeabf40a7.json
+++ b/cedar-integration-tests/corpus_tests/05e9688d1657ab7c11fe5e9cab8cd3bdeabf40a7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Vhhhh8hhkkkkkkkkk::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhh8hhkkkkkkkkk::\".\"",
+      "principal": {
+        "type": "Vhhhh8hhkkkkkkkkk",
+        "id": "."
+      },
+      "resource": {
+        "type": "Vhhhh8hhkkkkkkkkk",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Vhhhh8hhkkkkkkkkk::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhh8hhkkkkkkkkk::\".\"",
+      "principal": {
+        "type": "Vhhhh8hhkkkkkkkkk",
+        "id": "."
+      },
+      "resource": {
+        "type": "Vhhhh8hhkkkkkkkkk",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Vhhhh8hhkkkkkkkkk::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhh8hhkkkkkkkkk::\".\"",
+      "principal": {
+        "type": "Vhhhh8hhkkkkkkkkk",
+        "id": "."
+      },
+      "resource": {
+        "type": "Vhhhh8hhkkkkkkkkk",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Vhhhh8hhkkkkkkkkk::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhh8hhkkkkkkkkk::\".\"",
+      "principal": {
+        "type": "Vhhhh8hhkkkkkkkkk",
+        "id": "."
+      },
+      "resource": {
+        "type": "Vhhhh8hhkkkkkkkkk",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Vhhhh8hhkkkkkkkkk::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhh8hhkkkkkkkkk::\".\"",
+      "principal": {
+        "type": "Vhhhh8hhkkkkkkkkk",
+        "id": "."
+      },
+      "resource": {
+        "type": "Vhhhh8hhkkkkkkkkk",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Vhhhh8hhkkkkkkkkk::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhh8hhkkkkkkkkk::\".\"",
+      "principal": {
+        "type": "Vhhhh8hhkkkkkkkkk",
+        "id": "."
+      },
+      "resource": {
+        "type": "Vhhhh8hhkkkkkkkkk",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Vhhhh8hhkkkkkkkkk::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhh8hhkkkkkkkkk::\".\"",
+      "principal": {
+        "type": "Vhhhh8hhkkkkkkkkk",
+        "id": "."
+      },
+      "resource": {
+        "type": "Vhhhh8hhkkkkkkkkk",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Vhhhh8hhkkkkkkkkk::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhh8hhkkkkkkkkk::\".\"",
+      "principal": {
+        "type": "Vhhhh8hhkkkkkkkkk",
+        "id": "."
+      },
+      "resource": {
+        "type": "Vhhhh8hhkkkkkkkkk",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/05e975dcdf0bf583ff3e5326f7cbeeb9359aa016.json b/cedar-integration-tests/corpus_tests/05e975dcdf0bf583ff3e5326f7cbeeb9359aa016.json
index becd0d92b..6acc7babe 100644
--- a/cedar-integration-tests/corpus_tests/05e975dcdf0bf583ff3e5326f7cbeeb9359aa016.json
+++ b/cedar-integration-tests/corpus_tests/05e975dcdf0bf583ff3e5326f7cbeeb9359aa016.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "C::r::C32::\"\"",
-      "action": "C::r::Action::\"\"",
-      "resource": "C::r::C32::\"\"",
+      "principal": {
+        "type": "C::r::C32",
+        "id": ""
+      },
+      "resource": {
+        "type": "C::r::C32",
+        "id": ""
+      },
+      "action": {
+        "type": "C::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "C::r::C32::\"\"",
-      "action": "C::r::Action::\"\"",
-      "resource": "C::r::C32::\"\"",
+      "principal": {
+        "type": "C::r::C32",
+        "id": ""
+      },
+      "resource": {
+        "type": "C::r::C32",
+        "id": ""
+      },
+      "action": {
+        "type": "C::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "C::r::C32::\"\"",
-      "action": "C::r::Action::\"\"",
-      "resource": "C::r::C32::\"\"",
+      "principal": {
+        "type": "C::r::C32",
+        "id": ""
+      },
+      "resource": {
+        "type": "C::r::C32",
+        "id": ""
+      },
+      "action": {
+        "type": "C::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "C::r::C32::\"\"",
-      "action": "C::r::Action::\"\"",
-      "resource": "C::r::C32::\"\"",
+      "principal": {
+        "type": "C::r::C32",
+        "id": ""
+      },
+      "resource": {
+        "type": "C::r::C32",
+        "id": ""
+      },
+      "action": {
+        "type": "C::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "C::r::C32::\"\"",
-      "action": "C::r::Action::\"\"",
-      "resource": "C::r::C32::\"\"",
+      "principal": {
+        "type": "C::r::C32",
+        "id": ""
+      },
+      "resource": {
+        "type": "C::r::C32",
+        "id": ""
+      },
+      "action": {
+        "type": "C::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "C::r::C32::\"\"",
-      "action": "C::r::Action::\"\"",
-      "resource": "C::r::C32::\"\"",
+      "principal": {
+        "type": "C::r::C32",
+        "id": ""
+      },
+      "resource": {
+        "type": "C::r::C32",
+        "id": ""
+      },
+      "action": {
+        "type": "C::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "C::r::C32::\"\"",
-      "action": "C::r::Action::\"\"",
-      "resource": "C::r::C32::\"\"",
+      "principal": {
+        "type": "C::r::C32",
+        "id": ""
+      },
+      "resource": {
+        "type": "C::r::C32",
+        "id": ""
+      },
+      "action": {
+        "type": "C::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "C::r::C32::\"\"",
-      "action": "C::r::Action::\"\"",
-      "resource": "C::r::C32::\"\"",
+      "principal": {
+        "type": "C::r::C32",
+        "id": ""
+      },
+      "resource": {
+        "type": "C::r::C32",
+        "id": ""
+      },
+      "action": {
+        "type": "C::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/060ad2040eed9fcf9c742a76d0cdba45c413e4ed.json b/cedar-integration-tests/corpus_tests/060ad2040eed9fcf9c742a76d0cdba45c413e4ed.json
index 2ec3b9081..c9be14cbe 100644
--- a/cedar-integration-tests/corpus_tests/060ad2040eed9fcf9c742a76d0cdba45c413e4ed.json
+++ b/cedar-integration-tests/corpus_tests/060ad2040eed9fcf9c742a76d0cdba45c413e4ed.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/0642ad216c4c962428c4e1f6f94a1db8247af415.json b/cedar-integration-tests/corpus_tests/0642ad216c4c962428c4e1f6f94a1db8247af415.json
index 34adef41f..c15ef0fc4 100644
--- a/cedar-integration-tests/corpus_tests/0642ad216c4c962428c4e1f6f94a1db8247af415.json
+++ b/cedar-integration-tests/corpus_tests/0642ad216c4c962428c4e1f6f94a1db8247af415.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/06a6d9d020ff8d224d8108b8b626d0d96cf5c696.json b/cedar-integration-tests/corpus_tests/06a6d9d020ff8d224d8108b8b626d0d96cf5c696.json
index 8d919b97f..a0700d439 100644
--- a/cedar-integration-tests/corpus_tests/06a6d9d020ff8d224d8108b8b626d0d96cf5c696.json
+++ b/cedar-integration-tests/corpus_tests/06a6d9d020ff8d224d8108b8b626d0d96cf5c696.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/06d021d379ba0cc92ffbb243a9024b20a9dac326.json b/cedar-integration-tests/corpus_tests/06d021d379ba0cc92ffbb243a9024b20a9dac326.json
index a19c49a95..90ddc8e8f 100644
--- a/cedar-integration-tests/corpus_tests/06d021d379ba0cc92ffbb243a9024b20a9dac326.json
+++ b/cedar-integration-tests/corpus_tests/06d021d379ba0cc92ffbb243a9024b20a9dac326.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/06e93ed14b5d21cc49f2e9e5ec072467bb247284.json b/cedar-integration-tests/corpus_tests/06e93ed14b5d21cc49f2e9e5ec072467bb247284.json
index ca9bd258f..9bc61a841 100644
--- a/cedar-integration-tests/corpus_tests/06e93ed14b5d21cc49f2e9e5ec072467bb247284.json
+++ b/cedar-integration-tests/corpus_tests/06e93ed14b5d21cc49f2e9e5ec072467bb247284.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/06f152a71ffade6c368d2ac46d9eb3782373911d.json b/cedar-integration-tests/corpus_tests/06f152a71ffade6c368d2ac46d9eb3782373911d.json
index 56b284ac2..46a2c5a09 100644
--- a/cedar-integration-tests/corpus_tests/06f152a71ffade6c368d2ac46d9eb3782373911d.json
+++ b/cedar-integration-tests/corpus_tests/06f152a71ffade6c368d2ac46d9eb3782373911d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "cd::v::K::\"\"",
-      "action": "cd::v::Action::\"action\"",
-      "resource": "cd::v::K::\"\"",
+      "principal": {
+        "type": "cd::v::K",
+        "id": ""
+      },
+      "resource": {
+        "type": "cd::v::K",
+        "id": ""
+      },
+      "action": {
+        "type": "cd::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "cd::v::K::\"\"",
-      "action": "cd::v::Action::\"action\"",
-      "resource": "cd::v::K::\"\"",
+      "principal": {
+        "type": "cd::v::K",
+        "id": ""
+      },
+      "resource": {
+        "type": "cd::v::K",
+        "id": ""
+      },
+      "action": {
+        "type": "cd::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "cd::v::K::\"\"",
-      "action": "cd::v::Action::\"action\"",
-      "resource": "cd::v::K::\"\"",
+      "principal": {
+        "type": "cd::v::K",
+        "id": ""
+      },
+      "resource": {
+        "type": "cd::v::K",
+        "id": ""
+      },
+      "action": {
+        "type": "cd::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "cd::v::K::\"\"",
-      "action": "cd::v::Action::\"action\"",
-      "resource": "cd::v::K::\"\"",
+      "principal": {
+        "type": "cd::v::K",
+        "id": ""
+      },
+      "resource": {
+        "type": "cd::v::K",
+        "id": ""
+      },
+      "action": {
+        "type": "cd::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "cd::v::K::\"\"",
-      "action": "cd::v::Action::\"action\"",
-      "resource": "cd::v::K::\"\"",
+      "principal": {
+        "type": "cd::v::K",
+        "id": ""
+      },
+      "resource": {
+        "type": "cd::v::K",
+        "id": ""
+      },
+      "action": {
+        "type": "cd::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "cd::v::K::\"\"",
-      "action": "cd::v::Action::\"action\"",
-      "resource": "cd::v::K::\"\"",
+      "principal": {
+        "type": "cd::v::K",
+        "id": ""
+      },
+      "resource": {
+        "type": "cd::v::K",
+        "id": ""
+      },
+      "action": {
+        "type": "cd::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "cd::v::K::\"\"",
-      "action": "cd::v::Action::\"action\"",
-      "resource": "cd::v::K::\"\"",
+      "principal": {
+        "type": "cd::v::K",
+        "id": ""
+      },
+      "resource": {
+        "type": "cd::v::K",
+        "id": ""
+      },
+      "action": {
+        "type": "cd::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "cd::v::K::\"\"",
-      "action": "cd::v::Action::\"action\"",
-      "resource": "cd::v::K::\"\"",
+      "principal": {
+        "type": "cd::v::K",
+        "id": ""
+      },
+      "resource": {
+        "type": "cd::v::K",
+        "id": ""
+      },
+      "action": {
+        "type": "cd::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/06ff234c0c72dc1f8e3ccbd93f4b03820a6c11f5.json b/cedar-integration-tests/corpus_tests/06ff234c0c72dc1f8e3ccbd93f4b03820a6c11f5.json
index e7c5d43ff..9fb811ae0 100644
--- a/cedar-integration-tests/corpus_tests/06ff234c0c72dc1f8e3ccbd93f4b03820a6c11f5.json
+++ b/cedar-integration-tests/corpus_tests/06ff234c0c72dc1f8e3ccbd93f4b03820a6c11f5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/074909fdcb280e369e36bfc125632c8898d151af.json b/cedar-integration-tests/corpus_tests/074909fdcb280e369e36bfc125632c8898d151af.json
index 56257b8ab..eaf7d1506 100644
--- a/cedar-integration-tests/corpus_tests/074909fdcb280e369e36bfc125632c8898d151af.json
+++ b/cedar-integration-tests/corpus_tests/074909fdcb280e369e36bfc125632c8898d151af.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::A::y::a::\"\\0\"",
-      "action": "r::A::y::Action::\"action\"",
-      "resource": "r::A::y::a::\"\"",
+      "principal": {
+        "type": "r::A::y::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "r::A::y::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::A::y::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::A::y::a::\"\"",
-      "action": "r::A::y::Action::\"action\"",
-      "resource": "r::A::y::a::\"\"",
+      "principal": {
+        "type": "r::A::y::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::A::y::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::A::y::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::A::y::a::\"\"",
-      "action": "r::A::y::Action::\"action\"",
-      "resource": "r::A::y::a::\"\"",
+      "principal": {
+        "type": "r::A::y::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::A::y::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::A::y::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::A::y::a::\"\"",
-      "action": "r::A::y::Action::\"action\"",
-      "resource": "r::A::y::a::\"\"",
+      "principal": {
+        "type": "r::A::y::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::A::y::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::A::y::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::A::y::a::\"\"",
-      "action": "r::A::y::Action::\"action\"",
-      "resource": "r::A::y::a::\"\"",
+      "principal": {
+        "type": "r::A::y::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::A::y::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::A::y::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::A::y::a::\"\"",
-      "action": "r::A::y::Action::\"action\"",
-      "resource": "r::A::y::a::\"\"",
+      "principal": {
+        "type": "r::A::y::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::A::y::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::A::y::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::A::y::a::\"\"",
-      "action": "r::A::y::Action::\"action\"",
-      "resource": "r::A::y::a::\"\"",
+      "principal": {
+        "type": "r::A::y::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::A::y::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::A::y::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::A::y::a::\"\"",
-      "action": "r::A::y::Action::\"action\"",
-      "resource": "r::A::y::a::\"\"",
+      "principal": {
+        "type": "r::A::y::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::A::y::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::A::y::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/07c8a8cfabada6bb90447010829e8e73fc84580d.json b/cedar-integration-tests/corpus_tests/07c8a8cfabada6bb90447010829e8e73fc84580d.json
index 6b23659d0..fdfc44040 100644
--- a/cedar-integration-tests/corpus_tests/07c8a8cfabada6bb90447010829e8e73fc84580d.json
+++ b/cedar-integration-tests/corpus_tests/07c8a8cfabada6bb90447010829e8e73fc84580d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/07df51dc66ab2eaaa92c7afafc54bdf533d386a2.json b/cedar-integration-tests/corpus_tests/07df51dc66ab2eaaa92c7afafc54bdf533d386a2.json
index 1e16802a2..ae0b47c6a 100644
--- a/cedar-integration-tests/corpus_tests/07df51dc66ab2eaaa92c7afafc54bdf533d386a2.json
+++ b/cedar-integration-tests/corpus_tests/07df51dc66ab2eaaa92c7afafc54bdf533d386a2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::a::\"\\0\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\\0\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::a::\"\\0\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\\0\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/0821f9d8ec765af8242685b3dce67d7b4f358ec2.json b/cedar-integration-tests/corpus_tests/0821f9d8ec765af8242685b3dce67d7b4f358ec2.json
index 940073ffa..3192a3341 100644
--- a/cedar-integration-tests/corpus_tests/0821f9d8ec765af8242685b3dce67d7b4f358ec2.json
+++ b/cedar-integration-tests/corpus_tests/0821f9d8ec765af8242685b3dce67d7b4f358ec2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/082b486148964f32e28607e08eb5d34c5c37c382.json b/cedar-integration-tests/corpus_tests/082b486148964f32e28607e08eb5d34c5c37c382.json
index 7440211d8..f04662cdc 100644
--- a/cedar-integration-tests/corpus_tests/082b486148964f32e28607e08eb5d34c5c37c382.json
+++ b/cedar-integration-tests/corpus_tests/082b486148964f32e28607e08eb5d34c5c37c382.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "1\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"1\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "1\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"1\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "1\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"1\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "1\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"1\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "1\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"1\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "1\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"1\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "1\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/0838cceb544b3bfcb7069ef1840a5147c926c4d6.json b/cedar-integration-tests/corpus_tests/0838cceb544b3bfcb7069ef1840a5147c926c4d6.json
index 744f1308d..e3e687c82 100644
--- a/cedar-integration-tests/corpus_tests/0838cceb544b3bfcb7069ef1840a5147c926c4d6.json
+++ b/cedar-integration-tests/corpus_tests/0838cceb544b3bfcb7069ef1840a5147c926c4d6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/083c7ab83766f808626cd347840932ef74ed67a8.json b/cedar-integration-tests/corpus_tests/083c7ab83766f808626cd347840932ef74ed67a8.json
index 862e6ef9a..a865ac6cd 100644
--- a/cedar-integration-tests/corpus_tests/083c7ab83766f808626cd347840932ef74ed67a8.json
+++ b/cedar-integration-tests/corpus_tests/083c7ab83766f808626cd347840932ef74ed67a8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/08500c1c65e96341b3eef33c68658af8078fd824.json b/cedar-integration-tests/corpus_tests/08500c1c65e96341b3eef33c68658af8078fd824.json
index 32e850b87..30ff91671 100644
--- a/cedar-integration-tests/corpus_tests/08500c1c65e96341b3eef33c68658af8078fd824.json
+++ b/cedar-integration-tests/corpus_tests/08500c1c65e96341b3eef33c68658af8078fd824.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Kfhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Kfhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Kfhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Kfhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Kfhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Kfhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Kfhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Kfhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/0869650f3af53764ac1783c8e7e6d57b54114ec5.json b/cedar-integration-tests/corpus_tests/0869650f3af53764ac1783c8e7e6d57b54114ec5.json
index 345a4ee7d..af23ac74e 100644
--- a/cedar-integration-tests/corpus_tests/0869650f3af53764ac1783c8e7e6d57b54114ec5.json
+++ b/cedar-integration-tests/corpus_tests/0869650f3af53764ac1783c8e7e6d57b54114ec5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/088d19004f5dc68c8707347fab6f817bc33f0df3.json b/cedar-integration-tests/corpus_tests/088d19004f5dc68c8707347fab6f817bc33f0df3.json
index ad17311a3..8494ffd4f 100644
--- a/cedar-integration-tests/corpus_tests/088d19004f5dc68c8707347fab6f817bc33f0df3.json
+++ b/cedar-integration-tests/corpus_tests/088d19004f5dc68c8707347fab6f817bc33f0df3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "F::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "F::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "F::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "F::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "F::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "F::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "F::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "F::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/08b97eac230b3d3f0877670ac672eaeff6b040b0.json b/cedar-integration-tests/corpus_tests/08b97eac230b3d3f0877670ac672eaeff6b040b0.json
index 438781b74..6f8e1638d 100644
--- a/cedar-integration-tests/corpus_tests/08b97eac230b3d3f0877670ac672eaeff6b040b0.json
+++ b/cedar-integration-tests/corpus_tests/08b97eac230b3d3f0877670ac672eaeff6b040b0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\":\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\":\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\":\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\":\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -84,9 +147,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\":\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/08efa6486228632965012d5656e4af0bbd08b4fa.json b/cedar-integration-tests/corpus_tests/08efa6486228632965012d5656e4af0bbd08b4fa.json
index 9aac40004..5041585ec 100644
--- a/cedar-integration-tests/corpus_tests/08efa6486228632965012d5656e4af0bbd08b4fa.json
+++ b/cedar-integration-tests/corpus_tests/08efa6486228632965012d5656e4af0bbd08b4fa.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}X!\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005X!"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{5}X!\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}X!\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005X!"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005X!"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{5}X!\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}X!\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005X!"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005X!"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{5}X!\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}X!\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005X!"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005X!"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{5}X!\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}X!\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005X!"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005X!"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{5}X!\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}X!\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005X!"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005X!"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{5}X!\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}X!\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005X!"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005X!"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{5}X!\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}X!\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005X!"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005X!"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/08f0aa0f6afb81dfd4b5b00b97a02783c9337d10.json b/cedar-integration-tests/corpus_tests/08f0aa0f6afb81dfd4b5b00b97a02783c9337d10.json
index fe42aefdf..89f522218 100644
--- a/cedar-integration-tests/corpus_tests/08f0aa0f6afb81dfd4b5b00b97a02783c9337d10.json
+++ b/cedar-integration-tests/corpus_tests/08f0aa0f6afb81dfd4b5b00b97a02783c9337d10.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"F\\0RR\\0\\u{12}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\\0RR\\0\\u{12}\"",
+      "principal": {
+        "type": "a",
+        "id": "F\u0000RR\u0000\u0012"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F\u0000RR\u0000\u0012"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"F\\0RR\\0\\u{12}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\\0RR\\0\\u{12}\"",
+      "principal": {
+        "type": "a",
+        "id": "F\u0000RR\u0000\u0012"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F\u0000RR\u0000\u0012"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"F\\0RR\\0\\u{12}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\\0RR\\0\\u{12}\"",
+      "principal": {
+        "type": "a",
+        "id": "F\u0000RR\u0000\u0012"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F\u0000RR\u0000\u0012"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"F\\0RR\\0\\u{12}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\\0RR\\0\\u{12}\"",
+      "principal": {
+        "type": "a",
+        "id": "F\u0000RR\u0000\u0012"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F\u0000RR\u0000\u0012"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"F\\0RR\\0\\u{12}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\\0RR\\0\\u{12}\"",
+      "principal": {
+        "type": "a",
+        "id": "F\u0000RR\u0000\u0012"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F\u0000RR\u0000\u0012"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"F\\0RR\\0\\u{12}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\\0RR\\0\\u{12}\"",
+      "principal": {
+        "type": "a",
+        "id": "F\u0000RR\u0000\u0012"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F\u0000RR\u0000\u0012"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"F\\0RR\\0\\u{12}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\\0RR\\0\\u{12}\"",
+      "principal": {
+        "type": "a",
+        "id": "F\u0000RR\u0000\u0012"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F\u0000RR\u0000\u0012"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/097833aed4e31e2f3e0acc0e3026ea9f7c020fc6.json b/cedar-integration-tests/corpus_tests/097833aed4e31e2f3e0acc0e3026ea9f7c020fc6.json
index efeaa4a93..0e2648438 100644
--- a/cedar-integration-tests/corpus_tests/097833aed4e31e2f3e0acc0e3026ea9f7c020fc6.json
+++ b/cedar-integration-tests/corpus_tests/097833aed4e31e2f3e0acc0e3026ea9f7c020fc6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "VhBhhhhkkkkkkkkkk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhBhhhhkkkkkkkkkk::\"\"",
+      "principal": {
+        "type": "VhBhhhhkkkkkkkkkk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhBhhhhkkkkkkkkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "VhBhhhhkkkkkkkkkk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhBhhhhkkkkkkkkkk::\"\"",
+      "principal": {
+        "type": "VhBhhhhkkkkkkkkkk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhBhhhhkkkkkkkkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "VhBhhhhkkkkkkkkkk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhBhhhhkkkkkkkkkk::\"\"",
+      "principal": {
+        "type": "VhBhhhhkkkkkkkkkk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhBhhhhkkkkkkkkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "VhBhhhhkkkkkkkkkk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhBhhhhkkkkkkkkkk::\"\"",
+      "principal": {
+        "type": "VhBhhhhkkkkkkkkkk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhBhhhhkkkkkkkkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "VhBhhhhkkkkkkkkkk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhBhhhhkkkkkkkkkk::\"\"",
+      "principal": {
+        "type": "VhBhhhhkkkkkkkkkk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhBhhhhkkkkkkkkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "VhBhhhhkkkkkkkkkk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhBhhhhkkkkkkkkkk::\"\"",
+      "principal": {
+        "type": "VhBhhhhkkkkkkkkkk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhBhhhhkkkkkkkkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "VhBhhhhkkkkkkkkkk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhBhhhhkkkkkkkkkk::\"\"",
+      "principal": {
+        "type": "VhBhhhhkkkkkkkkkk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhBhhhhkkkkkkkkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "VhBhhhhkkkkkkkkkk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhBhhhhkkkkkkkkkk::\"\"",
+      "principal": {
+        "type": "VhBhhhhkkkkkkkkkk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhBhhhhkkkkkkkkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/098ba12b4f5c65c43dd6f6ec2ba0e59642149b25.json b/cedar-integration-tests/corpus_tests/098ba12b4f5c65c43dd6f6ec2ba0e59642149b25.json
index 2457d5744..ab326ee39 100644
--- a/cedar-integration-tests/corpus_tests/098ba12b4f5c65c43dd6f6ec2ba0e59642149b25.json
+++ b/cedar-integration-tests/corpus_tests/098ba12b4f5c65c43dd6f6ec2ba0e59642149b25.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/09a68b2aeb2e68c3e39d7ef30236da0ceb720de0.json b/cedar-integration-tests/corpus_tests/09a68b2aeb2e68c3e39d7ef30236da0ceb720de0.json
index d8d1a5e42..748ae7ef6 100644
--- a/cedar-integration-tests/corpus_tests/09a68b2aeb2e68c3e39d7ef30236da0ceb720de0.json
+++ b/cedar-integration-tests/corpus_tests/09a68b2aeb2e68c3e39d7ef30236da0ceb720de0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "\u0000a"
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "\u0000a"
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "\u0000a"
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "\u0000a"
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "\u0000a"
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "\u0000a"
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "\u0000a"
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "\u0000a"
       },
diff --git a/cedar-integration-tests/corpus_tests/09e4deab2631977826e591319301567a917009b8.json b/cedar-integration-tests/corpus_tests/09e4deab2631977826e591319301567a917009b8.json
index de61cefd6..7bad3200f 100644
--- a/cedar-integration-tests/corpus_tests/09e4deab2631977826e591319301567a917009b8.json
+++ b/cedar-integration-tests/corpus_tests/09e4deab2631977826e591319301567a917009b8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/09f6db1af99d55f35cde7641356a729d7dd01a6b.json b/cedar-integration-tests/corpus_tests/09f6db1af99d55f35cde7641356a729d7dd01a6b.json
index 3d5178f72..d9450eed0 100644
--- a/cedar-integration-tests/corpus_tests/09f6db1af99d55f35cde7641356a729d7dd01a6b.json
+++ b/cedar-integration-tests/corpus_tests/09f6db1af99d55f35cde7641356a729d7dd01a6b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"_z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "_z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/0a451e320de150e9a7bcfbaa0b1c3256e4025cec.json b/cedar-integration-tests/corpus_tests/0a451e320de150e9a7bcfbaa0b1c3256e4025cec.json
index 21b0cd99e..a4721cb4f 100644
--- a/cedar-integration-tests/corpus_tests/0a451e320de150e9a7bcfbaa0b1c3256e4025cec.json
+++ b/cedar-integration-tests/corpus_tests/0a451e320de150e9a7bcfbaa0b1c3256e4025cec.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"d\\0\\0\\0\\0\\00\\0\\0\\u{3}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"d\\0\\0\\0\\0\\00\\0\\0\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "d\u0000\u0000\u0000\u0000\u00000\u0000\u0000\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "d\u0000\u0000\u0000\u0000\u00000\u0000\u0000\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "t": false,
         "r": {}
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"d\\0\\0\\0\\0\\00\\0\\0\\u{3}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"d\\0\\0\\0\\0\\00\\0\\0\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "d\u0000\u0000\u0000\u0000\u00000\u0000\u0000\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "d\u0000\u0000\u0000\u0000\u00000\u0000\u0000\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "t": false,
         "r": {}
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"d\\0\\0\\0\\0\\00\\0\\0\\u{3}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"d\\0\\0\\0\\0\\00\\0\\0\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "d\u0000\u0000\u0000\u0000\u00000\u0000\u0000\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "d\u0000\u0000\u0000\u0000\u00000\u0000\u0000\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "t": false,
         "r": {}
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"d\\0\\0\\0\\0\\00\\0\\0\\u{3}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"d\\0\\0\\0\\0\\00\\0\\0\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "d\u0000\u0000\u0000\u0000\u00000\u0000\u0000\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "d\u0000\u0000\u0000\u0000\u00000\u0000\u0000\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "t": false,
         "r": {}
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"d\\0\\0\\0\\0\\00\\0\\0\\u{3}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"d\\0\\0\\0\\0\\00\\0\\0\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "d\u0000\u0000\u0000\u0000\u00000\u0000\u0000\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "d\u0000\u0000\u0000\u0000\u00000\u0000\u0000\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "t": false,
         "r": {}
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"d\\0\\0\\0\\0\\00\\0\\0\\u{3}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"d\\0\\0\\0\\0\\00\\0\\0\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "d\u0000\u0000\u0000\u0000\u00000\u0000\u0000\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "d\u0000\u0000\u0000\u0000\u00000\u0000\u0000\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "t": false,
         "r": {}
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"d\\0\\0\\0\\0\\00\\0\\0\\u{3}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"d\\0\\0\\0\\0\\00\\0\\0\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "d\u0000\u0000\u0000\u0000\u00000\u0000\u0000\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "d\u0000\u0000\u0000\u0000\u00000\u0000\u0000\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "t": false,
         "r": {}
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"d\\0\\0\\0\\0\\00\\0\\0\\u{3}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"d\\0\\0\\0\\0\\00\\0\\0\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "d\u0000\u0000\u0000\u0000\u00000\u0000\u0000\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "d\u0000\u0000\u0000\u0000\u00000\u0000\u0000\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "t": false,
         "r": {}
diff --git a/cedar-integration-tests/corpus_tests/0a49dd819ecf631af113d714801745fd24192814.json b/cedar-integration-tests/corpus_tests/0a49dd819ecf631af113d714801745fd24192814.json
index 9cb0afb46..d7aff53d1 100644
--- a/cedar-integration-tests/corpus_tests/0a49dd819ecf631af113d714801745fd24192814.json
+++ b/cedar-integration-tests/corpus_tests/0a49dd819ecf631af113d714801745fd24192814.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "qss::A000r::a::\"6006+\"",
-      "action": "qss::A000r::Action::\"action\"",
-      "resource": "qss::A000r::a::\"6006+\"",
+      "principal": {
+        "type": "qss::A000r::a",
+        "id": "6006+"
+      },
+      "resource": {
+        "type": "qss::A000r::a",
+        "id": "6006+"
+      },
+      "action": {
+        "type": "qss::A000r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "qss::A000r::a::\"6006+\"",
-      "action": "qss::A000r::Action::\"action\"",
-      "resource": "qss::A000r::a::\"6006+\"",
+      "principal": {
+        "type": "qss::A000r::a",
+        "id": "6006+"
+      },
+      "resource": {
+        "type": "qss::A000r::a",
+        "id": "6006+"
+      },
+      "action": {
+        "type": "qss::A000r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "qss::A000r::a::\"6006+\"",
-      "action": "qss::A000r::Action::\"action\"",
-      "resource": "qss::A000r::a::\"6006+\"",
+      "principal": {
+        "type": "qss::A000r::a",
+        "id": "6006+"
+      },
+      "resource": {
+        "type": "qss::A000r::a",
+        "id": "6006+"
+      },
+      "action": {
+        "type": "qss::A000r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "qss::A000r::a::\"6006+\"",
-      "action": "qss::A000r::Action::\"action\"",
-      "resource": "qss::A000r::a::\"6006+\"",
+      "principal": {
+        "type": "qss::A000r::a",
+        "id": "6006+"
+      },
+      "resource": {
+        "type": "qss::A000r::a",
+        "id": "6006+"
+      },
+      "action": {
+        "type": "qss::A000r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "qss::A000r::a::\"6006+\"",
-      "action": "qss::A000r::Action::\"action\"",
-      "resource": "qss::A000r::a::\"6006+\"",
+      "principal": {
+        "type": "qss::A000r::a",
+        "id": "6006+"
+      },
+      "resource": {
+        "type": "qss::A000r::a",
+        "id": "6006+"
+      },
+      "action": {
+        "type": "qss::A000r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "qss::A000r::a::\"6006+\"",
-      "action": "qss::A000r::Action::\"action\"",
-      "resource": "qss::A000r::a::\"6006+\"",
+      "principal": {
+        "type": "qss::A000r::a",
+        "id": "6006+"
+      },
+      "resource": {
+        "type": "qss::A000r::a",
+        "id": "6006+"
+      },
+      "action": {
+        "type": "qss::A000r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "qss::A000r::a::\"6006+\"",
-      "action": "qss::A000r::Action::\"action\"",
-      "resource": "qss::A000r::a::\"6006+\"",
+      "principal": {
+        "type": "qss::A000r::a",
+        "id": "6006+"
+      },
+      "resource": {
+        "type": "qss::A000r::a",
+        "id": "6006+"
+      },
+      "action": {
+        "type": "qss::A000r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "qss::A000r::a::\"6006+\"",
-      "action": "qss::A000r::Action::\"action\"",
-      "resource": "qss::A000r::a::\"6006+\"",
+      "principal": {
+        "type": "qss::A000r::a",
+        "id": "6006+"
+      },
+      "resource": {
+        "type": "qss::A000r::a",
+        "id": "6006+"
+      },
+      "action": {
+        "type": "qss::A000r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/0a52da6b4da559794a2106d47bb08defa83df7e5.json b/cedar-integration-tests/corpus_tests/0a52da6b4da559794a2106d47bb08defa83df7e5.json
index 6cbbaf7ef..4e48e2e5d 100644
--- a/cedar-integration-tests/corpus_tests/0a52da6b4da559794a2106d47bb08defa83df7e5.json
+++ b/cedar-integration-tests/corpus_tests/0a52da6b4da559794a2106d47bb08defa83df7e5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/0a6e9d198c15f603144afd42693151c4f63c4f15.json b/cedar-integration-tests/corpus_tests/0a6e9d198c15f603144afd42693151c4f63c4f15.json
index 941df1bb4..cadcad80f 100644
--- a/cedar-integration-tests/corpus_tests/0a6e9d198c15f603144afd42693151c4f63c4f15.json
+++ b/cedar-integration-tests/corpus_tests/0a6e9d198c15f603144afd42693151c4f63c4f15.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/0a7286518e9d6c03de240d7e672e4412411473f8.json b/cedar-integration-tests/corpus_tests/0a7286518e9d6c03de240d7e672e4412411473f8.json
index 4bdfa3798..aa7f5a49d 100644
--- a/cedar-integration-tests/corpus_tests/0a7286518e9d6c03de240d7e672e4412411473f8.json
+++ b/cedar-integration-tests/corpus_tests/0a7286518e9d6c03de240d7e672e4412411473f8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/0a90677b3f0180d3edc9e4e2b9247c20fe6667cd.json b/cedar-integration-tests/corpus_tests/0a90677b3f0180d3edc9e4e2b9247c20fe6667cd.json
index 9498516f0..894c2f6ad 100644
--- a/cedar-integration-tests/corpus_tests/0a90677b3f0180d3edc9e4e2b9247c20fe6667cd.json
+++ b/cedar-integration-tests/corpus_tests/0a90677b3f0180d3edc9e4e2b9247c20fe6667cd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -82,9 +145,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/0ad7f53251425c9d8f3f0bcb9ececdfbe65fbaac.json b/cedar-integration-tests/corpus_tests/0ad7f53251425c9d8f3f0bcb9ececdfbe65fbaac.json
index 1cd44e7b2..764e2b492 100644
--- a/cedar-integration-tests/corpus_tests/0ad7f53251425c9d8f3f0bcb9ececdfbe65fbaac.json
+++ b/cedar-integration-tests/corpus_tests/0ad7f53251425c9d8f3f0bcb9ececdfbe65fbaac.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/0ae181d83134f6a128eacb2e9bda0c54197e0d50.json b/cedar-integration-tests/corpus_tests/0ae181d83134f6a128eacb2e9bda0c54197e0d50.json
index 8646304c8..c93e533c3 100644
--- a/cedar-integration-tests/corpus_tests/0ae181d83134f6a128eacb2e9bda0c54197e0d50.json
+++ b/cedar-integration-tests/corpus_tests/0ae181d83134f6a128eacb2e9bda0c54197e0d50.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vh92222": "",
         "r": "",
@@ -22,9 +31,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vh92222": "",
         "r": "",
@@ -38,9 +56,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vh92222": "",
         "r": "",
@@ -54,9 +81,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vh92222": "",
         "r": "",
@@ -70,9 +106,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vh92222": "",
         "r": "",
@@ -86,9 +131,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vh92222": "",
         "r": "",
@@ -102,9 +156,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vh92222": "",
         "r": "",
@@ -118,9 +181,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vh92222": "",
         "r": "",
diff --git a/cedar-integration-tests/corpus_tests/0b249feb22c3085af29fe1f1a49a47ebea0fc72e.json b/cedar-integration-tests/corpus_tests/0b249feb22c3085af29fe1f1a49a47ebea0fc72e.json
index 0478bdfa5..bdfc5c820 100644
--- a/cedar-integration-tests/corpus_tests/0b249feb22c3085af29fe1f1a49a47ebea0fc72e.json
+++ b/cedar-integration-tests/corpus_tests/0b249feb22c3085af29fe1f1a49a47ebea0fc72e.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +21,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"zz|z\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "zz|z"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +43,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +57,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"zz|z\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "zz|z"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +78,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"zz|z\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "zz|z"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +99,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"zz|z\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "zz|z"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"zz|z\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "zz|z"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"zz|z\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "zz|z"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/0b7e0114ef0d24841bd57f41a5914cbc114184dc.json b/cedar-integration-tests/corpus_tests/0b7e0114ef0d24841bd57f41a5914cbc114184dc.json
index 94a64b97c..c39d76440 100644
--- a/cedar-integration-tests/corpus_tests/0b7e0114ef0d24841bd57f41a5914cbc114184dc.json
+++ b/cedar-integration-tests/corpus_tests/0b7e0114ef0d24841bd57f41a5914cbc114184dc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"C\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "C"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/0b9ca9afefa830d3be46d7e7cf1017e5b4ac3d08.json b/cedar-integration-tests/corpus_tests/0b9ca9afefa830d3be46d7e7cf1017e5b4ac3d08.json
index f18baf927..3b42aedaf 100644
--- a/cedar-integration-tests/corpus_tests/0b9ca9afefa830d3be46d7e7cf1017e5b4ac3d08.json
+++ b/cedar-integration-tests/corpus_tests/0b9ca9afefa830d3be46d7e7cf1017e5b4ac3d08.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"FFFFFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"FFFFFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"FFFFFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"FFFFFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"FFFFFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"FFFFFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"FFFFFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"FFFFFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/0be4a052045072582b439dc5c9b80a3d8bb97296.json b/cedar-integration-tests/corpus_tests/0be4a052045072582b439dc5c9b80a3d8bb97296.json
index 2315fe30b..3dcb1ed2d 100644
--- a/cedar-integration-tests/corpus_tests/0be4a052045072582b439dc5c9b80a3d8bb97296.json
+++ b/cedar-integration-tests/corpus_tests/0be4a052045072582b439dc5c9b80a3d8bb97296.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/0c0777cdd6151d7e1f444ff3ac045d45e99de86f.json b/cedar-integration-tests/corpus_tests/0c0777cdd6151d7e1f444ff3ac045d45e99de86f.json
index ed1a3e248..864629c5f 100644
--- a/cedar-integration-tests/corpus_tests/0c0777cdd6151d7e1f444ff3ac045d45e99de86f.json
+++ b/cedar-integration-tests/corpus_tests/0c0777cdd6151d7e1f444ff3ac045d45e99de86f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/0c367b79cc920e0feaf83ea234081b5ed3e76fa5.json b/cedar-integration-tests/corpus_tests/0c367b79cc920e0feaf83ea234081b5ed3e76fa5.json
index 770e1ed87..638feceb2 100644
--- a/cedar-integration-tests/corpus_tests/0c367b79cc920e0feaf83ea234081b5ed3e76fa5.json
+++ b/cedar-integration-tests/corpus_tests/0c367b79cc920e0feaf83ea234081b5ed3e76fa5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/0c3a5ddcbb4629791f1793c7b0a683972bdbe0a6.json b/cedar-integration-tests/corpus_tests/0c3a5ddcbb4629791f1793c7b0a683972bdbe0a6.json
index f50b0c000..4a2628e4a 100644
--- a/cedar-integration-tests/corpus_tests/0c3a5ddcbb4629791f1793c7b0a683972bdbe0a6.json
+++ b/cedar-integration-tests/corpus_tests/0c3a5ddcbb4629791f1793c7b0a683972bdbe0a6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\u{2}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\u{2}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0002\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0002\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\u{2}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\u{2}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0002\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0002\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\u{2}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\u{2}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0002\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0002\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\u{2}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\u{2}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0002\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0002\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\u{2}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\u{2}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0002\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0002\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\u{2}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\u{2}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0002\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0002\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\u{2}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\u{2}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0002\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0002\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\u{2}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\u{2}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0002\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0002\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/0c504a6e9b059221d5f7cadc7c33b075f40fa27c.json b/cedar-integration-tests/corpus_tests/0c504a6e9b059221d5f7cadc7c33b075f40fa27c.json
index d98ceeee9..ef7608535 100644
--- a/cedar-integration-tests/corpus_tests/0c504a6e9b059221d5f7cadc7c33b075f40fa27c.json
+++ b/cedar-integration-tests/corpus_tests/0c504a6e9b059221d5f7cadc7c33b075f40fa27c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/0c9b41fe69138ffded4b2a80cf4615208b9ca7ca.json b/cedar-integration-tests/corpus_tests/0c9b41fe69138ffded4b2a80cf4615208b9ca7ca.json
index 8542b713b..becce1369 100644
--- a/cedar-integration-tests/corpus_tests/0c9b41fe69138ffded4b2a80cf4615208b9ca7ca.json
+++ b/cedar-integration-tests/corpus_tests/0c9b41fe69138ffded4b2a80cf4615208b9ca7ca.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"coem/zasterx\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"coem/zasterx\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "coem/zasterx\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "coem/zasterx\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"coem/zasterx\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"coem/zasterx\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "coem/zasterx\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "coem/zasterx\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"coem/zasterx\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"coem/zasterx\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "coem/zasterx\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "coem/zasterx\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"coem/zasterx\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"coem/zasterx\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "coem/zasterx\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "coem/zasterx\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"coem/zasterx\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"coem/zasterx\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "coem/zasterx\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "coem/zasterx\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"coem/zasterx\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"coem/zasterx\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "coem/zasterx\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "coem/zasterx\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"coem/zasterx\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"coem/zasterx\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "coem/zasterx\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "coem/zasterx\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"coem/zasterx\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"coem/zasterx\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "coem/zasterx\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "coem/zasterx\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/0daaf207b4203e78d906424710b02a535efc7e76.json b/cedar-integration-tests/corpus_tests/0daaf207b4203e78d906424710b02a535efc7e76.json
index 3cb16c466..0e0edf5b1 100644
--- a/cedar-integration-tests/corpus_tests/0daaf207b4203e78d906424710b02a535efc7e76.json
+++ b/cedar-integration-tests/corpus_tests/0daaf207b4203e78d906424710b02a535efc7e76.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/0df0cd1c61dd709bdeb1a9090b8a8f8f81a772d0.json b/cedar-integration-tests/corpus_tests/0df0cd1c61dd709bdeb1a9090b8a8f8f81a772d0.json
index 997d35951..feb2a7e47 100644
--- a/cedar-integration-tests/corpus_tests/0df0cd1c61dd709bdeb1a9090b8a8f8f81a772d0.json
+++ b/cedar-integration-tests/corpus_tests/0df0cd1c61dd709bdeb1a9090b8a8f8f81a772d0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"$\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\"",
+      "principal": {
+        "type": "a",
+        "id": "$"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"$\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\"",
+      "principal": {
+        "type": "a",
+        "id": "$"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"$\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\"",
+      "principal": {
+        "type": "a",
+        "id": "$"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"$\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\"",
+      "principal": {
+        "type": "a",
+        "id": "$"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"$\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\"",
+      "principal": {
+        "type": "a",
+        "id": "$"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"$\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\"",
+      "principal": {
+        "type": "a",
+        "id": "$"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"$\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\"",
+      "principal": {
+        "type": "a",
+        "id": "$"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"$\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\"",
+      "principal": {
+        "type": "a",
+        "id": "$"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/0e16a8756b45ab3f6d4b50050ef4e20452dcf49f.json b/cedar-integration-tests/corpus_tests/0e16a8756b45ab3f6d4b50050ef4e20452dcf49f.json
index 2c05df59d..56b26a392 100644
--- a/cedar-integration-tests/corpus_tests/0e16a8756b45ab3f6d4b50050ef4e20452dcf49f.json
+++ b/cedar-integration-tests/corpus_tests/0e16a8756b45ab3f6d4b50050ef4e20452dcf49f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/0e8b180d44c3ea563be94afe3958632a3a4b6266.json b/cedar-integration-tests/corpus_tests/0e8b180d44c3ea563be94afe3958632a3a4b6266.json
index 287704092..a33a55bb8 100644
--- a/cedar-integration-tests/corpus_tests/0e8b180d44c3ea563be94afe3958632a3a4b6266.json
+++ b/cedar-integration-tests/corpus_tests/0e8b180d44c3ea563be94afe3958632a3a4b6266.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ffff\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\"",
+      "principal": {
+        "type": "a",
+        "id": "ffff\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\"",
+      "principal": {
+        "type": "a",
+        "id": "F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\"",
+      "principal": {
+        "type": "a",
+        "id": "F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\"",
+      "principal": {
+        "type": "a",
+        "id": "F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\"",
+      "principal": {
+        "type": "a",
+        "id": "F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\"",
+      "principal": {
+        "type": "a",
+        "id": "F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\"",
+      "principal": {
+        "type": "a",
+        "id": "F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/0ee271720a5368c8cf8d56e70243f821ea755c58.json b/cedar-integration-tests/corpus_tests/0ee271720a5368c8cf8d56e70243f821ea755c58.json
index 5c5b23136..f6fbb126d 100644
--- a/cedar-integration-tests/corpus_tests/0ee271720a5368c8cf8d56e70243f821ea755c58.json
+++ b/cedar-integration-tests/corpus_tests/0ee271720a5368c8cf8d56e70243f821ea755c58.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "fpvc5xxxx00000": "",
         "v": "",
@@ -22,9 +31,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "fpvc5xxxx00000": "",
         "v": "",
@@ -38,9 +56,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "fpvc5xxxx00000": "",
         "v": "",
@@ -54,9 +81,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "fpvc5xxxx00000": "",
         "v": "",
@@ -70,9 +106,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "fpvc5xxxx00000": "",
         "v": "",
@@ -86,9 +131,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "fpvc5xxxx00000": "",
         "v": "",
@@ -102,9 +156,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "fpvc5xxxx00000": "",
         "v": "",
@@ -118,9 +181,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "fpvc5xxxx00000": "",
         "v": "",
diff --git a/cedar-integration-tests/corpus_tests/0ef8dad0b5a647ae0a7c1dd48d2bfb403009d4eb.json b/cedar-integration-tests/corpus_tests/0ef8dad0b5a647ae0a7c1dd48d2bfb403009d4eb.json
index a99be3f1e..7487c5459 100644
--- a/cedar-integration-tests/corpus_tests/0ef8dad0b5a647ae0a7c1dd48d2bfb403009d4eb.json
+++ b/cedar-integration-tests/corpus_tests/0ef8dad0b5a647ae0a7c1dd48d2bfb403009d4eb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/0f17119feea9deb66035e5df79a86f4b7c8fa580.json b/cedar-integration-tests/corpus_tests/0f17119feea9deb66035e5df79a86f4b7c8fa580.json
index 20e7ce2a3..ce8a4fa24 100644
--- a/cedar-integration-tests/corpus_tests/0f17119feea9deb66035e5df79a86f4b7c8fa580.json
+++ b/cedar-integration-tests/corpus_tests/0f17119feea9deb66035e5df79a86f4b7c8fa580.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/0f39380d0206e60dc83bc69a8f1802916f53f63a.json b/cedar-integration-tests/corpus_tests/0f39380d0206e60dc83bc69a8f1802916f53f63a.json
index 2591ebb3d..5a6a34a5d 100644
--- a/cedar-integration-tests/corpus_tests/0f39380d0206e60dc83bc69a8f1802916f53f63a.json
+++ b/cedar-integration-tests/corpus_tests/0f39380d0206e60dc83bc69a8f1802916f53f63a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"j\\07\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\07\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"j\\07\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\07\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"j\\07\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\07\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"j\\07\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\07\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"j\\07\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\07\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"j\\07\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\07\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"j\\07\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\07\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"j\\07\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\07\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u00007\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/0f662f9123a3f835c7dc1004515f79b1609d2e58.json b/cedar-integration-tests/corpus_tests/0f662f9123a3f835c7dc1004515f79b1609d2e58.json
index 4568ccef3..fe19ccfdb 100644
--- a/cedar-integration-tests/corpus_tests/0f662f9123a3f835c7dc1004515f79b1609d2e58.json
+++ b/cedar-integration-tests/corpus_tests/0f662f9123a3f835c7dc1004515f79b1609d2e58.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/0f6bd61ae5a54f7abc1890148c6f5b9c389afef8.json b/cedar-integration-tests/corpus_tests/0f6bd61ae5a54f7abc1890148c6f5b9c389afef8.json
index 7bdcd2341..2b7aedde4 100644
--- a/cedar-integration-tests/corpus_tests/0f6bd61ae5a54f7abc1890148c6f5b9c389afef8.json
+++ b/cedar-integration-tests/corpus_tests/0f6bd61ae5a54f7abc1890148c6f5b9c389afef8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\".1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ".1"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/0f77f6c224018df9fc00f3068dc4a4cb198b78e1.json b/cedar-integration-tests/corpus_tests/0f77f6c224018df9fc00f3068dc4a4cb198b78e1.json
index bb8f79675..5cf218b0e 100644
--- a/cedar-integration-tests/corpus_tests/0f77f6c224018df9fc00f3068dc4a4cb198b78e1.json
+++ b/cedar-integration-tests/corpus_tests/0f77f6c224018df9fc00f3068dc4a4cb198b78e1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/0f921ba46a7f2a9d02dc34b4f2876f50cb7eb4c5.json b/cedar-integration-tests/corpus_tests/0f921ba46a7f2a9d02dc34b4f2876f50cb7eb4c5.json
index f9fdd7454..346aa99e1 100644
--- a/cedar-integration-tests/corpus_tests/0f921ba46a7f2a9d02dc34b4f2876f50cb7eb4c5.json
+++ b/cedar-integration-tests/corpus_tests/0f921ba46a7f2a9d02dc34b4f2876f50cb7eb4c5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"+\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"+\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -84,9 +147,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/0ff6d747c763a5a1c6266cb4a4e7ae80cc8d6234.json b/cedar-integration-tests/corpus_tests/0ff6d747c763a5a1c6266cb4a4e7ae80cc8d6234.json
index 2e0d983c6..5377528ab 100644
--- a/cedar-integration-tests/corpus_tests/0ff6d747c763a5a1c6266cb4a4e7ae80cc8d6234.json
+++ b/cedar-integration-tests/corpus_tests/0ff6d747c763a5a1c6266cb4a4e7ae80cc8d6234.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/101a95ae783b3b3350d89a013ec071fe2be8cdea.json b/cedar-integration-tests/corpus_tests/101a95ae783b3b3350d89a013ec071fe2be8cdea.json
index 64e7da903..0fa184fcc 100644
--- a/cedar-integration-tests/corpus_tests/101a95ae783b3b3350d89a013ec071fe2be8cdea.json
+++ b/cedar-integration-tests/corpus_tests/101a95ae783b3b3350d89a013ec071fe2be8cdea.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "L::Fww33333::a::\"\\0\\0::::::\"",
-      "action": "L::Fww33333::Action::\"action\"",
-      "resource": "L::Fww33333::a::\"\\0\\0::::::\"",
+      "principal": {
+        "type": "L::Fww33333::a",
+        "id": "\u0000\u0000::::::"
+      },
+      "resource": {
+        "type": "L::Fww33333::a",
+        "id": "\u0000\u0000::::::"
+      },
+      "action": {
+        "type": "L::Fww33333::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "L::Fww33333::a::\"\\0\\0::::::\"",
-      "action": "L::Fww33333::Action::\"action\"",
-      "resource": "L::Fww33333::a::\"\\0\\0::::::\"",
+      "principal": {
+        "type": "L::Fww33333::a",
+        "id": "\u0000\u0000::::::"
+      },
+      "resource": {
+        "type": "L::Fww33333::a",
+        "id": "\u0000\u0000::::::"
+      },
+      "action": {
+        "type": "L::Fww33333::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "L::Fww33333::a::\"\\0\\0::::::\"",
-      "action": "L::Fww33333::Action::\"action\"",
-      "resource": "L::Fww33333::a::\"\\0\\0::::::\"",
+      "principal": {
+        "type": "L::Fww33333::a",
+        "id": "\u0000\u0000::::::"
+      },
+      "resource": {
+        "type": "L::Fww33333::a",
+        "id": "\u0000\u0000::::::"
+      },
+      "action": {
+        "type": "L::Fww33333::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "L::Fww33333::a::\"\\0\\0::::::\"",
-      "action": "L::Fww33333::Action::\"action\"",
-      "resource": "L::Fww33333::a::\"\\0\\0::::::\"",
+      "principal": {
+        "type": "L::Fww33333::a",
+        "id": "\u0000\u0000::::::"
+      },
+      "resource": {
+        "type": "L::Fww33333::a",
+        "id": "\u0000\u0000::::::"
+      },
+      "action": {
+        "type": "L::Fww33333::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "L::Fww33333::a::\"\\0\\0::::::\"",
-      "action": "L::Fww33333::Action::\"action\"",
-      "resource": "L::Fww33333::a::\"\\0\\0::::::\"",
+      "principal": {
+        "type": "L::Fww33333::a",
+        "id": "\u0000\u0000::::::"
+      },
+      "resource": {
+        "type": "L::Fww33333::a",
+        "id": "\u0000\u0000::::::"
+      },
+      "action": {
+        "type": "L::Fww33333::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "L::Fww33333::a::\"\\0\\0::::::\"",
-      "action": "L::Fww33333::Action::\"action\"",
-      "resource": "L::Fww33333::a::\"\\0\\0::::::\"",
+      "principal": {
+        "type": "L::Fww33333::a",
+        "id": "\u0000\u0000::::::"
+      },
+      "resource": {
+        "type": "L::Fww33333::a",
+        "id": "\u0000\u0000::::::"
+      },
+      "action": {
+        "type": "L::Fww33333::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "L::Fww33333::a::\"\\0\\0::::::\"",
-      "action": "L::Fww33333::Action::\"action\"",
-      "resource": "L::Fww33333::a::\"\\0\\0::::::\"",
+      "principal": {
+        "type": "L::Fww33333::a",
+        "id": "\u0000\u0000::::::"
+      },
+      "resource": {
+        "type": "L::Fww33333::a",
+        "id": "\u0000\u0000::::::"
+      },
+      "action": {
+        "type": "L::Fww33333::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "L::Fww33333::a::\"\\0\\0::::::\"",
-      "action": "L::Fww33333::Action::\"action\"",
-      "resource": "L::Fww33333::a::\"\\0\\0::::::\"",
+      "principal": {
+        "type": "L::Fww33333::a",
+        "id": "\u0000\u0000::::::"
+      },
+      "resource": {
+        "type": "L::Fww33333::a",
+        "id": "\u0000\u0000::::::"
+      },
+      "action": {
+        "type": "L::Fww33333::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/104444f7ad4d486497918c7fcb74584bd6ae41b8.json b/cedar-integration-tests/corpus_tests/104444f7ad4d486497918c7fcb74584bd6ae41b8.json
index a42d0c2f4..95e15ebbb 100644
--- a/cedar-integration-tests/corpus_tests/104444f7ad4d486497918c7fcb74584bd6ae41b8.json
+++ b/cedar-integration-tests/corpus_tests/104444f7ad4d486497918c7fcb74584bd6ae41b8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "_AmdWmXb0g::Cga::a::\"j\\0\"",
-      "action": "_AmdWmXb0g::Cga::Action::\"action\"",
-      "resource": "_AmdWmXb0g::Cga::a::\"j\\0\"",
+      "principal": {
+        "type": "_AmdWmXb0g::Cga::a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "_AmdWmXb0g::Cga::a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "_AmdWmXb0g::Cga::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "_AmdWmXb0g::Cga::a::\"j\\0\"",
-      "action": "_AmdWmXb0g::Cga::Action::\"action\"",
-      "resource": "_AmdWmXb0g::Cga::a::\"j\\0\"",
+      "principal": {
+        "type": "_AmdWmXb0g::Cga::a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "_AmdWmXb0g::Cga::a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "_AmdWmXb0g::Cga::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "_AmdWmXb0g::Cga::a::\"j\\0\"",
-      "action": "_AmdWmXb0g::Cga::Action::\"action\"",
-      "resource": "_AmdWmXb0g::Cga::a::\"j\\0\"",
+      "principal": {
+        "type": "_AmdWmXb0g::Cga::a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "_AmdWmXb0g::Cga::a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "_AmdWmXb0g::Cga::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "_AmdWmXb0g::Cga::a::\"j\\0\"",
-      "action": "_AmdWmXb0g::Cga::Action::\"action\"",
-      "resource": "_AmdWmXb0g::Cga::a::\"j\\0\"",
+      "principal": {
+        "type": "_AmdWmXb0g::Cga::a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "_AmdWmXb0g::Cga::a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "_AmdWmXb0g::Cga::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "_AmdWmXb0g::Cga::a::\"j\\0\"",
-      "action": "_AmdWmXb0g::Cga::Action::\"action\"",
-      "resource": "_AmdWmXb0g::Cga::a::\"j\\0\"",
+      "principal": {
+        "type": "_AmdWmXb0g::Cga::a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "_AmdWmXb0g::Cga::a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "_AmdWmXb0g::Cga::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "_AmdWmXb0g::Cga::a::\"j\\0\"",
-      "action": "_AmdWmXb0g::Cga::Action::\"action\"",
-      "resource": "_AmdWmXb0g::Cga::a::\"j\\0\"",
+      "principal": {
+        "type": "_AmdWmXb0g::Cga::a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "_AmdWmXb0g::Cga::a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "_AmdWmXb0g::Cga::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "_AmdWmXb0g::Cga::a::\"j\\0\"",
-      "action": "_AmdWmXb0g::Cga::Action::\"action\"",
-      "resource": "_AmdWmXb0g::Cga::a::\"j\\0\"",
+      "principal": {
+        "type": "_AmdWmXb0g::Cga::a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "_AmdWmXb0g::Cga::a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "_AmdWmXb0g::Cga::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "_AmdWmXb0g::Cga::a::\"j\\0\"",
-      "action": "_AmdWmXb0g::Cga::Action::\"action\"",
-      "resource": "_AmdWmXb0g::Cga::a::\"j\\0\"",
+      "principal": {
+        "type": "_AmdWmXb0g::Cga::a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "_AmdWmXb0g::Cga::a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "_AmdWmXb0g::Cga::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/106c7942e09695b70e209e67e8df5655de990003.json b/cedar-integration-tests/corpus_tests/106c7942e09695b70e209e67e8df5655de990003.json
index bc9681556..5591755c8 100644
--- a/cedar-integration-tests/corpus_tests/106c7942e09695b70e209e67e8df5655de990003.json
+++ b/cedar-integration-tests/corpus_tests/106c7942e09695b70e209e67e8df5655de990003.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"1a\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1a\"",
+      "principal": {
+        "type": "a",
+        "id": "1a"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1a"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"1a\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1a\"",
+      "principal": {
+        "type": "a",
+        "id": "1a"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1a"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"1a\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1a\"",
+      "principal": {
+        "type": "a",
+        "id": "1a"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1a"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"1a\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1a\"",
+      "principal": {
+        "type": "a",
+        "id": "1a"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1a"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"1a\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1a\"",
+      "principal": {
+        "type": "a",
+        "id": "1a"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1a"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"1a\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1a\"",
+      "principal": {
+        "type": "a",
+        "id": "1a"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1a"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"1a\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1a\"",
+      "principal": {
+        "type": "a",
+        "id": "1a"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1a"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"1a\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1a\"",
+      "principal": {
+        "type": "a",
+        "id": "1a"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1a"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/107926a401aafb1e4f5723ba817fd79792b4541b.json b/cedar-integration-tests/corpus_tests/107926a401aafb1e4f5723ba817fd79792b4541b.json
index f2f467567..1e2f9bd35 100644
--- a/cedar-integration-tests/corpus_tests/107926a401aafb1e4f5723ba817fd79792b4541b.json
+++ b/cedar-integration-tests/corpus_tests/107926a401aafb1e4f5723ba817fd79792b4541b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/10abaa21f1aaa8c1d6de2c2ae846a2ba15d9f84f.json b/cedar-integration-tests/corpus_tests/10abaa21f1aaa8c1d6de2c2ae846a2ba15d9f84f.json
index 1115680ff..193468d71 100644
--- a/cedar-integration-tests/corpus_tests/10abaa21f1aaa8c1d6de2c2ae846a2ba15d9f84f.json
+++ b/cedar-integration-tests/corpus_tests/10abaa21f1aaa8c1d6de2c2ae846a2ba15d9f84f.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"F\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "F"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"F\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "F"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"F\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "F"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"F\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "F"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"F\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "F"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"F\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "F"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"F\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "F"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"F\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "F"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/10aea06c714dbebcb199fd92684892b0df616040.json b/cedar-integration-tests/corpus_tests/10aea06c714dbebcb199fd92684892b0df616040.json
index d9080316c..5c3cc3ef3 100644
--- a/cedar-integration-tests/corpus_tests/10aea06c714dbebcb199fd92684892b0df616040.json
+++ b/cedar-integration-tests/corpus_tests/10aea06c714dbebcb199fd92684892b0df616040.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/10bda01fb6c34dcedb5838eec5c05901d946b6a8.json b/cedar-integration-tests/corpus_tests/10bda01fb6c34dcedb5838eec5c05901d946b6a8.json
index baf940bf9..3c4e4a628 100644
--- a/cedar-integration-tests/corpus_tests/10bda01fb6c34dcedb5838eec5c05901d946b6a8.json
+++ b/cedar-integration-tests/corpus_tests/10bda01fb6c34dcedb5838eec5c05901d946b6a8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\n\\0\\0\\0\\0\\0\\0\\0ffffffbffff*f*\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\0\\0\\0\\0\\0\\0\\0ffffffbffff*f*\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0000\u0000\u0000\u0000\u0000\u0000\u0000ffffffbffff*f*\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0000\u0000\u0000\u0000\u0000\u0000\u0000ffffffbffff*f*\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\n\\0\\0\\0\\0\\0\\0\\0ffffffbffff*f*\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\0\\0\\0\\0\\0\\0\\0ffffffbffff*f*\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0000\u0000\u0000\u0000\u0000\u0000\u0000ffffffbffff*f*\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0000\u0000\u0000\u0000\u0000\u0000\u0000ffffffbffff*f*\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\n\\0\\0\\0\\0\\0\\0\\0ffffffbffff*f*\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\0\\0\\0\\0\\0\\0\\0ffffffbffff*f*\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0000\u0000\u0000\u0000\u0000\u0000\u0000ffffffbffff*f*\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0000\u0000\u0000\u0000\u0000\u0000\u0000ffffffbffff*f*\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\n\\0\\0\\0\\0\\0\\0\\0ffffffbffff*f*\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\0\\0\\0\\0\\0\\0\\0ffffffbffff*f*\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0000\u0000\u0000\u0000\u0000\u0000\u0000ffffffbffff*f*\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0000\u0000\u0000\u0000\u0000\u0000\u0000ffffffbffff*f*\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\n\\0\\0\\0\\0\\0\\0\\0ffffffbffff*f*\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\0\\0\\0\\0\\0\\0\\0ffffffbffff*f*\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0000\u0000\u0000\u0000\u0000\u0000\u0000ffffffbffff*f*\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0000\u0000\u0000\u0000\u0000\u0000\u0000ffffffbffff*f*\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\n\\0\\0\\0\\0\\0\\0\\0ffffffbffff*f*\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\0\\0\\0\\0\\0\\0\\0ffffffbffff*f*\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0000\u0000\u0000\u0000\u0000\u0000\u0000ffffffbffff*f*\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0000\u0000\u0000\u0000\u0000\u0000\u0000ffffffbffff*f*\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\n\\0\\0\\0\\0\\0\\0\\0ffffffbffff*f*\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\0\\0\\0\\0\\0\\0\\0ffffffbffff*f*\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0000\u0000\u0000\u0000\u0000\u0000\u0000ffffffbffff*f*\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0000\u0000\u0000\u0000\u0000\u0000\u0000ffffffbffff*f*\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\n\\0\\0\\0\\0\\0\\0\\0ffffffbffff*f*\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\0\\0\\0\\0\\0\\0\\0ffffffbffff*f*\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0000\u0000\u0000\u0000\u0000\u0000\u0000ffffffbffff*f*\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0000\u0000\u0000\u0000\u0000\u0000\u0000ffffffbffff*f*\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/10df7c4afef4ace6a940adb20431810eb5925195.json b/cedar-integration-tests/corpus_tests/10df7c4afef4ace6a940adb20431810eb5925195.json
index 62cc76156..207c483bc 100644
--- a/cedar-integration-tests/corpus_tests/10df7c4afef4ace6a940adb20431810eb5925195.json
+++ b/cedar-integration-tests/corpus_tests/10df7c4afef4ace6a940adb20431810eb5925195.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/10fcd998b35b276ab130e82d0b618ed9ee17c343.json b/cedar-integration-tests/corpus_tests/10fcd998b35b276ab130e82d0b618ed9ee17c343.json
index 18cb05524..7d6afab44 100644
--- a/cedar-integration-tests/corpus_tests/10fcd998b35b276ab130e82d0b618ed9ee17c343.json
+++ b/cedar-integration-tests/corpus_tests/10fcd998b35b276ab130e82d0b618ed9ee17c343.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"%\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "%"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"%\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "%"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1122b4b025e0ef19724f6d8589d0786227300bb0.json b/cedar-integration-tests/corpus_tests/1122b4b025e0ef19724f6d8589d0786227300bb0.json
index a7964bb5e..2e39115fd 100644
--- a/cedar-integration-tests/corpus_tests/1122b4b025e0ef19724f6d8589d0786227300bb0.json
+++ b/cedar-integration-tests/corpus_tests/1122b4b025e0ef19724f6d8589d0786227300bb0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/114e1eaad04a5af7eef1d9a6f9052cbb6cc0c438.json b/cedar-integration-tests/corpus_tests/114e1eaad04a5af7eef1d9a6f9052cbb6cc0c438.json
index c72f63674..e1260d429 100644
--- a/cedar-integration-tests/corpus_tests/114e1eaad04a5af7eef1d9a6f9052cbb6cc0c438.json
+++ b/cedar-integration-tests/corpus_tests/114e1eaad04a5af7eef1d9a6f9052cbb6cc0c438.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/119060b4ffba618daf4f70e4a718653493f1b3d9.json b/cedar-integration-tests/corpus_tests/119060b4ffba618daf4f70e4a718653493f1b3d9.json
index 232cb9f5d..1636e427b 100644
--- a/cedar-integration-tests/corpus_tests/119060b4ffba618daf4f70e4a718653493f1b3d9.json
+++ b/cedar-integration-tests/corpus_tests/119060b4ffba618daf4f70e4a718653493f1b3d9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/11e63c6e406ca8e5bd9d4957af1c32cb531a23e6.json b/cedar-integration-tests/corpus_tests/11e63c6e406ca8e5bd9d4957af1c32cb531a23e6.json
index d4b7a2389..086562c50 100644
--- a/cedar-integration-tests/corpus_tests/11e63c6e406ca8e5bd9d4957af1c32cb531a23e6.json
+++ b/cedar-integration-tests/corpus_tests/11e63c6e406ca8e5bd9d4957af1c32cb531a23e6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\"",
+      "principal": {
+        "type": "a",
+        "id": "`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/11e9832d6fe60145fb72dd1421e11f29c6b8b666.json b/cedar-integration-tests/corpus_tests/11e9832d6fe60145fb72dd1421e11f29c6b8b666.json
index aa8eda78a..410e9bf41 100644
--- a/cedar-integration-tests/corpus_tests/11e9832d6fe60145fb72dd1421e11f29c6b8b666.json
+++ b/cedar-integration-tests/corpus_tests/11e9832d6fe60145fb72dd1421e11f29c6b8b666.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\0\\0\\0\\0\\\\\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\\0\\0\\0\\\\\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000\u0000\u0000\u0000\\\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000\u0000\u0000\u0000\\\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\0\\0\\0\\0\\\\\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\\0\\0\\0\\\\\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000\u0000\u0000\u0000\\\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000\u0000\u0000\u0000\\\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\0\\0\\0\\0\\\\\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\\0\\0\\0\\\\\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000\u0000\u0000\u0000\\\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000\u0000\u0000\u0000\\\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\0\\0\\0\\0\\\\\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\\0\\0\\0\\\\\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000\u0000\u0000\u0000\\\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000\u0000\u0000\u0000\\\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\0\\0\\0\\0\\\\\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\\0\\0\\0\\\\\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000\u0000\u0000\u0000\\\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000\u0000\u0000\u0000\\\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\0\\0\\0\\0\\\\\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\\0\\0\\0\\\\\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000\u0000\u0000\u0000\\\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000\u0000\u0000\u0000\\\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\0\\0\\0\\0\\\\\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\\0\\0\\0\\\\\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000\u0000\u0000\u0000\\\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000\u0000\u0000\u0000\\\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\0\\0\\0\\0\\\\\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\\0\\0\\0\\\\\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000\u0000\u0000\u0000\\\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000\u0000\u0000\u0000\\\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1254cf8b49a82bad491ded018f8acb6aaa8005dc.json b/cedar-integration-tests/corpus_tests/1254cf8b49a82bad491ded018f8acb6aaa8005dc.json
index 043b71be8..8a90ba7d1 100644
--- a/cedar-integration-tests/corpus_tests/1254cf8b49a82bad491ded018f8acb6aaa8005dc.json
+++ b/cedar-integration-tests/corpus_tests/1254cf8b49a82bad491ded018f8acb6aaa8005dc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"Perf_registerNarf_registerNatives\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "Perf_registerNarf_registerNatives"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"Perf_registerNarf_registerNatives\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "Perf_registerNarf_registerNatives"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"Perf_registerNarf_registerNatives\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "Perf_registerNarf_registerNatives"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"Perf_registerNarf_registerNatives\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "Perf_registerNarf_registerNatives"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"Perf_registerNarf_registerNatives\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "Perf_registerNarf_registerNatives"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"Perf_registerNarf_registerNatives\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "Perf_registerNarf_registerNatives"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"Perf_registerNarf_registerNatives\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "Perf_registerNarf_registerNatives"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"Perf_registerNarf_registerNatives\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "Perf_registerNarf_registerNatives"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/127182b2ecd666d9f19c637648c660463069f3b1.json b/cedar-integration-tests/corpus_tests/127182b2ecd666d9f19c637648c660463069f3b1.json
index ef3291e15..7e210586a 100644
--- a/cedar-integration-tests/corpus_tests/127182b2ecd666d9f19c637648c660463069f3b1.json
+++ b/cedar-integration-tests/corpus_tests/127182b2ecd666d9f19c637648c660463069f3b1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1279c78d7129da3081c0e775922e200814aec43c.json b/cedar-integration-tests/corpus_tests/1279c78d7129da3081c0e775922e200814aec43c.json
index 58809e197..0adea27b3 100644
--- a/cedar-integration-tests/corpus_tests/1279c78d7129da3081c0e775922e200814aec43c.json
+++ b/cedar-integration-tests/corpus_tests/1279c78d7129da3081c0e775922e200814aec43c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "W::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "W",
+        "id": ""
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "W::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "W",
+        "id": ""
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "W::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "W",
+        "id": ""
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "W::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "W",
+        "id": ""
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "W::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "W",
+        "id": ""
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "W::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "W",
+        "id": ""
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "W::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "W",
+        "id": ""
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "W::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "W",
+        "id": ""
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/12ea8d3f2768e2d6b9418905be71bb2b90b893db.json b/cedar-integration-tests/corpus_tests/12ea8d3f2768e2d6b9418905be71bb2b90b893db.json
index 0c27060d8..841cdc490 100644
--- a/cedar-integration-tests/corpus_tests/12ea8d3f2768e2d6b9418905be71bb2b90b893db.json
+++ b/cedar-integration-tests/corpus_tests/12ea8d3f2768e2d6b9418905be71bb2b90b893db.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{1}\\u{1e}7\\u{1}*\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\\u{1e}7\\u{1}*\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001\u001e7\u0001*\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001\u001e7\u0001*\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{1}\\u{1e}7\\u{1}*\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\\u{1e}7\\u{1}*\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001\u001e7\u0001*\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001\u001e7\u0001*\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{1}\\u{1e}7\\u{1}*\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\\u{1e}7\\u{1}*\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001\u001e7\u0001*\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001\u001e7\u0001*\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{1}\\u{1e}7\\u{1}*\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\\u{1e}7\\u{1}*\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001\u001e7\u0001*\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001\u001e7\u0001*\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{1}\\u{1e}7\\u{1}*\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\\u{1e}7\\u{1}*\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001\u001e7\u0001*\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001\u001e7\u0001*\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{1}\\u{1e}7\\u{1}*\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\\u{1e}7\\u{1}*\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001\u001e7\u0001*\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001\u001e7\u0001*\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{1}\\u{1e}7\\u{1}*\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\\u{1e}7\\u{1}*\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001\u001e7\u0001*\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001\u001e7\u0001*\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{1}\\u{1e}7\\u{1}*\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\\u{1e}7\\u{1}*\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001\u001e7\u0001*\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001\u001e7\u0001*\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1302345b4a58a174e8bcc73f4426d04432a46493.json b/cedar-integration-tests/corpus_tests/1302345b4a58a174e8bcc73f4426d04432a46493.json
index e581ceef2..879eecef8 100644
--- a/cedar-integration-tests/corpus_tests/1302345b4a58a174e8bcc73f4426d04432a46493.json
+++ b/cedar-integration-tests/corpus_tests/1302345b4a58a174e8bcc73f4426d04432a46493.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/13080c2b5bf30ca368724495c797a520d073aa45.json b/cedar-integration-tests/corpus_tests/13080c2b5bf30ca368724495c797a520d073aa45.json
index 7821c68a4..5f903bf7e 100644
--- a/cedar-integration-tests/corpus_tests/13080c2b5bf30ca368724495c797a520d073aa45.json
+++ b/cedar-integration-tests/corpus_tests/13080c2b5bf30ca368724495c797a520d073aa45.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/13478b9a425393db10ad8b788501d61f44fdba5b.json b/cedar-integration-tests/corpus_tests/13478b9a425393db10ad8b788501d61f44fdba5b.json
index db889e08c..dc42559b1 100644
--- a/cedar-integration-tests/corpus_tests/13478b9a425393db10ad8b788501d61f44fdba5b.json
+++ b/cedar-integration-tests/corpus_tests/13478b9a425393db10ad8b788501d61f44fdba5b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "l0wwwXb0wwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "umkldY::\"\"",
+      "principal": {
+        "type": "l0wwwXb0wwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "umkldY",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "l0wwwXb0wwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "umkldY::\"\"",
+      "principal": {
+        "type": "l0wwwXb0wwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "umkldY",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "l0wwwXb0wwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "umkldY::\"\"",
+      "principal": {
+        "type": "l0wwwXb0wwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "umkldY",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "l0wwwXb0wwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "umkldY::\"\"",
+      "principal": {
+        "type": "l0wwwXb0wwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "umkldY",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "l0wwwXb0wwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "umkldY::\"\"",
+      "principal": {
+        "type": "l0wwwXb0wwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "umkldY",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "l0wwwXb0wwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "umkldY::\"\"",
+      "principal": {
+        "type": "l0wwwXb0wwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "umkldY",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "l0wwwXb0wwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "umkldY::\"\"",
+      "principal": {
+        "type": "l0wwwXb0wwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "umkldY",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "l0wwwXb0wwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "umkldY::\"\"",
+      "principal": {
+        "type": "l0wwwXb0wwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "umkldY",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/138f76b366b2306738303807e1936a89f7f2762b.json b/cedar-integration-tests/corpus_tests/138f76b366b2306738303807e1936a89f7f2762b.json
index 7030edba5..903725d34 100644
--- a/cedar-integration-tests/corpus_tests/138f76b366b2306738303807e1936a89f7f2762b.json
+++ b/cedar-integration-tests/corpus_tests/138f76b366b2306738303807e1936a89f7f2762b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A000::a::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::a::\"\"",
+      "principal": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A000::a::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::a::\"\"",
+      "principal": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A000::a::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::a::\"\"",
+      "principal": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A000::a::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::a::\"\"",
+      "principal": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A000::a::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::a::\"\"",
+      "principal": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A000::a::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::a::\"\"",
+      "principal": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A000::a::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::a::\"\"",
+      "principal": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A000::a::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::a::\"\"",
+      "principal": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1394e48d6330fa784673907ee1460d41a4e2659b.json b/cedar-integration-tests/corpus_tests/1394e48d6330fa784673907ee1460d41a4e2659b.json
index 4da8b0123..640203ad4 100644
--- a/cedar-integration-tests/corpus_tests/1394e48d6330fa784673907ee1460d41a4e2659b.json
+++ b/cedar-integration-tests/corpus_tests/1394e48d6330fa784673907ee1460d41a4e2659b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A97w::a::\"#:::\"",
-      "action": "A97w::Action::\"action\"",
-      "resource": "A97w::a::\"#:::\"",
+      "principal": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "resource": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "action": {
+        "type": "A97w::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A97w::a::\"#:::\"",
-      "action": "A97w::Action::\"action\"",
-      "resource": "A97w::a::\"#:::\"",
+      "principal": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "resource": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "action": {
+        "type": "A97w::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A97w::a::\"#:::\"",
-      "action": "A97w::Action::\"action\"",
-      "resource": "A97w::a::\"#:::\"",
+      "principal": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "resource": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "action": {
+        "type": "A97w::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A97w::a::\"#:::\"",
-      "action": "A97w::Action::\"action\"",
-      "resource": "A97w::a::\"#:::\"",
+      "principal": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "resource": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "action": {
+        "type": "A97w::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A97w::a::\"#:::\"",
-      "action": "A97w::Action::\"action\"",
-      "resource": "A97w::a::\"#:::\"",
+      "principal": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "resource": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "action": {
+        "type": "A97w::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A97w::a::\"#:::\"",
-      "action": "A97w::Action::\"action\"",
-      "resource": "A97w::a::\"#:::\"",
+      "principal": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "resource": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "action": {
+        "type": "A97w::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A97w::a::\"#:::\"",
-      "action": "A97w::Action::\"action\"",
-      "resource": "A97w::a::\"#:::\"",
+      "principal": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "resource": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "action": {
+        "type": "A97w::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A97w::a::\"#:::\"",
-      "action": "A97w::Action::\"action\"",
-      "resource": "A97w::a::\"#:::\"",
+      "principal": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "resource": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "action": {
+        "type": "A97w::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/13c95d614c44c554c6f335fd59c6e95cbd0ad9cc.json b/cedar-integration-tests/corpus_tests/13c95d614c44c554c6f335fd59c6e95cbd0ad9cc.json
index 63e3c7d03..3d73d6af6 100644
--- a/cedar-integration-tests/corpus_tests/13c95d614c44c554c6f335fd59c6e95cbd0ad9cc.json
+++ b/cedar-integration-tests/corpus_tests/13c95d614c44c554c6f335fd59c6e95cbd0ad9cc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/141462189bb7ca5db202dc588306cc7785334710.json b/cedar-integration-tests/corpus_tests/141462189bb7ca5db202dc588306cc7785334710.json
index 9760913a5..50c1da8da 100644
--- a/cedar-integration-tests/corpus_tests/141462189bb7ca5db202dc588306cc7785334710.json
+++ b/cedar-integration-tests/corpus_tests/141462189bb7ca5db202dc588306cc7785334710.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"j$\\0\\0#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "j$\u0000\u0000#"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"j$\\0\\0#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "j$\u0000\u0000#"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1428be36f22253120a30e9f784383e2be0b005e1.json b/cedar-integration-tests/corpus_tests/1428be36f22253120a30e9f784383e2be0b005e1.json
index 0681554fd..08f4d676e 100644
--- a/cedar-integration-tests/corpus_tests/1428be36f22253120a30e9f784383e2be0b005e1.json
+++ b/cedar-integration-tests/corpus_tests/1428be36f22253120a30e9f784383e2be0b005e1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "G::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"::\"",
+      "principal": {
+        "type": "G",
+        "id": "::"
+      },
+      "resource": {
+        "type": "G",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "G::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"::\"",
+      "principal": {
+        "type": "G",
+        "id": "::"
+      },
+      "resource": {
+        "type": "G",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "G::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"::\"",
+      "principal": {
+        "type": "G",
+        "id": "::"
+      },
+      "resource": {
+        "type": "G",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "G::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"::\"",
+      "principal": {
+        "type": "G",
+        "id": "::"
+      },
+      "resource": {
+        "type": "G",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "G::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"::\"",
+      "principal": {
+        "type": "G",
+        "id": "::"
+      },
+      "resource": {
+        "type": "G",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "G::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"::\"",
+      "principal": {
+        "type": "G",
+        "id": "::"
+      },
+      "resource": {
+        "type": "G",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "G::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"::\"",
+      "principal": {
+        "type": "G",
+        "id": "::"
+      },
+      "resource": {
+        "type": "G",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "G::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"::\"",
+      "principal": {
+        "type": "G",
+        "id": "::"
+      },
+      "resource": {
+        "type": "G",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/14b065cf3741fb0c5e55a960037b1a499946d27e.json b/cedar-integration-tests/corpus_tests/14b065cf3741fb0c5e55a960037b1a499946d27e.json
index 083327fef..c74ea5d97 100644
--- a/cedar-integration-tests/corpus_tests/14b065cf3741fb0c5e55a960037b1a499946d27e.json
+++ b/cedar-integration-tests/corpus_tests/14b065cf3741fb0c5e55a960037b1a499946d27e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "wn::\"r0\\nz+\\0\\0\\00z!zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "wn::\"r0\\nz+\\0\\0\\00z!zzz\"",
+      "principal": {
+        "type": "wn",
+        "id": "r0\nz+\u0000\u0000\u00000z!zzz"
+      },
+      "resource": {
+        "type": "wn",
+        "id": "r0\nz+\u0000\u0000\u00000z!zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "wn::\"r0\\nz+\\0\\0\\00z!zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "wn::\"r0\\nz+\\0\\0\\00z!zzz\"",
+      "principal": {
+        "type": "wn",
+        "id": "r0\nz+\u0000\u0000\u00000z!zzz"
+      },
+      "resource": {
+        "type": "wn",
+        "id": "r0\nz+\u0000\u0000\u00000z!zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "wn::\"r0\\nz+\\0\\0\\00z!zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "wn::\"r0\\nz+\\0\\0\\00z!zzz\"",
+      "principal": {
+        "type": "wn",
+        "id": "r0\nz+\u0000\u0000\u00000z!zzz"
+      },
+      "resource": {
+        "type": "wn",
+        "id": "r0\nz+\u0000\u0000\u00000z!zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "wn::\"r0\\nz+\\0\\0\\00z!zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "wn::\"r0\\nz+\\0\\0\\00z!zzz\"",
+      "principal": {
+        "type": "wn",
+        "id": "r0\nz+\u0000\u0000\u00000z!zzz"
+      },
+      "resource": {
+        "type": "wn",
+        "id": "r0\nz+\u0000\u0000\u00000z!zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "wn::\"r0\\nz+\\0\\0\\00z!zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "wn::\"r0\\nz+\\0\\0\\00z!zzz\"",
+      "principal": {
+        "type": "wn",
+        "id": "r0\nz+\u0000\u0000\u00000z!zzz"
+      },
+      "resource": {
+        "type": "wn",
+        "id": "r0\nz+\u0000\u0000\u00000z!zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "wn::\"r0\\nz+\\0\\0\\00z!zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "wn::\"r0\\nz+\\0\\0\\00z!zzz\"",
+      "principal": {
+        "type": "wn",
+        "id": "r0\nz+\u0000\u0000\u00000z!zzz"
+      },
+      "resource": {
+        "type": "wn",
+        "id": "r0\nz+\u0000\u0000\u00000z!zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "wn::\"r0\\nz+\\0\\0\\00z!zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "wn::\"r0\\nz+\\0\\0\\00z!zzz\"",
+      "principal": {
+        "type": "wn",
+        "id": "r0\nz+\u0000\u0000\u00000z!zzz"
+      },
+      "resource": {
+        "type": "wn",
+        "id": "r0\nz+\u0000\u0000\u00000z!zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "wn::\"r0\\nz+\\0\\0\\00z!zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "wn::\"r0\\nz+\\0\\0\\00z!zzz\"",
+      "principal": {
+        "type": "wn",
+        "id": "r0\nz+\u0000\u0000\u00000z!zzz"
+      },
+      "resource": {
+        "type": "wn",
+        "id": "r0\nz+\u0000\u0000\u00000z!zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/14b98c1a51be833bbaf6cb341851e2ff30a8223b.json b/cedar-integration-tests/corpus_tests/14b98c1a51be833bbaf6cb341851e2ff30a8223b.json
index b088c889c..d928ba299 100644
--- a/cedar-integration-tests/corpus_tests/14b98c1a51be833bbaf6cb341851e2ff30a8223b.json
+++ b/cedar-integration-tests/corpus_tests/14b98c1a51be833bbaf6cb341851e2ff30a8223b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/14baa465818b2da2f72d88d491dbbb20d0fe58bb.json b/cedar-integration-tests/corpus_tests/14baa465818b2da2f72d88d491dbbb20d0fe58bb.json
index 59c401bb5..849d77709 100644
--- a/cedar-integration-tests/corpus_tests/14baa465818b2da2f72d88d491dbbb20d0fe58bb.json
+++ b/cedar-integration-tests/corpus_tests/14baa465818b2da2f72d88d491dbbb20d0fe58bb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/14c24424e78073eb033bd799898f71cd5d022b0d.json b/cedar-integration-tests/corpus_tests/14c24424e78073eb033bd799898f71cd5d022b0d.json
index 0f8f4699c..325d38d55 100644
--- a/cedar-integration-tests/corpus_tests/14c24424e78073eb033bd799898f71cd5d022b0d.json
+++ b/cedar-integration-tests/corpus_tests/14c24424e78073eb033bd799898f71cd5d022b0d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/14e83b8120617ff2c6781d31c8c787af29d10bd7.json b/cedar-integration-tests/corpus_tests/14e83b8120617ff2c6781d31c8c787af29d10bd7.json
index c051b5bbc..51b0900a7 100644
--- a/cedar-integration-tests/corpus_tests/14e83b8120617ff2c6781d31c8c787af29d10bd7.json
+++ b/cedar-integration-tests/corpus_tests/14e83b8120617ff2c6781d31c8c787af29d10bd7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "y::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "y::\"0\"",
+      "principal": {
+        "type": "y",
+        "id": "0"
+      },
+      "resource": {
+        "type": "y",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "y::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "y::\"0\"",
+      "principal": {
+        "type": "y",
+        "id": ""
+      },
+      "resource": {
+        "type": "y",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "y::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "y::\"0\"",
+      "principal": {
+        "type": "y",
+        "id": "0"
+      },
+      "resource": {
+        "type": "y",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "y::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "y::\"0\"",
+      "principal": {
+        "type": "y",
+        "id": "0"
+      },
+      "resource": {
+        "type": "y",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "y::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "y::\"0\"",
+      "principal": {
+        "type": "y",
+        "id": "0"
+      },
+      "resource": {
+        "type": "y",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "y::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "y::\"0\"",
+      "principal": {
+        "type": "y",
+        "id": "0"
+      },
+      "resource": {
+        "type": "y",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "y::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "y::\"0\"",
+      "principal": {
+        "type": "y",
+        "id": "0"
+      },
+      "resource": {
+        "type": "y",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "y::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "y::\"0\"",
+      "principal": {
+        "type": "y",
+        "id": "0"
+      },
+      "resource": {
+        "type": "y",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1508db927ec3f39159de65acbdf453fc0a2310b5.json b/cedar-integration-tests/corpus_tests/1508db927ec3f39159de65acbdf453fc0a2310b5.json
index e1ab9552a..25514d3ff 100644
--- a/cedar-integration-tests/corpus_tests/1508db927ec3f39159de65acbdf453fc0a2310b5.json
+++ b/cedar-integration-tests/corpus_tests/1508db927ec3f39159de65acbdf453fc0a2310b5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/152fbf832dfe0294b580b983ca1aecaa0ab3249f.json b/cedar-integration-tests/corpus_tests/152fbf832dfe0294b580b983ca1aecaa0ab3249f.json
index c2310b852..ce81048f8 100644
--- a/cedar-integration-tests/corpus_tests/152fbf832dfe0294b580b983ca1aecaa0ab3249f.json
+++ b/cedar-integration-tests/corpus_tests/152fbf832dfe0294b580b983ca1aecaa0ab3249f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ݭ\\u{17}\\u{17}\\u{17}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ݭ\\u{17}\\u{17}\\u{17}\"",
+      "principal": {
+        "type": "a",
+        "id": "ݭ\u0017\u0017\u0017"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ݭ\u0017\u0017\u0017"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ݭ\\u{17}\\u{17}\\u{17}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "ݭ\u0017\u0017\u0017"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"ݭ\\u{17}\\u{17}\\u{17}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ݭ\\u{17}\\u{17}\\u{17}\"",
+      "principal": {
+        "type": "a",
+        "id": "ݭ\u0017\u0017\u0017"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ݭ\u0017\u0017\u0017"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ݭ\\u{17}\\u{17}\\u{17}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ݭ\\u{17}\\u{17}\\u{17}\"",
+      "principal": {
+        "type": "a",
+        "id": "ݭ\u0017\u0017\u0017"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ݭ\u0017\u0017\u0017"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ݭ\\u{17}\\u{17}\\u{17}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ݭ\\u{17}\\u{17}\\u{17}\"",
+      "principal": {
+        "type": "a",
+        "id": "ݭ\u0017\u0017\u0017"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ݭ\u0017\u0017\u0017"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ݭ\\u{17}\\u{17}\\u{17}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ݭ\\u{17}\\u{17}\\u{17}\"",
+      "principal": {
+        "type": "a",
+        "id": "ݭ\u0017\u0017\u0017"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ݭ\u0017\u0017\u0017"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ݭ\\u{17}\\u{17}\\u{17}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ݭ\\u{17}\\u{17}\\u{17}\"",
+      "principal": {
+        "type": "a",
+        "id": "ݭ\u0017\u0017\u0017"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ݭ\u0017\u0017\u0017"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ݭ\\u{17}\\u{17}\\u{17}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ݭ\\u{17}\\u{17}\\u{17}\"",
+      "principal": {
+        "type": "a",
+        "id": "ݭ\u0017\u0017\u0017"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ݭ\u0017\u0017\u0017"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/15343f50af0a75480ffdaceaf71b379e1d66df18.json b/cedar-integration-tests/corpus_tests/15343f50af0a75480ffdaceaf71b379e1d66df18.json
index c7798971e..0a7e8d26b 100644
--- a/cedar-integration-tests/corpus_tests/15343f50af0a75480ffdaceaf71b379e1d66df18.json
+++ b/cedar-integration-tests/corpus_tests/15343f50af0a75480ffdaceaf71b379e1d66df18.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/15563f0ff844401488c49316ba8cb82f870c3caa.json b/cedar-integration-tests/corpus_tests/15563f0ff844401488c49316ba8cb82f870c3caa.json
index 74959bf63..f95d7f494 100644
--- a/cedar-integration-tests/corpus_tests/15563f0ff844401488c49316ba8cb82f870c3caa.json
+++ b/cedar-integration-tests/corpus_tests/15563f0ff844401488c49316ba8cb82f870c3caa.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/155fc431b6957914aa4b850fb121510f470d316f.json b/cedar-integration-tests/corpus_tests/155fc431b6957914aa4b850fb121510f470d316f.json
index 1e70880a3..06fdb7386 100644
--- a/cedar-integration-tests/corpus_tests/155fc431b6957914aa4b850fb121510f470d316f.json
+++ b/cedar-integration-tests/corpus_tests/155fc431b6957914aa4b850fb121510f470d316f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0%\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000%\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1571103f55b41633bd2465963f25a783b98d46ac.json b/cedar-integration-tests/corpus_tests/1571103f55b41633bd2465963f25a783b98d46ac.json
index dc63dd1e9..ec298265f 100644
--- a/cedar-integration-tests/corpus_tests/1571103f55b41633bd2465963f25a783b98d46ac.json
+++ b/cedar-integration-tests/corpus_tests/1571103f55b41633bd2465963f25a783b98d46ac.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/159538477382f362742140e665a05a6e99bd8191.json b/cedar-integration-tests/corpus_tests/159538477382f362742140e665a05a6e99bd8191.json
index cd16f372a..dea91b44e 100644
--- a/cedar-integration-tests/corpus_tests/159538477382f362742140e665a05a6e99bd8191.json
+++ b/cedar-integration-tests/corpus_tests/159538477382f362742140e665a05a6e99bd8191.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/15a5e61ef680e881f21af3c89ace6b019ec4f78b.json b/cedar-integration-tests/corpus_tests/15a5e61ef680e881f21af3c89ace6b019ec4f78b.json
index 5be43cb32..d4a5f2f4b 100644
--- a/cedar-integration-tests/corpus_tests/15a5e61ef680e881f21af3c89ace6b019ec4f78b.json
+++ b/cedar-integration-tests/corpus_tests/15a5e61ef680e881f21af3c89ace6b019ec4f78b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/15d41567b88033bb0775f7ad9bdef157ce618cd9.json b/cedar-integration-tests/corpus_tests/15d41567b88033bb0775f7ad9bdef157ce618cd9.json
index ab2c6fe39..e2a7b8284 100644
--- a/cedar-integration-tests/corpus_tests/15d41567b88033bb0775f7ad9bdef157ce618cd9.json
+++ b/cedar-integration-tests/corpus_tests/15d41567b88033bb0775f7ad9bdef157ce618cd9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Kfhhhhh::\"...\\u{13}\\u{10}\\0\\u{2}\"",
-      "action": "Action::\".\"",
-      "resource": "Kfhhhhh::\"...\\u{13}\\u{10}\\0\\u{2}\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...\u0013\u0010\u0000\u0002"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...\u0013\u0010\u0000\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Kfhhhhh::\"...\\u{13}\\u{10}\\0\\u{2}\"",
-      "action": "Action::\".\"",
-      "resource": "Kfhhhhh::\"...\\u{13}\\u{10}\\0\\u{2}\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...\u0013\u0010\u0000\u0002"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...\u0013\u0010\u0000\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Kfhhhhh::\"...\\u{13}\\u{10}\\0\\u{2}\"",
-      "action": "Action::\".\"",
-      "resource": "Kfhhhhh::\"...\\u{13}\\u{10}\\0\\u{2}\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...\u0013\u0010\u0000\u0002"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...\u0013\u0010\u0000\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Kfhhhhh::\"...\\u{13}\\u{10}\\0\\u{2}\"",
-      "action": "Action::\".\"",
-      "resource": "Kfhhhhh::\"...\\u{13}\\u{10}\\0\\u{2}\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...\u0013\u0010\u0000\u0002"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...\u0013\u0010\u0000\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Kfhhhhh::\"...\\u{13}\\u{10}\\0\\u{2}\"",
-      "action": "Action::\".\"",
-      "resource": "Kfhhhhh::\"...\\u{13}\\u{10}\\0\\u{2}\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...\u0013\u0010\u0000\u0002"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...\u0013\u0010\u0000\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Kfhhhhh::\"...\\u{13}\\u{10}\\0\\u{2}\"",
-      "action": "Action::\".\"",
-      "resource": "Kfhhhhh::\"...\\u{13}\\u{10}\\0\\u{2}\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...\u0013\u0010\u0000\u0002"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...\u0013\u0010\u0000\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Kfhhhhh::\"...\\u{13}\\u{10}\\0\\u{2}\"",
-      "action": "Action::\".\"",
-      "resource": "Kfhhhhh::\"...\\u{13}\\u{10}\\0\\u{2}\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...\u0013\u0010\u0000\u0002"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...\u0013\u0010\u0000\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Kfhhhhh::\"...\\u{13}\\u{10}\\0\\u{2}\"",
-      "action": "Action::\".\"",
-      "resource": "Kfhhhhh::\"...\\u{13}\\u{10}\\0\\u{2}\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...\u0013\u0010\u0000\u0002"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...\u0013\u0010\u0000\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/15d7c637ecffec277a3c3e60acb3ef3df4d6c508.json b/cedar-integration-tests/corpus_tests/15d7c637ecffec277a3c3e60acb3ef3df4d6c508.json
index 0efb03de2..3d7a6375d 100644
--- a/cedar-integration-tests/corpus_tests/15d7c637ecffec277a3c3e60acb3ef3df4d6c508.json
+++ b/cedar-integration-tests/corpus_tests/15d7c637ecffec277a3c3e60acb3ef3df4d6c508.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Kfhhhhh::\"...&\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"...&\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...&"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Kfhhhhh::\"...&\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"...&\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...&"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Kfhhhhh::\"...&\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"...&\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...&"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Kfhhhhh::\"...&\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"...&\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...&"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Kfhhhhh::\"...&\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"...&\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...&"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Kfhhhhh::\"...&\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"...&\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...&"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Kfhhhhh::\"...&\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"...&\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...&"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Kfhhhhh::\"...&\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"...&\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...&"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/15ed02adbd72854bf697fbfac04efd194b01775f.json b/cedar-integration-tests/corpus_tests/15ed02adbd72854bf697fbfac04efd194b01775f.json
index dd384a565..85c90f826 100644
--- a/cedar-integration-tests/corpus_tests/15ed02adbd72854bf697fbfac04efd194b01775f.json
+++ b/cedar-integration-tests/corpus_tests/15ed02adbd72854bf697fbfac04efd194b01775f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{2}\\\"0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\"0"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\\"0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{2}\\\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\"0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\"0"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\\"0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{2}\\\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\"0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\"0"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\\"0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{2}\\\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\"0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\"0"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\\"0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{2}\\\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\"0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\"0"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\\"0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{2}\\\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\"0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\"0"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\\"0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{2}\\\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\"0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\"0"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\\"0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{2}\\\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\"0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\"0"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/16124eb0d0d15e8d7322eaaa3eff361b4dbe506a.json b/cedar-integration-tests/corpus_tests/16124eb0d0d15e8d7322eaaa3eff361b4dbe506a.json
index 35085fced..a21fb1b9c 100644
--- a/cedar-integration-tests/corpus_tests/16124eb0d0d15e8d7322eaaa3eff361b4dbe506a.json
+++ b/cedar-integration-tests/corpus_tests/16124eb0d0d15e8d7322eaaa3eff361b4dbe506a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/16271aaed3d2383487a702432cab7c1dab719c80.json b/cedar-integration-tests/corpus_tests/16271aaed3d2383487a702432cab7c1dab719c80.json
index 74e341195..9106eea86 100644
--- a/cedar-integration-tests/corpus_tests/16271aaed3d2383487a702432cab7c1dab719c80.json
+++ b/cedar-integration-tests/corpus_tests/16271aaed3d2383487a702432cab7c1dab719c80.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "m8888G000m0::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "m8888G000m0::\":\"",
+      "principal": {
+        "type": "m8888G000m0",
+        "id": ":"
+      },
+      "resource": {
+        "type": "m8888G000m0",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "m8888G000m0::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "m8888G000m0::\":\"",
+      "principal": {
+        "type": "m8888G000m0",
+        "id": ":"
+      },
+      "resource": {
+        "type": "m8888G000m0",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "m8888G000m0::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "m8888G000m0::\":\"",
+      "principal": {
+        "type": "m8888G000m0",
+        "id": ":"
+      },
+      "resource": {
+        "type": "m8888G000m0",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "m8888G000m0::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "m8888G000m0::\":\"",
+      "principal": {
+        "type": "m8888G000m0",
+        "id": ":"
+      },
+      "resource": {
+        "type": "m8888G000m0",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "m8888G000m0::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "m8888G000m0::\":\"",
+      "principal": {
+        "type": "m8888G000m0",
+        "id": ":"
+      },
+      "resource": {
+        "type": "m8888G000m0",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "m8888G000m0::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "m8888G000m0::\":\"",
+      "principal": {
+        "type": "m8888G000m0",
+        "id": ":"
+      },
+      "resource": {
+        "type": "m8888G000m0",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "m8888G000m0::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "m8888G000m0::\":\"",
+      "principal": {
+        "type": "m8888G000m0",
+        "id": ":"
+      },
+      "resource": {
+        "type": "m8888G000m0",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "m8888G000m0::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "m8888G000m0::\":\"",
+      "principal": {
+        "type": "m8888G000m0",
+        "id": ":"
+      },
+      "resource": {
+        "type": "m8888G000m0",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/163083371b5763682e22beff81ec7dc11208e336.json b/cedar-integration-tests/corpus_tests/163083371b5763682e22beff81ec7dc11208e336.json
index a275afcea..d448bf5ae 100644
--- a/cedar-integration-tests/corpus_tests/163083371b5763682e22beff81ec7dc11208e336.json
+++ b/cedar-integration-tests/corpus_tests/163083371b5763682e22beff81ec7dc11208e336.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1649d084ecfec7fa9186c8d8ebfaed6f289d346f.json b/cedar-integration-tests/corpus_tests/1649d084ecfec7fa9186c8d8ebfaed6f289d346f.json
index 3e53a46b0..953f94604 100644
--- a/cedar-integration-tests/corpus_tests/1649d084ecfec7fa9186c8d8ebfaed6f289d346f.json
+++ b/cedar-integration-tests/corpus_tests/1649d084ecfec7fa9186c8d8ebfaed6f289d346f.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"sun_misc_P\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "sun_misc_P"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"sun_misc_P\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "sun_misc_P"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"sun_misc_P\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "sun_misc_P"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"sun_misc_P\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "sun_misc_P"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"sun_misc_P\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "sun_misc_P"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"sun_misc_P\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "sun_misc_P"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"sun_misc_P\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "sun_misc_P"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"sun_misc_P\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "sun_misc_P"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/167321bd733beac1a5d200b39f1b1bf3b4009275.json b/cedar-integration-tests/corpus_tests/167321bd733beac1a5d200b39f1b1bf3b4009275.json
index ca5f99b05..757f3bdbf 100644
--- a/cedar-integration-tests/corpus_tests/167321bd733beac1a5d200b39f1b1bf3b4009275.json
+++ b/cedar-integration-tests/corpus_tests/167321bd733beac1a5d200b39f1b1bf3b4009275.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "B::a::\"\"",
-      "action": "B::Action::\"f\"",
-      "resource": "B::a::\"\"",
+      "principal": {
+        "type": "B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "f"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "B::a::\"\"",
-      "action": "B::Action::\"f\"",
-      "resource": "B::a::\"\"",
+      "principal": {
+        "type": "B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "f"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "B::a::\"\"",
-      "action": "B::Action::\"f\"",
-      "resource": "B::a::\"\"",
+      "principal": {
+        "type": "B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "f"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "B::a::\"\"",
-      "action": "B::Action::\"f\"",
-      "resource": "B::a::\"\"",
+      "principal": {
+        "type": "B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "f"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "B::a::\"\"",
-      "action": "B::Action::\"f\"",
-      "resource": "B::a::\"\"",
+      "principal": {
+        "type": "B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "f"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "B::a::\"\"",
-      "action": "B::Action::\"f\"",
-      "resource": "B::a::\"\"",
+      "principal": {
+        "type": "B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "f"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "B::a::\"\"",
-      "action": "B::Action::\"f\"",
-      "resource": "B::a::\"\"",
+      "principal": {
+        "type": "B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "f"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "B::a::\"\"",
-      "action": "B::Action::\"f\"",
-      "resource": "B::a::\"\"",
+      "principal": {
+        "type": "B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "f"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/167da68a1884c31cd8bfdd2e7a2ac5e9a3ddea7c.json b/cedar-integration-tests/corpus_tests/167da68a1884c31cd8bfdd2e7a2ac5e9a3ddea7c.json
index 0886f6cf2..4c2c471ac 100644
--- a/cedar-integration-tests/corpus_tests/167da68a1884c31cd8bfdd2e7a2ac5e9a3ddea7c.json
+++ b/cedar-integration-tests/corpus_tests/167da68a1884c31cd8bfdd2e7a2ac5e9a3ddea7c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": [
           "",
@@ -37,9 +55,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": [
           "",
@@ -59,9 +86,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
@@ -73,9 +109,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
@@ -87,9 +132,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
@@ -101,9 +155,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
@@ -115,9 +178,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
diff --git a/cedar-integration-tests/corpus_tests/16837047727ca7d0c2d7ce7be3a30d78e25c1313.json b/cedar-integration-tests/corpus_tests/16837047727ca7d0c2d7ce7be3a30d78e25c1313.json
index 80d0d9c82..91e98da19 100644
--- a/cedar-integration-tests/corpus_tests/16837047727ca7d0c2d7ce7be3a30d78e25c1313.json
+++ b/cedar-integration-tests/corpus_tests/16837047727ca7d0c2d7ce7be3a30d78e25c1313.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"b\\'f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b\\'f\"",
+      "principal": {
+        "type": "a",
+        "id": "b'f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b'f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"b\\'f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b\\'f\"",
+      "principal": {
+        "type": "a",
+        "id": "b'f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b'f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"b\\'f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b\\'f\"",
+      "principal": {
+        "type": "a",
+        "id": "b'f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b'f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"b\\'f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b\\'f\"",
+      "principal": {
+        "type": "a",
+        "id": "b'f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b'f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"b\\'f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b\\'f\"",
+      "principal": {
+        "type": "a",
+        "id": "b'f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b'f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"b\\'f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b\\'f\"",
+      "principal": {
+        "type": "a",
+        "id": "b'f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b'f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"b\\'f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b\\'f\"",
+      "principal": {
+        "type": "a",
+        "id": "b'f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b'f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"b\\'f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b\\'f\"",
+      "principal": {
+        "type": "a",
+        "id": "b'f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b'f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1684af6121f7ff5362748cebac0a29ed0c9c62b6.json b/cedar-integration-tests/corpus_tests/1684af6121f7ff5362748cebac0a29ed0c9c62b6.json
index 150e20a57..15636eab2 100644
--- a/cedar-integration-tests/corpus_tests/1684af6121f7ff5362748cebac0a29ed0c9c62b6.json
+++ b/cedar-integration-tests/corpus_tests/1684af6121f7ff5362748cebac0a29ed0c9c62b6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {
         "FpYajcl0000000": "",
         "FkldY1jjjjjjjam": ""
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {
         "FpYajcl0000000": "",
         "FkldY1jjjjjjjam": ""
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {
         "FpYajcl0000000": "",
         "FkldY1jjjjjjjam": ""
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {
         "FpYajcl0000000": "",
         "FkldY1jjjjjjjam": ""
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {
         "FpYajcl0000000": "",
         "FkldY1jjjjjjjam": ""
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {
         "FpYajcl0000000": "",
         "FkldY1jjjjjjjam": ""
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {
         "FpYajcl0000000": "",
         "FkldY1jjjjjjjam": ""
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {
         "FpYajcl0000000": "",
         "FkldY1jjjjjjjam": ""
diff --git a/cedar-integration-tests/corpus_tests/169db4c31a471e0e6e4fa5eab01e3edf73aeb2af.json b/cedar-integration-tests/corpus_tests/169db4c31a471e0e6e4fa5eab01e3edf73aeb2af.json
index b6fc52142..ef40301d0 100644
--- a/cedar-integration-tests/corpus_tests/169db4c31a471e0e6e4fa5eab01e3edf73aeb2af.json
+++ b/cedar-integration-tests/corpus_tests/169db4c31a471e0e6e4fa5eab01e3edf73aeb2af.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/16c049e91f396ebf938fb47fd7f0432b4db1e2b0.json b/cedar-integration-tests/corpus_tests/16c049e91f396ebf938fb47fd7f0432b4db1e2b0.json
index bb9e90187..a15918452 100644
--- a/cedar-integration-tests/corpus_tests/16c049e91f396ebf938fb47fd7f0432b4db1e2b0.json
+++ b/cedar-integration-tests/corpus_tests/16c049e91f396ebf938fb47fd7f0432b4db1e2b0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/16c992ac81a16c5bba204e9ba8e7b5b4f15f3c49.json b/cedar-integration-tests/corpus_tests/16c992ac81a16c5bba204e9ba8e7b5b4f15f3c49.json
index f7fff2a13..0ed15b990 100644
--- a/cedar-integration-tests/corpus_tests/16c992ac81a16c5bba204e9ba8e7b5b4f15f3c49.json
+++ b/cedar-integration-tests/corpus_tests/16c992ac81a16c5bba204e9ba8e7b5b4f15f3c49.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/16cfd4b64989cfb9967626b279b90ef46cf8fe5d.json b/cedar-integration-tests/corpus_tests/16cfd4b64989cfb9967626b279b90ef46cf8fe5d.json
index b65655393..8c68a8df8 100644
--- a/cedar-integration-tests/corpus_tests/16cfd4b64989cfb9967626b279b90ef46cf8fe5d.json
+++ b/cedar-integration-tests/corpus_tests/16cfd4b64989cfb9967626b279b90ef46cf8fe5d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bsmm": {}
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bsmm": {}
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bsmm": {}
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bsmm": {}
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bsmm": {}
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bsmm": {}
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bsmm": {}
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bsmm": {}
       },
diff --git a/cedar-integration-tests/corpus_tests/16d8dd8f9f3eb287902c3fb4936841d8a2415a58.json b/cedar-integration-tests/corpus_tests/16d8dd8f9f3eb287902c3fb4936841d8a2415a58.json
index 04c827b67..26ca94b34 100644
--- a/cedar-integration-tests/corpus_tests/16d8dd8f9f3eb287902c3fb4936841d8a2415a58.json
+++ b/cedar-integration-tests/corpus_tests/16d8dd8f9f3eb287902c3fb4936841d8a2415a58.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F": false
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F": false
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F": false
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F": false
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F": false
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F": false
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F": false
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F": false
       },
diff --git a/cedar-integration-tests/corpus_tests/170466057a2b0d393044c1cb000aea4a624cb320.json b/cedar-integration-tests/corpus_tests/170466057a2b0d393044c1cb000aea4a624cb320.json
index 18a3ed71d..ea3dccecd 100644
--- a/cedar-integration-tests/corpus_tests/170466057a2b0d393044c1cb000aea4a624cb320.json
+++ b/cedar-integration-tests/corpus_tests/170466057a2b0d393044c1cb000aea4a624cb320.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1721549a1d0b75951d202ad6bad25c85a594bba8.json b/cedar-integration-tests/corpus_tests/1721549a1d0b75951d202ad6bad25c85a594bba8.json
index aea3abb82..3e5fc08ba 100644
--- a/cedar-integration-tests/corpus_tests/1721549a1d0b75951d202ad6bad25c85a594bba8.json
+++ b/cedar-integration-tests/corpus_tests/1721549a1d0b75951d202ad6bad25c85a594bba8.json
@@ -6,9 +6,15 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\")\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +24,15 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\")\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +42,15 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\")\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +60,15 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\")\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +78,15 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\")\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +96,15 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\")\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +114,15 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\")\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +132,15 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\")\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1744b70eb7f065316e50f3a750afbbf6e9c242ee.json b/cedar-integration-tests/corpus_tests/1744b70eb7f065316e50f3a750afbbf6e9c242ee.json
index 53cac5fea..c18c73260 100644
--- a/cedar-integration-tests/corpus_tests/1744b70eb7f065316e50f3a750afbbf6e9c242ee.json
+++ b/cedar-integration-tests/corpus_tests/1744b70eb7f065316e50f3a750afbbf6e9c242ee.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1755a63e1055ea02e36e593a0c57620b26341c5f.json b/cedar-integration-tests/corpus_tests/1755a63e1055ea02e36e593a0c57620b26341c5f.json
index d2de3e924..b2fb3f5a0 100644
--- a/cedar-integration-tests/corpus_tests/1755a63e1055ea02e36e593a0c57620b26341c5f.json
+++ b/cedar-integration-tests/corpus_tests/1755a63e1055ea02e36e593a0c57620b26341c5f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
diff --git a/cedar-integration-tests/corpus_tests/17668072f20aabadd9a184797bf67efb9c07ad98.json b/cedar-integration-tests/corpus_tests/17668072f20aabadd9a184797bf67efb9c07ad98.json
index f71c19fed..4e97d53bc 100644
--- a/cedar-integration-tests/corpus_tests/17668072f20aabadd9a184797bf67efb9c07ad98.json
+++ b/cedar-integration-tests/corpus_tests/17668072f20aabadd9a184797bf67efb9c07ad98.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/177277820fc165579ff72b027629c616ef7a1708.json b/cedar-integration-tests/corpus_tests/177277820fc165579ff72b027629c616ef7a1708.json
index 3e5963b7b..8025ae758 100644
--- a/cedar-integration-tests/corpus_tests/177277820fc165579ff72b027629c616ef7a1708.json
+++ b/cedar-integration-tests/corpus_tests/177277820fc165579ff72b027629c616ef7a1708.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Fw900Aam::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xYqXb0wwwwww0S::\"\"",
+      "principal": {
+        "type": "Fw900Aam",
+        "id": ""
+      },
+      "resource": {
+        "type": "xYqXb0wwwwww0S",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Fw900Aam::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xYqXb0wwwwww0S::\"\"",
+      "principal": {
+        "type": "Fw900Aam",
+        "id": ""
+      },
+      "resource": {
+        "type": "xYqXb0wwwwww0S",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Fw900Aam::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xYqXb0wwwwww0S::\"\"",
+      "principal": {
+        "type": "Fw900Aam",
+        "id": ""
+      },
+      "resource": {
+        "type": "xYqXb0wwwwww0S",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Fw900Aam::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xYqXb0wwwwww0S::\"\"",
+      "principal": {
+        "type": "Fw900Aam",
+        "id": ""
+      },
+      "resource": {
+        "type": "xYqXb0wwwwww0S",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Fw900Aam::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xYqXb0wwwwww0S::\"\"",
+      "principal": {
+        "type": "Fw900Aam",
+        "id": ""
+      },
+      "resource": {
+        "type": "xYqXb0wwwwww0S",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Fw900Aam::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xYqXb0wwwwww0S::\"\"",
+      "principal": {
+        "type": "Fw900Aam",
+        "id": ""
+      },
+      "resource": {
+        "type": "xYqXb0wwwwww0S",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Fw900Aam::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xYqXb0wwwwww0S::\"\"",
+      "principal": {
+        "type": "Fw900Aam",
+        "id": ""
+      },
+      "resource": {
+        "type": "xYqXb0wwwwww0S",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Fw900Aam::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xYqXb0wwwwww0S::\"\"",
+      "principal": {
+        "type": "Fw900Aam",
+        "id": ""
+      },
+      "resource": {
+        "type": "xYqXb0wwwwww0S",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/177a22b9e2eae9a5db91db8c064db7dbc4976235.json b/cedar-integration-tests/corpus_tests/177a22b9e2eae9a5db91db8c064db7dbc4976235.json
index 8d84d11ed..7d30863e5 100644
--- a/cedar-integration-tests/corpus_tests/177a22b9e2eae9a5db91db8c064db7dbc4976235.json
+++ b/cedar-integration-tests/corpus_tests/177a22b9e2eae9a5db91db8c064db7dbc4976235.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1796d594c30461a66c4b4de040aae25480691034.json b/cedar-integration-tests/corpus_tests/1796d594c30461a66c4b4de040aae25480691034.json
index ec76e5499..8568eb481 100644
--- a/cedar-integration-tests/corpus_tests/1796d594c30461a66c4b4de040aae25480691034.json
+++ b/cedar-integration-tests/corpus_tests/1796d594c30461a66c4b4de040aae25480691034.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "qw": "",
@@ -22,9 +31,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "qw": "",
@@ -38,9 +56,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "qw": "",
@@ -54,9 +81,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "qw": "",
@@ -70,9 +106,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "qw": "",
@@ -86,9 +131,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "qw": "",
@@ -102,9 +156,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "qw": "",
@@ -118,9 +181,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "qw": "",
diff --git a/cedar-integration-tests/corpus_tests/17be3581f3ffda7cc77969e6876952e8b36806d5.json b/cedar-integration-tests/corpus_tests/17be3581f3ffda7cc77969e6876952e8b36806d5.json
index 5b3174b53..a39efe4ec 100644
--- a/cedar-integration-tests/corpus_tests/17be3581f3ffda7cc77969e6876952e8b36806d5.json
+++ b/cedar-integration-tests/corpus_tests/17be3581f3ffda7cc77969e6876952e8b36806d5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Q120": false,
         "A0": 0,
@@ -23,9 +32,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Q120": false,
         "A0": 0,
@@ -40,9 +58,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Q120": false,
         "A0": 0,
@@ -57,9 +84,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Q120": false,
         "A0": 0,
@@ -74,9 +110,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Q120": false,
         "A0": 0,
@@ -91,9 +136,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Q120": false,
         "A0": 0,
@@ -108,9 +162,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Q120": false,
         "A0": 0,
@@ -125,9 +188,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Q120": false,
         "A0": 0,
diff --git a/cedar-integration-tests/corpus_tests/17c44f45cb8cddea6e0db0604a9ef71731a517cc.json b/cedar-integration-tests/corpus_tests/17c44f45cb8cddea6e0db0604a9ef71731a517cc.json
index dada11efe..a52850786 100644
--- a/cedar-integration-tests/corpus_tests/17c44f45cb8cddea6e0db0604a9ef71731a517cc.json
+++ b/cedar-integration-tests/corpus_tests/17c44f45cb8cddea6e0db0604a9ef71731a517cc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/17f84086f0fb865ed25ea07f776b9882c39624f4.json b/cedar-integration-tests/corpus_tests/17f84086f0fb865ed25ea07f776b9882c39624f4.json
index a7fe25d1c..9e4c4c2eb 100644
--- a/cedar-integration-tests/corpus_tests/17f84086f0fb865ed25ea07f776b9882c39624f4.json
+++ b/cedar-integration-tests/corpus_tests/17f84086f0fb865ed25ea07f776b9882c39624f4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "G666E66::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G666E66::\"&\"",
+      "principal": {
+        "type": "G666E66",
+        "id": ""
+      },
+      "resource": {
+        "type": "G666E66",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "G666E66::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "G666E66::\"&\"",
+      "principal": {
+        "type": "G666E66",
+        "id": "&"
+      },
+      "resource": {
+        "type": "G666E66",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "G666E66::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "G666E66::\"&\"",
+      "principal": {
+        "type": "G666E66",
+        "id": "&"
+      },
+      "resource": {
+        "type": "G666E66",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "G666E66::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "G666E66::\"&\"",
+      "principal": {
+        "type": "G666E66",
+        "id": "&"
+      },
+      "resource": {
+        "type": "G666E66",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "G666E66::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "G666E66::\"&\"",
+      "principal": {
+        "type": "G666E66",
+        "id": "&"
+      },
+      "resource": {
+        "type": "G666E66",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "G666E66::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "G666E66::\"&\"",
+      "principal": {
+        "type": "G666E66",
+        "id": "&"
+      },
+      "resource": {
+        "type": "G666E66",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "G666E66::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "G666E66::\"&\"",
+      "principal": {
+        "type": "G666E66",
+        "id": "&"
+      },
+      "resource": {
+        "type": "G666E66",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "G666E66::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "G666E66::\"&\"",
+      "principal": {
+        "type": "G666E66",
+        "id": "&"
+      },
+      "resource": {
+        "type": "G666E66",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/18143877edec804d9108a7f1030dd6bf625d2f96.json b/cedar-integration-tests/corpus_tests/18143877edec804d9108a7f1030dd6bf625d2f96.json
index d7a04d674..8c3e7af35 100644
--- a/cedar-integration-tests/corpus_tests/18143877edec804d9108a7f1030dd6bf625d2f96.json
+++ b/cedar-integration-tests/corpus_tests/18143877edec804d9108a7f1030dd6bf625d2f96.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{3}\\0\\0\\0sun/ni\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0\\0sun/ni\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000sun/ni"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000sun/ni"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{3}\\0\\0\\0sun/ni\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0\\0sun/ni\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000sun/ni"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000sun/ni"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{3}\\0\\0\\0sun/ni\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0\\0sun/ni\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000sun/ni"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000sun/ni"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{3}\\0\\0\\0sun/ni\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0\\0sun/ni\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000sun/ni"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000sun/ni"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{3}\\0\\0\\0sun/ni\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0\\0sun/ni\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000sun/ni"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000sun/ni"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{3}\\0\\0\\0sun/ni\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0\\0sun/ni\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000sun/ni"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000sun/ni"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{3}\\0\\0\\0sun/ni\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0\\0sun/ni\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000sun/ni"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000sun/ni"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{3}\\0\\0\\0sun/ni\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0\\0sun/ni\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000sun/ni"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000sun/ni"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1840e254d6158bdeefa9ac394b9721b87c26d20b.json b/cedar-integration-tests/corpus_tests/1840e254d6158bdeefa9ac394b9721b87c26d20b.json
index fb0983f8c..487775137 100644
--- a/cedar-integration-tests/corpus_tests/1840e254d6158bdeefa9ac394b9721b87c26d20b.json
+++ b/cedar-integration-tests/corpus_tests/1840e254d6158bdeefa9ac394b9721b87c26d20b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/186022020bf2be6068a0dcb7e9e9184dc855d5d8.json b/cedar-integration-tests/corpus_tests/186022020bf2be6068a0dcb7e9e9184dc855d5d8.json
index 140e7c3db..405b8808c 100644
--- a/cedar-integration-tests/corpus_tests/186022020bf2be6068a0dcb7e9e9184dc855d5d8.json
+++ b/cedar-integration-tests/corpus_tests/186022020bf2be6068a0dcb7e9e9184dc855d5d8.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/18a6848b2ef612f366035575c1c9557a4688746b.json b/cedar-integration-tests/corpus_tests/18a6848b2ef612f366035575c1c9557a4688746b.json
index 77de79b5f..a6266fdfe 100644
--- a/cedar-integration-tests/corpus_tests/18a6848b2ef612f366035575c1c9557a4688746b.json
+++ b/cedar-integration-tests/corpus_tests/18a6848b2ef612f366035575c1c9557a4688746b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/18cc563d980fdc60cd35b4446cf175798ab1733d.json b/cedar-integration-tests/corpus_tests/18cc563d980fdc60cd35b4446cf175798ab1733d.json
index 5fbc6c700..bf699efaa 100644
--- a/cedar-integration-tests/corpus_tests/18cc563d980fdc60cd35b4446cf175798ab1733d.json
+++ b/cedar-integration-tests/corpus_tests/18cc563d980fdc60cd35b4446cf175798ab1733d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/18fee2407bdd9f8f63baa8d55a8044d5b0b60069.json b/cedar-integration-tests/corpus_tests/18fee2407bdd9f8f63baa8d55a8044d5b0b60069.json
index 40ad862d8..a4dd30b5b 100644
--- a/cedar-integration-tests/corpus_tests/18fee2407bdd9f8f63baa8d55a8044d5b0b60069.json
+++ b/cedar-integration-tests/corpus_tests/18fee2407bdd9f8f63baa8d55a8044d5b0b60069.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/191acc4c653f5f2d95123532747b774eee13f840.json b/cedar-integration-tests/corpus_tests/191acc4c653f5f2d95123532747b774eee13f840.json
index 88011bce2..ac1520b32 100644
--- a/cedar-integration-tests/corpus_tests/191acc4c653f5f2d95123532747b774eee13f840.json
+++ b/cedar-integration-tests/corpus_tests/191acc4c653f5f2d95123532747b774eee13f840.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "s::a::\"\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "s::a::\"\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\"",
+      "principal": {
+        "type": "s::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "s::a",
+        "id": ""
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "s::a::\"\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\"",
+      "principal": {
+        "type": "s::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "s::a",
+        "id": ""
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "s::a::\"\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\"",
+      "principal": {
+        "type": "s::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "s::a",
+        "id": ""
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "s::a::\"\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\"",
+      "principal": {
+        "type": "s::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "s::a",
+        "id": ""
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "s::a::\"\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\"",
+      "principal": {
+        "type": "s::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "s::a",
+        "id": ""
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "s::a::\"\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\"",
+      "principal": {
+        "type": "s::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "s::a",
+        "id": ""
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "s::a::\"\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\"",
+      "principal": {
+        "type": "s::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "s::a",
+        "id": ""
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/19923ce573215d221a260ab089a3eade7736dccf.json b/cedar-integration-tests/corpus_tests/19923ce573215d221a260ab089a3eade7736dccf.json
index 4e5f1b0b4..f015bf7c4 100644
--- a/cedar-integration-tests/corpus_tests/19923ce573215d221a260ab089a3eade7736dccf.json
+++ b/cedar-integration-tests/corpus_tests/19923ce573215d221a260ab089a3eade7736dccf.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Bcss::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "Bcss::\"00\"",
+      "principal": {
+        "type": "Bcss",
+        "id": "00"
+      },
+      "resource": {
+        "type": "Bcss",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Bcss::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "Bcss::\"00\"",
+      "principal": {
+        "type": "Bcss",
+        "id": "00"
+      },
+      "resource": {
+        "type": "Bcss",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Bcss::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "Bcss::\"00\"",
+      "principal": {
+        "type": "Bcss",
+        "id": "00"
+      },
+      "resource": {
+        "type": "Bcss",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Bcss::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "Bcss::\"00\"",
+      "principal": {
+        "type": "Bcss",
+        "id": "00"
+      },
+      "resource": {
+        "type": "Bcss",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Bcss::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "Bcss::\"00\"",
+      "principal": {
+        "type": "Bcss",
+        "id": "00"
+      },
+      "resource": {
+        "type": "Bcss",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Bcss::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "Bcss::\"00\"",
+      "principal": {
+        "type": "Bcss",
+        "id": "00"
+      },
+      "resource": {
+        "type": "Bcss",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Bcss::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "Bcss::\"00\"",
+      "principal": {
+        "type": "Bcss",
+        "id": "00"
+      },
+      "resource": {
+        "type": "Bcss",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Bcss::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "Bcss::\"00\"",
+      "principal": {
+        "type": "Bcss",
+        "id": "00"
+      },
+      "resource": {
+        "type": "Bcss",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/19bffea7904c3d95cbc5e489417c331004b8b10d.json b/cedar-integration-tests/corpus_tests/19bffea7904c3d95cbc5e489417c331004b8b10d.json
index ceb5c0e6f..0a3dcf45c 100644
--- a/cedar-integration-tests/corpus_tests/19bffea7904c3d95cbc5e489417c331004b8b10d.json
+++ b/cedar-integration-tests/corpus_tests/19bffea7904c3d95cbc5e489417c331004b8b10d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\b\b\b\b\b\b\b\b\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\b\b\b\b\b\b\b\b\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\b\b\b\b\b\b\b\b\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\b\b\b\b\b\b\b\b\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\b\b\b\b\b\b\b\b\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\b\b\b\b\b\b\b\b\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\b\b\b\b\b\b\b\b\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\b\b\b\b\b\b\b\b\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\b\b\b\b\b\b\b\b\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\b\b\b\b\b\b\b\b\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\b\b\b\b\b\b\b\b\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\b\b\b\b\b\b\b\b\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\b\b\b\b\b\b\b\b\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\b\b\b\b\b\b\b\b\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\b\b\b\b\b\b\b\b\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\b\b\b\b\b\b\b\b\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/19c5f1424d35a2cbe0426ad84c57761d16f5637c.json b/cedar-integration-tests/corpus_tests/19c5f1424d35a2cbe0426ad84c57761d16f5637c.json
index 3381833ad..1189e96c4 100644
--- a/cedar-integration-tests/corpus_tests/19c5f1424d35a2cbe0426ad84c57761d16f5637c.json
+++ b/cedar-integration-tests/corpus_tests/19c5f1424d35a2cbe0426ad84c57761d16f5637c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0#\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000#\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "j02h0": ""
       },
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0#\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0#\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000#\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000#\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "j02h0": ""
       },
@@ -32,9 +50,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0#\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0#\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000#\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000#\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "j02h0": ""
       },
@@ -46,9 +73,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0#\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0#\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000#\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000#\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "j02h0": ""
       },
@@ -60,9 +96,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0#\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0#\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000#\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000#\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "j02h0": ""
       },
@@ -74,9 +119,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0#\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0#\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000#\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000#\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "j02h0": ""
       },
@@ -88,9 +142,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0#\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0#\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000#\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000#\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "j02h0": ""
       },
@@ -102,9 +165,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0#\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0#\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000#\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000#\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "j02h0": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/19ecbb29df5f7f28be216376e2fa55fb1bb28403.json b/cedar-integration-tests/corpus_tests/19ecbb29df5f7f28be216376e2fa55fb1bb28403.json
index e838100da..58b6a0789 100644
--- a/cedar-integration-tests/corpus_tests/19ecbb29df5f7f28be216376e2fa55fb1bb28403.json
+++ b/cedar-integration-tests/corpus_tests/19ecbb29df5f7f28be216376e2fa55fb1bb28403.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "__entity": {
@@ -31,9 +40,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "__entity": {
@@ -56,9 +74,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "__entity": {
@@ -81,9 +108,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "__entity": {
@@ -106,9 +142,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "__entity": {
@@ -131,9 +176,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "__entity": {
@@ -156,9 +210,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "__entity": {
@@ -181,9 +244,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "__entity": {
diff --git a/cedar-integration-tests/corpus_tests/19fbe4b90f1e0114f2201dbe7bbf8e943cf7bd00.json b/cedar-integration-tests/corpus_tests/19fbe4b90f1e0114f2201dbe7bbf8e943cf7bd00.json
index ad39451c4..a5042da57 100644
--- a/cedar-integration-tests/corpus_tests/19fbe4b90f1e0114f2201dbe7bbf8e943cf7bd00.json
+++ b/cedar-integration-tests/corpus_tests/19fbe4b90f1e0114f2201dbe7bbf8e943cf7bd00.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"lac\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "lac"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1ad2ee43424d84ac48ec1b2b43975b8adc7d5687.json b/cedar-integration-tests/corpus_tests/1ad2ee43424d84ac48ec1b2b43975b8adc7d5687.json
index d4133b4a2..2afeacb7c 100644
--- a/cedar-integration-tests/corpus_tests/1ad2ee43424d84ac48ec1b2b43975b8adc7d5687.json
+++ b/cedar-integration-tests/corpus_tests/1ad2ee43424d84ac48ec1b2b43975b8adc7d5687.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0::\\u{10}\\0:\\n:\\0:\\0\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0::\\u{10}\\0:\\n:\\0:\\0\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000::\u0010\u0000:\n:\u0000:\u0000\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000::\u0010\u0000:\n:\u0000:\u0000\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0::\\u{10}\\0:\\n:\\0:\\0\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0::\\u{10}\\0:\\n:\\0:\\0\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000::\u0010\u0000:\n:\u0000:\u0000\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000::\u0010\u0000:\n:\u0000:\u0000\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0::\\u{10}\\0:\\n:\\0:\\0\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0::\\u{10}\\0:\\n:\\0:\\0\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000::\u0010\u0000:\n:\u0000:\u0000\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000::\u0010\u0000:\n:\u0000:\u0000\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0::\\u{10}\\0:\\n:\\0:\\0\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0::\\u{10}\\0:\\n:\\0:\\0\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000::\u0010\u0000:\n:\u0000:\u0000\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000::\u0010\u0000:\n:\u0000:\u0000\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0::\\u{10}\\0:\\n:\\0:\\0\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0::\\u{10}\\0:\\n:\\0:\\0\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000::\u0010\u0000:\n:\u0000:\u0000\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000::\u0010\u0000:\n:\u0000:\u0000\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0::\\u{10}\\0:\\n:\\0:\\0\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0::\\u{10}\\0:\\n:\\0:\\0\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000::\u0010\u0000:\n:\u0000:\u0000\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000::\u0010\u0000:\n:\u0000:\u0000\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0::\\u{10}\\0:\\n:\\0:\\0\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0::\\u{10}\\0:\\n:\\0:\\0\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000::\u0010\u0000:\n:\u0000:\u0000\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000::\u0010\u0000:\n:\u0000:\u0000\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0::\\u{10}\\0:\\n:\\0:\\0\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0::\\u{10}\\0:\\n:\\0:\\0\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000::\u0010\u0000:\n:\u0000:\u0000\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000::\u0010\u0000:\n:\u0000:\u0000\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1b03f18a65dafe6bc111ad12c0de50aa56bf5179.json b/cedar-integration-tests/corpus_tests/1b03f18a65dafe6bc111ad12c0de50aa56bf5179.json
index 1433346d6..e0d53a5f3 100644
--- a/cedar-integration-tests/corpus_tests/1b03f18a65dafe6bc111ad12c0de50aa56bf5179.json
+++ b/cedar-integration-tests/corpus_tests/1b03f18a65dafe6bc111ad12c0de50aa56bf5179.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0zzz\\u{11}z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0zzz\\u{11}z\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0zzz\\u{11}z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0zzz\\u{11}z\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0zzz\\u{11}z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0zzz\\u{11}z\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0zzz\\u{11}z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0zzz\\u{11}z\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0zzz\\u{11}z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0zzz\\u{11}z\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0zzz\\u{11}z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0zzz\\u{11}z\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0zzz\\u{11}z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0zzz\\u{11}z\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0zzz\\u{11}z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0zzz\\u{11}z\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1b156e7301e522fcea1df4a95ae0ef13cc16f2ee.json b/cedar-integration-tests/corpus_tests/1b156e7301e522fcea1df4a95ae0ef13cc16f2ee.json
index e8afaa161..aeda00dbf 100644
--- a/cedar-integration-tests/corpus_tests/1b156e7301e522fcea1df4a95ae0ef13cc16f2ee.json
+++ b/cedar-integration-tests/corpus_tests/1b156e7301e522fcea1df4a95ae0ef13cc16f2ee.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "WjjjZZZ::a::\"\"",
-      "action": "WjjjZZZ::Action::\"action\"",
-      "resource": "WjjjZZZ::a::\"\"",
+      "principal": {
+        "type": "WjjjZZZ::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "WjjjZZZ::a",
+        "id": ""
+      },
+      "action": {
+        "type": "WjjjZZZ::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "WjjjZZZ::a::\"\"",
-      "action": "WjjjZZZ::Action::\"action\"",
-      "resource": "WjjjZZZ::a::\"\"",
+      "principal": {
+        "type": "WjjjZZZ::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "WjjjZZZ::a",
+        "id": ""
+      },
+      "action": {
+        "type": "WjjjZZZ::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "WjjjZZZ::a::\"\"",
-      "action": "WjjjZZZ::Action::\"action\"",
-      "resource": "WjjjZZZ::a::\"\"",
+      "principal": {
+        "type": "WjjjZZZ::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "WjjjZZZ::a",
+        "id": ""
+      },
+      "action": {
+        "type": "WjjjZZZ::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "WjjjZZZ::a::\"\"",
-      "action": "WjjjZZZ::Action::\"action\"",
-      "resource": "WjjjZZZ::a::\"\"",
+      "principal": {
+        "type": "WjjjZZZ::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "WjjjZZZ::a",
+        "id": ""
+      },
+      "action": {
+        "type": "WjjjZZZ::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "WjjjZZZ::a::\"\"",
-      "action": "WjjjZZZ::Action::\"action\"",
-      "resource": "WjjjZZZ::a::\"\"",
+      "principal": {
+        "type": "WjjjZZZ::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "WjjjZZZ::a",
+        "id": ""
+      },
+      "action": {
+        "type": "WjjjZZZ::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "WjjjZZZ::a::\"\"",
-      "action": "WjjjZZZ::Action::\"action\"",
-      "resource": "WjjjZZZ::a::\"\"",
+      "principal": {
+        "type": "WjjjZZZ::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "WjjjZZZ::a",
+        "id": ""
+      },
+      "action": {
+        "type": "WjjjZZZ::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "WjjjZZZ::a::\"\"",
-      "action": "WjjjZZZ::Action::\"action\"",
-      "resource": "WjjjZZZ::a::\"\"",
+      "principal": {
+        "type": "WjjjZZZ::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "WjjjZZZ::a",
+        "id": ""
+      },
+      "action": {
+        "type": "WjjjZZZ::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "WjjjZZZ::a::\"\"",
-      "action": "WjjjZZZ::Action::\"action\"",
-      "resource": "WjjjZZZ::a::\"\"",
+      "principal": {
+        "type": "WjjjZZZ::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "WjjjZZZ::a",
+        "id": ""
+      },
+      "action": {
+        "type": "WjjjZZZ::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1b4ac84a704c0e014cdc1fa3265d08a23a0634f8.json b/cedar-integration-tests/corpus_tests/1b4ac84a704c0e014cdc1fa3265d08a23a0634f8.json
index 834dd7db7..a7f835772 100644
--- a/cedar-integration-tests/corpus_tests/1b4ac84a704c0e014cdc1fa3265d08a23a0634f8.json
+++ b/cedar-integration-tests/corpus_tests/1b4ac84a704c0e014cdc1fa3265d08a23a0634f8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Khhzhhhk::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhzhhhk::\".\"",
+      "principal": {
+        "type": "Khhzhhhk",
+        "id": "."
+      },
+      "resource": {
+        "type": "Khhzhhhk",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Akkkk0": []
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Khhzhhhk::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhzhhhk::\".\"",
+      "principal": {
+        "type": "Khhzhhhk",
+        "id": "."
+      },
+      "resource": {
+        "type": "Khhzhhhk",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Akkkk0": []
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Khhzhhhk::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhzhhhk::\".\"",
+      "principal": {
+        "type": "Khhzhhhk",
+        "id": "."
+      },
+      "resource": {
+        "type": "Khhzhhhk",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Akkkk0": []
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Khhzhhhk::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhzhhhk::\".\"",
+      "principal": {
+        "type": "Khhzhhhk",
+        "id": "."
+      },
+      "resource": {
+        "type": "Khhzhhhk",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Akkkk0": []
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Khhzhhhk::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhzhhhk::\".\"",
+      "principal": {
+        "type": "Khhzhhhk",
+        "id": "."
+      },
+      "resource": {
+        "type": "Khhzhhhk",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Akkkk0": []
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Khhzhhhk::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhzhhhk::\".\"",
+      "principal": {
+        "type": "Khhzhhhk",
+        "id": "."
+      },
+      "resource": {
+        "type": "Khhzhhhk",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Akkkk0": []
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Khhzhhhk::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhzhhhk::\".\"",
+      "principal": {
+        "type": "Khhzhhhk",
+        "id": "."
+      },
+      "resource": {
+        "type": "Khhzhhhk",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Akkkk0": []
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Khhzhhhk::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhzhhhk::\".\"",
+      "principal": {
+        "type": "Khhzhhhk",
+        "id": "."
+      },
+      "resource": {
+        "type": "Khhzhhhk",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Akkkk0": []
       },
diff --git a/cedar-integration-tests/corpus_tests/1ba382ff356028e27023a3d08c87e642619f6fb6.json b/cedar-integration-tests/corpus_tests/1ba382ff356028e27023a3d08c87e642619f6fb6.json
index bc48d3219..4502215cb 100644
--- a/cedar-integration-tests/corpus_tests/1ba382ff356028e27023a3d08c87e642619f6fb6.json
+++ b/cedar-integration-tests/corpus_tests/1ba382ff356028e27023a3d08c87e642619f6fb6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1c0a749b84fb1394652f7860174b0eeff142774f.json b/cedar-integration-tests/corpus_tests/1c0a749b84fb1394652f7860174b0eeff142774f.json
index 11b6ebda3..47857b68e 100644
--- a/cedar-integration-tests/corpus_tests/1c0a749b84fb1394652f7860174b0eeff142774f.json
+++ b/cedar-integration-tests/corpus_tests/1c0a749b84fb1394652f7860174b0eeff142774f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/1c2c15353c3261b6f53162583408aebbf8d259e8.json b/cedar-integration-tests/corpus_tests/1c2c15353c3261b6f53162583408aebbf8d259e8.json
index de6a86242..579769e9b 100644
--- a/cedar-integration-tests/corpus_tests/1c2c15353c3261b6f53162583408aebbf8d259e8.json
+++ b/cedar-integration-tests/corpus_tests/1c2c15353c3261b6f53162583408aebbf8d259e8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"zz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zz\"",
+      "principal": {
+        "type": "a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"zz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zz\"",
+      "principal": {
+        "type": "a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"zz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zz\"",
+      "principal": {
+        "type": "a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"zz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zz\"",
+      "principal": {
+        "type": "a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"zz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zz\"",
+      "principal": {
+        "type": "a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"zz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zz\"",
+      "principal": {
+        "type": "a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"zz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zz\"",
+      "principal": {
+        "type": "a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"zz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zz\"",
+      "principal": {
+        "type": "a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1c41c9469c2df291a3ad39308ebd42a2a7c41092.json b/cedar-integration-tests/corpus_tests/1c41c9469c2df291a3ad39308ebd42a2a7c41092.json
index 67d3176c3..c8385780b 100644
--- a/cedar-integration-tests/corpus_tests/1c41c9469c2df291a3ad39308ebd42a2a7c41092.json
+++ b/cedar-integration-tests/corpus_tests/1c41c9469c2df291a3ad39308ebd42a2a7c41092.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -84,9 +147,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1c473ec0a248a595b1dde9b9a357404233b05583.json b/cedar-integration-tests/corpus_tests/1c473ec0a248a595b1dde9b9a357404233b05583.json
index cb0edee33..aefe5d5ad 100644
--- a/cedar-integration-tests/corpus_tests/1c473ec0a248a595b1dde9b9a357404233b05583.json
+++ b/cedar-integration-tests/corpus_tests/1c473ec0a248a595b1dde9b9a357404233b05583.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A000::r::a::\"\"",
-      "action": "A000::r::Action::\"action\"",
-      "resource": "A000::r::a::\"\"",
+      "principal": {
+        "type": "A000::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A000::r::a::\"\"",
-      "action": "A000::r::Action::\"action\"",
-      "resource": "A000::r::a::\"\"",
+      "principal": {
+        "type": "A000::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A000::r::a::\"\"",
-      "action": "A000::r::Action::\"action\"",
-      "resource": "A000::r::a::\"\"",
+      "principal": {
+        "type": "A000::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A000::r::a::\"\"",
-      "action": "A000::r::Action::\"action\"",
-      "resource": "A000::r::a::\"\"",
+      "principal": {
+        "type": "A000::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A000::r::a::\"\"",
-      "action": "A000::r::Action::\"action\"",
-      "resource": "A000::r::a::\"\"",
+      "principal": {
+        "type": "A000::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A000::r::a::\"\"",
-      "action": "A000::r::Action::\"action\"",
-      "resource": "A000::r::a::\"\"",
+      "principal": {
+        "type": "A000::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A000::r::a::\"\"",
-      "action": "A000::r::Action::\"action\"",
-      "resource": "A000::r::a::\"\"",
+      "principal": {
+        "type": "A000::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A000::r::a::\"\"",
-      "action": "A000::r::Action::\"action\"",
-      "resource": "A000::r::a::\"\"",
+      "principal": {
+        "type": "A000::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1c54edb50fe03f03ae8ff1b2c65d81471b079062.json b/cedar-integration-tests/corpus_tests/1c54edb50fe03f03ae8ff1b2c65d81471b079062.json
index 840b7d50c..73829d23d 100644
--- a/cedar-integration-tests/corpus_tests/1c54edb50fe03f03ae8ff1b2c65d81471b079062.json
+++ b/cedar-integration-tests/corpus_tests/1c54edb50fe03f03ae8ff1b2c65d81471b079062.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "K::FwwwwGww::r::a::\":z:::\"",
-      "action": "K::FwwwwGww::r::Action::\"action\"",
-      "resource": "K::FwwwwGww::r::a::\":z:::\"",
+      "principal": {
+        "type": "K::FwwwwGww::r::a",
+        "id": ":z:::"
+      },
+      "resource": {
+        "type": "K::FwwwwGww::r::a",
+        "id": ":z:::"
+      },
+      "action": {
+        "type": "K::FwwwwGww::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "K::FwwwwGww::r::a::\":z:::\"",
-      "action": "K::FwwwwGww::r::Action::\"action\"",
-      "resource": "K::FwwwwGww::r::a::\":z:::\"",
+      "principal": {
+        "type": "K::FwwwwGww::r::a",
+        "id": ":z:::"
+      },
+      "resource": {
+        "type": "K::FwwwwGww::r::a",
+        "id": ":z:::"
+      },
+      "action": {
+        "type": "K::FwwwwGww::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "K::FwwwwGww::r::a::\":z:::\"",
-      "action": "K::FwwwwGww::r::Action::\"action\"",
-      "resource": "K::FwwwwGww::r::a::\":z:::\"",
+      "principal": {
+        "type": "K::FwwwwGww::r::a",
+        "id": ":z:::"
+      },
+      "resource": {
+        "type": "K::FwwwwGww::r::a",
+        "id": ":z:::"
+      },
+      "action": {
+        "type": "K::FwwwwGww::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "K::FwwwwGww::r::a::\":z:::\"",
-      "action": "K::FwwwwGww::r::Action::\"action\"",
-      "resource": "K::FwwwwGww::r::a::\":z:::\"",
+      "principal": {
+        "type": "K::FwwwwGww::r::a",
+        "id": ":z:::"
+      },
+      "resource": {
+        "type": "K::FwwwwGww::r::a",
+        "id": ":z:::"
+      },
+      "action": {
+        "type": "K::FwwwwGww::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "K::FwwwwGww::r::a::\":z:::\"",
-      "action": "K::FwwwwGww::r::Action::\"action\"",
-      "resource": "K::FwwwwGww::r::a::\":z:::\"",
+      "principal": {
+        "type": "K::FwwwwGww::r::a",
+        "id": ":z:::"
+      },
+      "resource": {
+        "type": "K::FwwwwGww::r::a",
+        "id": ":z:::"
+      },
+      "action": {
+        "type": "K::FwwwwGww::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "K::FwwwwGww::r::a::\":z:::\"",
-      "action": "K::FwwwwGww::r::Action::\"action\"",
-      "resource": "K::FwwwwGww::r::a::\":z:::\"",
+      "principal": {
+        "type": "K::FwwwwGww::r::a",
+        "id": ":z:::"
+      },
+      "resource": {
+        "type": "K::FwwwwGww::r::a",
+        "id": ":z:::"
+      },
+      "action": {
+        "type": "K::FwwwwGww::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "K::FwwwwGww::r::a::\":z:::\"",
-      "action": "K::FwwwwGww::r::Action::\"action\"",
-      "resource": "K::FwwwwGww::r::a::\":z:::\"",
+      "principal": {
+        "type": "K::FwwwwGww::r::a",
+        "id": ":z:::"
+      },
+      "resource": {
+        "type": "K::FwwwwGww::r::a",
+        "id": ":z:::"
+      },
+      "action": {
+        "type": "K::FwwwwGww::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "K::FwwwwGww::r::a::\":z:::\"",
-      "action": "K::FwwwwGww::r::Action::\"action\"",
-      "resource": "K::FwwwwGww::r::a::\":z:::\"",
+      "principal": {
+        "type": "K::FwwwwGww::r::a",
+        "id": ":z:::"
+      },
+      "resource": {
+        "type": "K::FwwwwGww::r::a",
+        "id": ":z:::"
+      },
+      "action": {
+        "type": "K::FwwwwGww::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1c56d0ecf8bcdccadcf11f9c01742360b1f5cbfd.json b/cedar-integration-tests/corpus_tests/1c56d0ecf8bcdccadcf11f9c01742360b1f5cbfd.json
index 566f76d6b..bbdd82721 100644
--- a/cedar-integration-tests/corpus_tests/1c56d0ecf8bcdccadcf11f9c01742360b1f5cbfd.json
+++ b/cedar-integration-tests/corpus_tests/1c56d0ecf8bcdccadcf11f9c01742360b1f5cbfd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1c9e4a8ba9c69657e4f1a7ea2f7e52f4aa11cbde.json b/cedar-integration-tests/corpus_tests/1c9e4a8ba9c69657e4f1a7ea2f7e52f4aa11cbde.json
index 82c3123ba..3884f24f3 100644
--- a/cedar-integration-tests/corpus_tests/1c9e4a8ba9c69657e4f1a7ea2f7e52f4aa11cbde.json
+++ b/cedar-integration-tests/corpus_tests/1c9e4a8ba9c69657e4f1a7ea2f7e52f4aa11cbde.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1cb3773bd41281fd1ef4bad379b0f734ee9fe4b2.json b/cedar-integration-tests/corpus_tests/1cb3773bd41281fd1ef4bad379b0f734ee9fe4b2.json
index e085f83bf..d7e78c4af 100644
--- a/cedar-integration-tests/corpus_tests/1cb3773bd41281fd1ef4bad379b0f734ee9fe4b2.json
+++ b/cedar-integration-tests/corpus_tests/1cb3773bd41281fd1ef4bad379b0f734ee9fe4b2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{2}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0002\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{2}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0002\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1cf81f57e323f996e54685db960cb28ae80301ad.json b/cedar-integration-tests/corpus_tests/1cf81f57e323f996e54685db960cb28ae80301ad.json
index be9f6082e..a017a719f 100644
--- a/cedar-integration-tests/corpus_tests/1cf81f57e323f996e54685db960cb28ae80301ad.json
+++ b/cedar-integration-tests/corpus_tests/1cf81f57e323f996e54685db960cb28ae80301ad.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1d0b0b533527c47fb8e910f2df27351817ca364b.json b/cedar-integration-tests/corpus_tests/1d0b0b533527c47fb8e910f2df27351817ca364b.json
index 0b808abbf..12bcaaf7f 100644
--- a/cedar-integration-tests/corpus_tests/1d0b0b533527c47fb8e910f2df27351817ca364b.json
+++ b/cedar-integration-tests/corpus_tests/1d0b0b533527c47fb8e910f2df27351817ca364b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::\":::8>\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\":::8>\"",
+      "principal": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "resource": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::\":::8>\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\":::8>\"",
+      "principal": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "resource": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::\":::8>\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\":::8>\"",
+      "principal": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "resource": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::\":::8>\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\":::8>\"",
+      "principal": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "resource": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::\":::8>\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\":::8>\"",
+      "principal": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "resource": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::\":::8>\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\":::8>\"",
+      "principal": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "resource": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::\":::8>\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\":::8>\"",
+      "principal": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "resource": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1d316f9503f9b1bfbca657dac937d7ff65e1c357.json b/cedar-integration-tests/corpus_tests/1d316f9503f9b1bfbca657dac937d7ff65e1c357.json
index 208c58117..8b66f4ad0 100644
--- a/cedar-integration-tests/corpus_tests/1d316f9503f9b1bfbca657dac937d7ff65e1c357.json
+++ b/cedar-integration-tests/corpus_tests/1d316f9503f9b1bfbca657dac937d7ff65e1c357.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"m\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "m\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -84,9 +147,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1dbfb0d25adfd0ba48b9759273247ce82f8da3e5.json b/cedar-integration-tests/corpus_tests/1dbfb0d25adfd0ba48b9759273247ce82f8da3e5.json
index 0531fa015..95860df12 100644
--- a/cedar-integration-tests/corpus_tests/1dbfb0d25adfd0ba48b9759273247ce82f8da3e5.json
+++ b/cedar-integration-tests/corpus_tests/1dbfb0d25adfd0ba48b9759273247ce82f8da3e5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1dc0dbcb9b9121975d3398e1e6a2893b6361cbea.json b/cedar-integration-tests/corpus_tests/1dc0dbcb9b9121975d3398e1e6a2893b6361cbea.json
index 062394314..2b3c24fec 100644
--- a/cedar-integration-tests/corpus_tests/1dc0dbcb9b9121975d3398e1e6a2893b6361cbea.json
+++ b/cedar-integration-tests/corpus_tests/1dc0dbcb9b9121975d3398e1e6a2893b6361cbea.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1e0eee047b45a55f065f42609975d13466df1003.json b/cedar-integration-tests/corpus_tests/1e0eee047b45a55f065f42609975d13466df1003.json
index 7e2802a76..9ba5962c2 100644
--- a/cedar-integration-tests/corpus_tests/1e0eee047b45a55f065f42609975d13466df1003.json
+++ b/cedar-integration-tests/corpus_tests/1e0eee047b45a55f065f42609975d13466df1003.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast\\u{1}\\u{1}r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast\\u{1}\\u{1}r\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast\u0001\u0001r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast\u0001\u0001r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast\\u{1}\\u{1}r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast\\u{1}\\u{1}r\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast\u0001\u0001r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast\u0001\u0001r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast\\u{1}\\u{1}r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast\\u{1}\\u{1}r\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast\u0001\u0001r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast\u0001\u0001r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast\\u{1}\\u{1}r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast\\u{1}\\u{1}r\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast\u0001\u0001r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast\u0001\u0001r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast\\u{1}\\u{1}r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast\\u{1}\\u{1}r\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast\u0001\u0001r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast\u0001\u0001r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast\\u{1}\\u{1}r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast\\u{1}\\u{1}r\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast\u0001\u0001r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast\u0001\u0001r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast\\u{1}\\u{1}r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast\\u{1}\\u{1}r\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast\u0001\u0001r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast\u0001\u0001r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast\\u{1}\\u{1}r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast\\u{1}\\u{1}r\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast\u0001\u0001r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast\u0001\u0001r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1e2a004e023d395b498c548942b5706371bd5e58.json b/cedar-integration-tests/corpus_tests/1e2a004e023d395b498c548942b5706371bd5e58.json
index 50e93e4d2..107bc47a1 100644
--- a/cedar-integration-tests/corpus_tests/1e2a004e023d395b498c548942b5706371bd5e58.json
+++ b/cedar-integration-tests/corpus_tests/1e2a004e023d395b498c548942b5706371bd5e58.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "p6666666::r3a::\"\"",
-      "action": "p6666666::Action::\"action\"",
-      "resource": "p6666666::r3a::\"\"",
+      "principal": {
+        "type": "p6666666::r3a",
+        "id": ""
+      },
+      "resource": {
+        "type": "p6666666::r3a",
+        "id": ""
+      },
+      "action": {
+        "type": "p6666666::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "p6666666::r3a::\"\"",
-      "action": "p6666666::Action::\"action\"",
-      "resource": "p6666666::r3a::\"\"",
+      "principal": {
+        "type": "p6666666::r3a",
+        "id": ""
+      },
+      "resource": {
+        "type": "p6666666::r3a",
+        "id": ""
+      },
+      "action": {
+        "type": "p6666666::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "p6666666::r3a::\"\"",
-      "action": "p6666666::Action::\"action\"",
-      "resource": "p6666666::r3a::\"\"",
+      "principal": {
+        "type": "p6666666::r3a",
+        "id": ""
+      },
+      "resource": {
+        "type": "p6666666::r3a",
+        "id": ""
+      },
+      "action": {
+        "type": "p6666666::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "p6666666::r3a::\"\"",
-      "action": "p6666666::Action::\"action\"",
-      "resource": "p6666666::r3a::\"\"",
+      "principal": {
+        "type": "p6666666::r3a",
+        "id": ""
+      },
+      "resource": {
+        "type": "p6666666::r3a",
+        "id": ""
+      },
+      "action": {
+        "type": "p6666666::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "p6666666::r3a::\"\"",
-      "action": "p6666666::Action::\"action\"",
-      "resource": "p6666666::r3a::\"\"",
+      "principal": {
+        "type": "p6666666::r3a",
+        "id": ""
+      },
+      "resource": {
+        "type": "p6666666::r3a",
+        "id": ""
+      },
+      "action": {
+        "type": "p6666666::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "p6666666::r3a::\"\"",
-      "action": "p6666666::Action::\"action\"",
-      "resource": "p6666666::r3a::\"\"",
+      "principal": {
+        "type": "p6666666::r3a",
+        "id": ""
+      },
+      "resource": {
+        "type": "p6666666::r3a",
+        "id": ""
+      },
+      "action": {
+        "type": "p6666666::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "p6666666::r3a::\"\"",
-      "action": "p6666666::Action::\"action\"",
-      "resource": "p6666666::r3a::\"\"",
+      "principal": {
+        "type": "p6666666::r3a",
+        "id": ""
+      },
+      "resource": {
+        "type": "p6666666::r3a",
+        "id": ""
+      },
+      "action": {
+        "type": "p6666666::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "p6666666::r3a::\"\"",
-      "action": "p6666666::Action::\"action\"",
-      "resource": "p6666666::r3a::\"\"",
+      "principal": {
+        "type": "p6666666::r3a",
+        "id": ""
+      },
+      "resource": {
+        "type": "p6666666::r3a",
+        "id": ""
+      },
+      "action": {
+        "type": "p6666666::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1e303b58dcbee74c4827290d2f66cd4040b54e09.json b/cedar-integration-tests/corpus_tests/1e303b58dcbee74c4827290d2f66cd4040b54e09.json
index 76e8415fa..75feb2f11 100644
--- a/cedar-integration-tests/corpus_tests/1e303b58dcbee74c4827290d2f66cd4040b54e09.json
+++ b/cedar-integration-tests/corpus_tests/1e303b58dcbee74c4827290d2f66cd4040b54e09.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +28,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"(ff\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "(ff"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -29,8 +41,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"(ff\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "(ff"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -39,8 +54,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"(ff\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "(ff"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -49,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"(ff\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "(ff"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -59,8 +80,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"(ff\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "(ff"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -69,8 +93,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"(ff\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "(ff"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -79,8 +106,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"(ff\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "(ff"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1e380dedb574067e8fe1339c0f36c2c31fe2930e.json b/cedar-integration-tests/corpus_tests/1e380dedb574067e8fe1339c0f36c2c31fe2930e.json
index 019bf2468..1c9ec9147 100644
--- a/cedar-integration-tests/corpus_tests/1e380dedb574067e8fe1339c0f36c2c31fe2930e.json
+++ b/cedar-integration-tests/corpus_tests/1e380dedb574067e8fe1339c0f36c2c31fe2930e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1e5a9bd1fc711d24a412baf0ab811a2052bb4e9b.json b/cedar-integration-tests/corpus_tests/1e5a9bd1fc711d24a412baf0ab811a2052bb4e9b.json
index ab840a526..d2995f4ed 100644
--- a/cedar-integration-tests/corpus_tests/1e5a9bd1fc711d24a412baf0ab811a2052bb4e9b.json
+++ b/cedar-integration-tests/corpus_tests/1e5a9bd1fc711d24a412baf0ab811a2052bb4e9b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "m::a::\"\\0\\0\\0\\0\\0\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "m::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "m::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "m::a::\"l/\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "m::a",
+        "id": "l/"
+      },
+      "resource": {
+        "type": "m::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "m::a::\"\\0\\0\\0\\0\\0\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "m::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "m::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "m::a::\"\\0\\0\\0\\0\\0\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "m::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "m::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "m::a::\"\\0\\0\\0\\0\\0\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "m::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "m::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "m::a::\"\\0\\0\\0\\0\\0\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "m::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "m::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "m::a::\"\\0\\0\\0\\0\\0\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "m::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "m::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "m::a::\"\\0\\0\\0\\0\\0\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "m::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "m::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1e62fd9578557687c21fad0da1757d106731d0bb.json b/cedar-integration-tests/corpus_tests/1e62fd9578557687c21fad0da1757d106731d0bb.json
index 40a1852bd..18d674ad7 100644
--- a/cedar-integration-tests/corpus_tests/1e62fd9578557687c21fad0da1757d106731d0bb.json
+++ b/cedar-integration-tests/corpus_tests/1e62fd9578557687c21fad0da1757d106731d0bb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"#z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{7f}\\u{1}\\u{1}\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "#z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0001\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\\u{1}\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{7f}\\u{1}\\u{1}\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0001\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\\u{1}\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{7f}\\u{1}\\u{1}\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0001\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\\u{1}\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{7f}\\u{1}\\u{1}\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0001\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\\u{1}\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{7f}\\u{1}\\u{1}\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0001\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\\u{1}\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{7f}\\u{1}\\u{1}\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0001\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\\u{1}\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{7f}\\u{1}\\u{1}\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0001\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\\u{1}\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{7f}\\u{1}\\u{1}\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0001\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1e72151e17c381a5fa3d8934a5ba360339968f04.json b/cedar-integration-tests/corpus_tests/1e72151e17c381a5fa3d8934a5ba360339968f04.json
index 0137d3522..1f77d53d2 100644
--- a/cedar-integration-tests/corpus_tests/1e72151e17c381a5fa3d8934a5ba360339968f04.json
+++ b/cedar-integration-tests/corpus_tests/1e72151e17c381a5fa3d8934a5ba360339968f04.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\0\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0000\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -84,9 +147,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1e92f99bd2bca10ab16f9f78768fdd849c1f930a.json b/cedar-integration-tests/corpus_tests/1e92f99bd2bca10ab16f9f78768fdd849c1f930a.json
index 9bd19c635..f4ccbddd7 100644
--- a/cedar-integration-tests/corpus_tests/1e92f99bd2bca10ab16f9f78768fdd849c1f930a.json
+++ b/cedar-integration-tests/corpus_tests/1e92f99bd2bca10ab16f9f78768fdd849c1f930a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1eac86e06597f6e0416b884fc15a81bffa608603.json b/cedar-integration-tests/corpus_tests/1eac86e06597f6e0416b884fc15a81bffa608603.json
index 72a94564a..ea070c0fd 100644
--- a/cedar-integration-tests/corpus_tests/1eac86e06597f6e0416b884fc15a81bffa608603.json
+++ b/cedar-integration-tests/corpus_tests/1eac86e06597f6e0416b884fc15a81bffa608603.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0(\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0(\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000(\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000(\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1ecbef5a05ccc64ef430dc86f6dc9a6254170eaf.json b/cedar-integration-tests/corpus_tests/1ecbef5a05ccc64ef430dc86f6dc9a6254170eaf.json
index 5b09113d7..a7ac31496 100644
--- a/cedar-integration-tests/corpus_tests/1ecbef5a05ccc64ef430dc86f6dc9a6254170eaf.json
+++ b/cedar-integration-tests/corpus_tests/1ecbef5a05ccc64ef430dc86f6dc9a6254170eaf.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::\"\"",
-      "action": "Action::\"RRRRRRRVRR\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "RRRRRRRVRR"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::\"\"",
-      "action": "Action::\"RRRRRRRVRR\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "RRRRRRRVRR"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::\"\"",
-      "action": "Action::\"RRRRRRRVRR\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "RRRRRRRVRR"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::\"\"",
-      "action": "Action::\"RRRRRRRVRR\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "RRRRRRRVRR"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::\"\"",
-      "action": "Action::\"RRRRRRRVRR\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "RRRRRRRVRR"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::\"\"",
-      "action": "Action::\"RRRRRRRVRR\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "RRRRRRRVRR"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::\"\"",
-      "action": "Action::\"RRRRRRRVRR\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "RRRRRRRVRR"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::\"\"",
-      "action": "Action::\"RRRRRRRVRR\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "RRRRRRRVRR"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1ede63b6ddd9405b01a3d922b3999147beac2fa9.json b/cedar-integration-tests/corpus_tests/1ede63b6ddd9405b01a3d922b3999147beac2fa9.json
index 5fcf2c733..9864e3aed 100644
--- a/cedar-integration-tests/corpus_tests/1ede63b6ddd9405b01a3d922b3999147beac2fa9.json
+++ b/cedar-integration-tests/corpus_tests/1ede63b6ddd9405b01a3d922b3999147beac2fa9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1eeb056842fdd78326d60a76db6c9ac2ca096d4a.json b/cedar-integration-tests/corpus_tests/1eeb056842fdd78326d60a76db6c9ac2ca096d4a.json
index c4164a197..0d7ca1b9f 100644
--- a/cedar-integration-tests/corpus_tests/1eeb056842fdd78326d60a76db6c9ac2ca096d4a.json
+++ b/cedar-integration-tests/corpus_tests/1eeb056842fdd78326d60a76db6c9ac2ca096d4a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1f041b1bc18a6b2b3f1ec00b9781f18a1dfe9dd3.json b/cedar-integration-tests/corpus_tests/1f041b1bc18a6b2b3f1ec00b9781f18a1dfe9dd3.json
index 8e5f05945..400e086bc 100644
--- a/cedar-integration-tests/corpus_tests/1f041b1bc18a6b2b3f1ec00b9781f18a1dfe9dd3.json
+++ b/cedar-integration-tests/corpus_tests/1f041b1bc18a6b2b3f1ec00b9781f18a1dfe9dd3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ff\\0\\0\\0&\\u{3}\\0\\0\\0\\0r\\0\\0\\u{3}\\0ff\\0\\0&(\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\\0\\0&\\u{3}\\0\\0\\0\\0r\\0\\0\\u{3}\\0ff\\0\\0&(\\0R\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000\u0000\u0000&\u0003\u0000\u0000\u0000\u0000r\u0000\u0000\u0003\u0000ff\u0000\u0000&(\u0000R"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000\u0000\u0000&\u0003\u0000\u0000\u0000\u0000r\u0000\u0000\u0003\u0000ff\u0000\u0000&(\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ff\\0\\0\\0&\\u{3}\\0\\0\\0\\0r\\0\\0\\u{3}\\0ff\\0\\0&(\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\\0\\0&\\u{3}\\0\\0\\0\\0r\\0\\0\\u{3}\\0ff\\0\\0&(\\0R\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000\u0000\u0000&\u0003\u0000\u0000\u0000\u0000r\u0000\u0000\u0003\u0000ff\u0000\u0000&(\u0000R"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000\u0000\u0000&\u0003\u0000\u0000\u0000\u0000r\u0000\u0000\u0003\u0000ff\u0000\u0000&(\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"ff\\0\\0\\0&\\u{3}\\0\\0\\0\\0r\\0\\0\\u{3}\\0ff\\0\\0&(\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\\0\\0&\\u{3}\\0\\0\\0\\0r\\0\\0\\u{3}\\0ff\\0\\0&(\\0R\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000\u0000\u0000&\u0003\u0000\u0000\u0000\u0000r\u0000\u0000\u0003\u0000ff\u0000\u0000&(\u0000R"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000\u0000\u0000&\u0003\u0000\u0000\u0000\u0000r\u0000\u0000\u0003\u0000ff\u0000\u0000&(\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ff\\0\\0\\0&\\u{3}\\0\\0\\0\\0r\\0\\0\\u{3}\\0ff\\0\\0&(\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\\0\\0&\\u{3}\\0\\0\\0\\0r\\0\\0\\u{3}\\0ff\\0\\0&(\\0R\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000\u0000\u0000&\u0003\u0000\u0000\u0000\u0000r\u0000\u0000\u0003\u0000ff\u0000\u0000&(\u0000R"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000\u0000\u0000&\u0003\u0000\u0000\u0000\u0000r\u0000\u0000\u0003\u0000ff\u0000\u0000&(\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ff\\0\\0\\0&\\u{3}\\0\\0\\0\\0r\\0\\0\\u{3}\\0ff\\0\\0&(\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\\0\\0&\\u{3}\\0\\0\\0\\0r\\0\\0\\u{3}\\0ff\\0\\0&(\\0R\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000\u0000\u0000&\u0003\u0000\u0000\u0000\u0000r\u0000\u0000\u0003\u0000ff\u0000\u0000&(\u0000R"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000\u0000\u0000&\u0003\u0000\u0000\u0000\u0000r\u0000\u0000\u0003\u0000ff\u0000\u0000&(\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ff\\0\\0\\0&\\u{3}\\0\\0\\0\\0r\\0\\0\\u{3}\\0ff\\0\\0&(\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\\0\\0&\\u{3}\\0\\0\\0\\0r\\0\\0\\u{3}\\0ff\\0\\0&(\\0R\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000\u0000\u0000&\u0003\u0000\u0000\u0000\u0000r\u0000\u0000\u0003\u0000ff\u0000\u0000&(\u0000R"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000\u0000\u0000&\u0003\u0000\u0000\u0000\u0000r\u0000\u0000\u0003\u0000ff\u0000\u0000&(\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ff\\0\\0\\0&\\u{3}\\0\\0\\0\\0r\\0\\0\\u{3}\\0ff\\0\\0&(\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\\0\\0&\\u{3}\\0\\0\\0\\0r\\0\\0\\u{3}\\0ff\\0\\0&(\\0R\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000\u0000\u0000&\u0003\u0000\u0000\u0000\u0000r\u0000\u0000\u0003\u0000ff\u0000\u0000&(\u0000R"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000\u0000\u0000&\u0003\u0000\u0000\u0000\u0000r\u0000\u0000\u0003\u0000ff\u0000\u0000&(\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ff\\0\\0\\0&\\u{3}\\0\\0\\0\\0r\\0\\0\\u{3}\\0ff\\0\\0&(\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\\0\\0&\\u{3}\\0\\0\\0\\0r\\0\\0\\u{3}\\0ff\\0\\0&(\\0R\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000\u0000\u0000&\u0003\u0000\u0000\u0000\u0000r\u0000\u0000\u0003\u0000ff\u0000\u0000&(\u0000R"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000\u0000\u0000&\u0003\u0000\u0000\u0000\u0000r\u0000\u0000\u0003\u0000ff\u0000\u0000&(\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1f2be35f573d7d1955f3a95af4f940cc6f4fe290.json b/cedar-integration-tests/corpus_tests/1f2be35f573d7d1955f3a95af4f940cc6f4fe290.json
index 2236bf406..201824a4e 100644
--- a/cedar-integration-tests/corpus_tests/1f2be35f573d7d1955f3a95af4f940cc6f4fe290.json
+++ b/cedar-integration-tests/corpus_tests/1f2be35f573d7d1955f3a95af4f940cc6f4fe290.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "n::g::F::r::a::\"\"",
-      "action": "n::g::F::r::Action::\"action\"",
-      "resource": "n::g::F::r::a::\"\"",
+      "principal": {
+        "type": "n::g::F::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "n::g::F::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "n::g::F::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "n::g::F::r::a::\"\"",
-      "action": "n::g::F::r::Action::\"action\"",
-      "resource": "n::g::F::r::a::\"\"",
+      "principal": {
+        "type": "n::g::F::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "n::g::F::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "n::g::F::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "n::g::F::r::a::\"\"",
-      "action": "n::g::F::r::Action::\"action\"",
-      "resource": "n::g::F::r::a::\"\"",
+      "principal": {
+        "type": "n::g::F::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "n::g::F::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "n::g::F::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "n::g::F::r::a::\"\"",
-      "action": "n::g::F::r::Action::\"action\"",
-      "resource": "n::g::F::r::a::\"\"",
+      "principal": {
+        "type": "n::g::F::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "n::g::F::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "n::g::F::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "n::g::F::r::a::\"\"",
-      "action": "n::g::F::r::Action::\"action\"",
-      "resource": "n::g::F::r::a::\"\"",
+      "principal": {
+        "type": "n::g::F::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "n::g::F::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "n::g::F::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "n::g::F::r::a::\"\"",
-      "action": "n::g::F::r::Action::\"action\"",
-      "resource": "n::g::F::r::a::\"\"",
+      "principal": {
+        "type": "n::g::F::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "n::g::F::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "n::g::F::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "n::g::F::r::a::\"\"",
-      "action": "n::g::F::r::Action::\"action\"",
-      "resource": "n::g::F::r::a::\"\"",
+      "principal": {
+        "type": "n::g::F::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "n::g::F::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "n::g::F::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "n::g::F::r::a::\"\"",
-      "action": "n::g::F::r::Action::\"action\"",
-      "resource": "n::g::F::r::a::\"\"",
+      "principal": {
+        "type": "n::g::F::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "n::g::F::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "n::g::F::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1f36c9706239dd78335e11047422d3beb0ca799b.json b/cedar-integration-tests/corpus_tests/1f36c9706239dd78335e11047422d3beb0ca799b.json
index ab70a9d6b..955faa5d8 100644
--- a/cedar-integration-tests/corpus_tests/1f36c9706239dd78335e11047422d3beb0ca799b.json
+++ b/cedar-integration-tests/corpus_tests/1f36c9706239dd78335e11047422d3beb0ca799b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": false
       },
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": false
       },
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": false
       },
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": false
       },
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": false
       },
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": false
       },
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": false
       },
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": false
       },
diff --git a/cedar-integration-tests/corpus_tests/1f4f3648c4747c20ca5a99a1859e68a8feac3c1a.json b/cedar-integration-tests/corpus_tests/1f4f3648c4747c20ca5a99a1859e68a8feac3c1a.json
index 3acc92292..263a0368e 100644
--- a/cedar-integration-tests/corpus_tests/1f4f3648c4747c20ca5a99a1859e68a8feac3c1a.json
+++ b/cedar-integration-tests/corpus_tests/1f4f3648c4747c20ca5a99a1859e68a8feac3c1a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1f644ac1deaec0d3a28c91865339f159bc69bb89.json b/cedar-integration-tests/corpus_tests/1f644ac1deaec0d3a28c91865339f159bc69bb89.json
index 8d1483efb..a0aa25404 100644
--- a/cedar-integration-tests/corpus_tests/1f644ac1deaec0d3a28c91865339f159bc69bb89.json
+++ b/cedar-integration-tests/corpus_tests/1f644ac1deaec0d3a28c91865339f159bc69bb89.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "B::a::\"f\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"f\"",
+      "principal": {
+        "type": "B::a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "f"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "B::a::\"f\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"f\"",
+      "principal": {
+        "type": "B::a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "f"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "B::a::\"f\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"f\"",
+      "principal": {
+        "type": "B::a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "f"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "B::a::\"f\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"f\"",
+      "principal": {
+        "type": "B::a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "f"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "B::a::\"f\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"f\"",
+      "principal": {
+        "type": "B::a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "f"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "B::a::\"f\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"f\"",
+      "principal": {
+        "type": "B::a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "f"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "B::a::\"f\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"f\"",
+      "principal": {
+        "type": "B::a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "f"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "B::a::\"f\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"f\"",
+      "principal": {
+        "type": "B::a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "f"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1f85d214b5fa238610b6e3b5e0376f9e30de9220.json b/cedar-integration-tests/corpus_tests/1f85d214b5fa238610b6e3b5e0376f9e30de9220.json
index d812e07b0..b747dc9c6 100644
--- a/cedar-integration-tests/corpus_tests/1f85d214b5fa238610b6e3b5e0376f9e30de9220.json
+++ b/cedar-integration-tests/corpus_tests/1f85d214b5fa238610b6e3b5e0376f9e30de9220.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"5041$\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "5041$\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1f9477303c48393a52f4d9b02581a9c8d70b7b4e.json b/cedar-integration-tests/corpus_tests/1f9477303c48393a52f4d9b02581a9c8d70b7b4e.json
index 2717e3e51..b02c8cdc9 100644
--- a/cedar-integration-tests/corpus_tests/1f9477303c48393a52f4d9b02581a9c8d70b7b4e.json
+++ b/cedar-integration-tests/corpus_tests/1f9477303c48393a52f4d9b02581a9c8d70b7b4e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "FE333333": "",
         "K": "",
@@ -23,9 +32,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "FE333333": "",
         "K": "",
@@ -40,9 +58,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "FE333333": "",
         "K": "",
@@ -57,9 +84,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "FE333333": "",
         "K": "",
@@ -74,9 +110,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "FE333333": "",
         "K": "",
@@ -91,9 +136,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "FE333333": "",
         "K": "",
@@ -108,9 +162,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "FE333333": "",
         "K": "",
@@ -125,9 +188,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "FE333333": "",
         "K": "",
diff --git a/cedar-integration-tests/corpus_tests/1fabfd4adae9475431f26acad714a64fb10bb048.json b/cedar-integration-tests/corpus_tests/1fabfd4adae9475431f26acad714a64fb10bb048.json
index 01fdfcc52..49717ce56 100644
--- a/cedar-integration-tests/corpus_tests/1fabfd4adae9475431f26acad714a64fb10bb048.json
+++ b/cedar-integration-tests/corpus_tests/1fabfd4adae9475431f26acad714a64fb10bb048.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"5043$\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "5043$\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/1fda47630d60a4aa8f8e54b61d736d8952c4a7f9.json b/cedar-integration-tests/corpus_tests/1fda47630d60a4aa8f8e54b61d736d8952c4a7f9.json
index 6214c8d3e..ef82557a0 100644
--- a/cedar-integration-tests/corpus_tests/1fda47630d60a4aa8f8e54b61d736d8952c4a7f9.json
+++ b/cedar-integration-tests/corpus_tests/1fda47630d60a4aa8f8e54b61d736d8952c4a7f9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "ZJJJ::\"RRRR\\u{1}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "ZJJJ::\"RRRR\\u{1}\\0\"",
+      "principal": {
+        "type": "ZJJJ",
+        "id": "RRRR\u0001\u0000"
+      },
+      "resource": {
+        "type": "ZJJJ",
+        "id": "RRRR\u0001\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "ZJJJ::\"RRRR\\u{1}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "ZJJJ::\"RRRR\\u{1}\\0\"",
+      "principal": {
+        "type": "ZJJJ",
+        "id": "RRRR\u0001\u0000"
+      },
+      "resource": {
+        "type": "ZJJJ",
+        "id": "RRRR\u0001\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "ZJJJ::\"RRRR\\u{1}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "ZJJJ::\"RRRR\\u{1}\\0\"",
+      "principal": {
+        "type": "ZJJJ",
+        "id": "RRRR\u0001\u0000"
+      },
+      "resource": {
+        "type": "ZJJJ",
+        "id": "RRRR\u0001\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "ZJJJ::\"RRRR\\u{1}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "ZJJJ::\"RRRR\\u{1}\\0\"",
+      "principal": {
+        "type": "ZJJJ",
+        "id": "RRRR\u0001\u0000"
+      },
+      "resource": {
+        "type": "ZJJJ",
+        "id": "RRRR\u0001\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "ZJJJ::\"RRRR\\u{1}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "ZJJJ::\"RRRR\\u{1}\\0\"",
+      "principal": {
+        "type": "ZJJJ",
+        "id": "RRRR\u0001\u0000"
+      },
+      "resource": {
+        "type": "ZJJJ",
+        "id": "RRRR\u0001\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "ZJJJ::\"RRRR\\u{1}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "ZJJJ::\"RRRR\\u{1}\\0\"",
+      "principal": {
+        "type": "ZJJJ",
+        "id": "RRRR\u0001\u0000"
+      },
+      "resource": {
+        "type": "ZJJJ",
+        "id": "RRRR\u0001\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "ZJJJ::\"RRRR\\u{1}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "ZJJJ::\"RRRR\\u{1}\\0\"",
+      "principal": {
+        "type": "ZJJJ",
+        "id": "RRRR\u0001\u0000"
+      },
+      "resource": {
+        "type": "ZJJJ",
+        "id": "RRRR\u0001\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "ZJJJ::\"RRRR\\u{1}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "ZJJJ::\"RRRR\\u{1}\\0\"",
+      "principal": {
+        "type": "ZJJJ",
+        "id": "RRRR\u0001\u0000"
+      },
+      "resource": {
+        "type": "ZJJJ",
+        "id": "RRRR\u0001\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/1ffe07c987be353018d565e8e6efd95c7c100ef5.json b/cedar-integration-tests/corpus_tests/1ffe07c987be353018d565e8e6efd95c7c100ef5.json
index 07d26e0bf..297e5ab0e 100644
--- a/cedar-integration-tests/corpus_tests/1ffe07c987be353018d565e8e6efd95c7c100ef5.json
+++ b/cedar-integration-tests/corpus_tests/1ffe07c987be353018d565e8e6efd95c7c100ef5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/20177d26bdaecebb3d618c30dd7055ed9373eab2.json b/cedar-integration-tests/corpus_tests/20177d26bdaecebb3d618c30dd7055ed9373eab2.json
index 1a509abb3..7eba050ba 100644
--- a/cedar-integration-tests/corpus_tests/20177d26bdaecebb3d618c30dd7055ed9373eab2.json
+++ b/cedar-integration-tests/corpus_tests/20177d26bdaecebb3d618c30dd7055ed9373eab2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/2092fbd08967045da86af33b2147cb4305f65ca2.json b/cedar-integration-tests/corpus_tests/2092fbd08967045da86af33b2147cb4305f65ca2.json
index 6b24b250c..f02b8a027 100644
--- a/cedar-integration-tests/corpus_tests/2092fbd08967045da86af33b2147cb4305f65ca2.json
+++ b/cedar-integration-tests/corpus_tests/2092fbd08967045da86af33b2147cb4305f65ca2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Kfhhhhh::\"\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Kfhhhhh::\"\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Kfhhhhh::\"\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Kfhhhhh::\"\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Kfhhhhh::\"\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Kfhhhhh::\"\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Kfhhhhh::\"\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Kfhhhhh::\"\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\\u{7}\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007"
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/20d8b3c7fb59a601bc5818c21286e9e25742e0b5.json b/cedar-integration-tests/corpus_tests/20d8b3c7fb59a601bc5818c21286e9e25742e0b5.json
index 2b1e86f2e..c2fc28848 100644
--- a/cedar-integration-tests/corpus_tests/20d8b3c7fb59a601bc5818c21286e9e25742e0b5.json
+++ b/cedar-integration-tests/corpus_tests/20d8b3c7fb59a601bc5818c21286e9e25742e0b5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0$%%\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0$%%\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000$%%\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000$%%\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0$%%\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000$%%\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0$%%\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0$%%\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000$%%\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000$%%\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0$%%\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0$%%\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000$%%\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000$%%\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0$%%\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0$%%\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000$%%\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000$%%\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0$%%\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0$%%\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000$%%\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000$%%\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0$%%\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0$%%\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000$%%\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000$%%\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0$%%\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0$%%\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000$%%\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000$%%\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/20dd5f5214b3fa3fe3e118070ab74295dd0c9fd7.json b/cedar-integration-tests/corpus_tests/20dd5f5214b3fa3fe3e118070ab74295dd0c9fd7.json
index 4546010aa..52dd1c9f8 100644
--- a/cedar-integration-tests/corpus_tests/20dd5f5214b3fa3fe3e118070ab74295dd0c9fd7.json
+++ b/cedar-integration-tests/corpus_tests/20dd5f5214b3fa3fe3e118070ab74295dd0c9fd7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{1a}0l0i\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u001a0l0i"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{1a}0l0i\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1a}0l0i\"",
+      "principal": {
+        "type": "a",
+        "id": "\u001a0l0i"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u001a0l0i"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{1a}0l0i\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1a}0l0i\"",
+      "principal": {
+        "type": "a",
+        "id": "\u001a0l0i"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u001a0l0i"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{1a}0l0i\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1a}0l0i\"",
+      "principal": {
+        "type": "a",
+        "id": "\u001a0l0i"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u001a0l0i"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{1a}0l0i\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1a}0l0i\"",
+      "principal": {
+        "type": "a",
+        "id": "\u001a0l0i"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u001a0l0i"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{1a}0l0i\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1a}0l0i\"",
+      "principal": {
+        "type": "a",
+        "id": "\u001a0l0i"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u001a0l0i"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{1a}0l0i\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1a}0l0i\"",
+      "principal": {
+        "type": "a",
+        "id": "\u001a0l0i"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u001a0l0i"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{1a}0l0i\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1a}0l0i\"",
+      "principal": {
+        "type": "a",
+        "id": "\u001a0l0i"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u001a0l0i"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/21090bbf8422f2532c15c37a5f34dd6c28814fb8.json b/cedar-integration-tests/corpus_tests/21090bbf8422f2532c15c37a5f34dd6c28814fb8.json
index 6220b1325..bce330765 100644
--- a/cedar-integration-tests/corpus_tests/21090bbf8422f2532c15c37a5f34dd6c28814fb8.json
+++ b/cedar-integration-tests/corpus_tests/21090bbf8422f2532c15c37a5f34dd6c28814fb8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/211dc14823e42409dac2149cd417c42a96ad49e1.json b/cedar-integration-tests/corpus_tests/211dc14823e42409dac2149cd417c42a96ad49e1.json
index 0d7a37c01..5483dee9b 100644
--- a/cedar-integration-tests/corpus_tests/211dc14823e42409dac2149cd417c42a96ad49e1.json
+++ b/cedar-integration-tests/corpus_tests/211dc14823e42409dac2149cd417c42a96ad49e1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0::*::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0::*::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::*::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::*::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0::*::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0::*::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::*::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::*::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0::*::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0::*::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::*::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::*::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0::*::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0::*::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::*::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::*::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0::*::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0::*::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::*::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::*::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0::*::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0::*::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::*::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::*::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0::*::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0::*::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::*::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::*::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0::*::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0::*::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::*::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::*::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/21258d5fc152aec138c91355f29f55459971ad7a.json b/cedar-integration-tests/corpus_tests/21258d5fc152aec138c91355f29f55459971ad7a.json
index 95f6c0378..38bae5629 100644
--- a/cedar-integration-tests/corpus_tests/21258d5fc152aec138c91355f29f55459971ad7a.json
+++ b/cedar-integration-tests/corpus_tests/21258d5fc152aec138c91355f29f55459971ad7a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\t\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\t\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\t\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\t\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\t\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\t\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\t\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\t\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\t\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\t\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\t\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\t\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\t\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\t\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\t\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/21a4f15aa3b7c011ba1e7c57d79d6b131f9f64a3.json b/cedar-integration-tests/corpus_tests/21a4f15aa3b7c011ba1e7c57d79d6b131f9f64a3.json
index 652d60ad1..ea408fe25 100644
--- a/cedar-integration-tests/corpus_tests/21a4f15aa3b7c011ba1e7c57d79d6b131f9f64a3.json
+++ b/cedar-integration-tests/corpus_tests/21a4f15aa3b7c011ba1e7c57d79d6b131f9f64a3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/21b6650d46522897c4be29fc10851c277273823e.json b/cedar-integration-tests/corpus_tests/21b6650d46522897c4be29fc10851c277273823e.json
index a43857c09..bcdb3c4ed 100644
--- a/cedar-integration-tests/corpus_tests/21b6650d46522897c4be29fc10851c277273823e.json
+++ b/cedar-integration-tests/corpus_tests/21b6650d46522897c4be29fc10851c277273823e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"::\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"::\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"::\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"::\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"::\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"::\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"::\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"::\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/21c71f1bcb3e7db91651dda47425d30e8fa717c0.json b/cedar-integration-tests/corpus_tests/21c71f1bcb3e7db91651dda47425d30e8fa717c0.json
index 6878c5a1c..ded657fed 100644
--- a/cedar-integration-tests/corpus_tests/21c71f1bcb3e7db91651dda47425d30e8fa717c0.json
+++ b/cedar-integration-tests/corpus_tests/21c71f1bcb3e7db91651dda47425d30e8fa717c0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/221b0697d387aa2a2b379ef1ed3c46c03dac89cb.json b/cedar-integration-tests/corpus_tests/221b0697d387aa2a2b379ef1ed3c46c03dac89cb.json
index 6a87e6c52..35680d53b 100644
--- a/cedar-integration-tests/corpus_tests/221b0697d387aa2a2b379ef1ed3c46c03dac89cb.json
+++ b/cedar-integration-tests/corpus_tests/221b0697d387aa2a2b379ef1ed3c46c03dac89cb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "P": false,
         "r": []
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "P": false,
         "r": []
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "P": false,
         "r": []
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "P": false,
         "r": []
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "P": false,
         "r": []
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "P": false,
         "r": []
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "P": false,
         "r": []
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "P": false,
         "r": []
diff --git a/cedar-integration-tests/corpus_tests/222037b53e5039a2617c7dc68486cb12cc43e43e.json b/cedar-integration-tests/corpus_tests/222037b53e5039a2617c7dc68486cb12cc43e43e.json
index 00e6a03a1..bbb6c4901 100644
--- a/cedar-integration-tests/corpus_tests/222037b53e5039a2617c7dc68486cb12cc43e43e.json
+++ b/cedar-integration-tests/corpus_tests/222037b53e5039a2617c7dc68486cb12cc43e43e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"i\\000000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"i\\000000\"",
+      "principal": {
+        "type": "a",
+        "id": "i\u000000000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "i\u000000000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"8\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"i\\000000\"",
+      "principal": {
+        "type": "a",
+        "id": "8"
+      },
+      "resource": {
+        "type": "a",
+        "id": "i\u000000000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"i\\000000\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "i\u000000000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"i\\000000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"i\\000000\"",
+      "principal": {
+        "type": "a",
+        "id": "i\u000000000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "i\u000000000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"i\\000000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"i\\000000\"",
+      "principal": {
+        "type": "a",
+        "id": "i\u000000000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "i\u000000000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"i\\000000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"i\\000000\"",
+      "principal": {
+        "type": "a",
+        "id": "i\u000000000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "i\u000000000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"i\\000000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"i\\000000\"",
+      "principal": {
+        "type": "a",
+        "id": "i\u000000000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "i\u000000000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"i\\000000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"i\\000000\"",
+      "principal": {
+        "type": "a",
+        "id": "i\u000000000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "i\u000000000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/22207785df28376a2976a62ec8185f2b73df5c07.json b/cedar-integration-tests/corpus_tests/22207785df28376a2976a62ec8185f2b73df5c07.json
index d655fb92f..a7ab52b90 100644
--- a/cedar-integration-tests/corpus_tests/22207785df28376a2976a62ec8185f2b73df5c07.json
+++ b/cedar-integration-tests/corpus_tests/22207785df28376a2976a62ec8185f2b73df5c07.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/2239b21f34c47ce718869777f6bec7341de7e0b8.json b/cedar-integration-tests/corpus_tests/2239b21f34c47ce718869777f6bec7341de7e0b8.json
index b4b458995..8babe120e 100644
--- a/cedar-integration-tests/corpus_tests/2239b21f34c47ce718869777f6bec7341de7e0b8.json
+++ b/cedar-integration-tests/corpus_tests/2239b21f34c47ce718869777f6bec7341de7e0b8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::Fwww::r::A::\"\"",
-      "action": "r::Fwww::r::Action::\"action\"",
-      "resource": "r::Fwww::r::qiw8www1::\"\"",
+      "principal": {
+        "type": "r::Fwww::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Fwww::r::qiw8www1",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Fwww::r::Action",
+        "id": "action"
+      },
       "context": {
         "E": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::Fwww::r::A::\"\"",
-      "action": "r::Fwww::r::Action::\"action\"",
-      "resource": "r::Fwww::r::qiw8www1::\"\"",
+      "principal": {
+        "type": "r::Fwww::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Fwww::r::qiw8www1",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Fwww::r::Action",
+        "id": "action"
+      },
       "context": {
         "E": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::Fwww::r::A::\"\"",
-      "action": "r::Fwww::r::Action::\"action\"",
-      "resource": "r::Fwww::r::qiw8www1::\"\"",
+      "principal": {
+        "type": "r::Fwww::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Fwww::r::qiw8www1",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Fwww::r::Action",
+        "id": "action"
+      },
       "context": {
         "E": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::Fwww::r::A::\"\"",
-      "action": "r::Fwww::r::Action::\"action\"",
-      "resource": "r::Fwww::r::qiw8www1::\"\"",
+      "principal": {
+        "type": "r::Fwww::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Fwww::r::qiw8www1",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Fwww::r::Action",
+        "id": "action"
+      },
       "context": {
         "E": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::Fwww::r::A::\"\"",
-      "action": "r::Fwww::r::Action::\"action\"",
-      "resource": "r::Fwww::r::qiw8www1::\"\"",
+      "principal": {
+        "type": "r::Fwww::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Fwww::r::qiw8www1",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Fwww::r::Action",
+        "id": "action"
+      },
       "context": {
         "E": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::Fwww::r::A::\"\"",
-      "action": "r::Fwww::r::Action::\"action\"",
-      "resource": "r::Fwww::r::qiw8www1::\"\"",
+      "principal": {
+        "type": "r::Fwww::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Fwww::r::qiw8www1",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Fwww::r::Action",
+        "id": "action"
+      },
       "context": {
         "E": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::Fwww::r::A::\"\"",
-      "action": "r::Fwww::r::Action::\"action\"",
-      "resource": "r::Fwww::r::qiw8www1::\"\"",
+      "principal": {
+        "type": "r::Fwww::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Fwww::r::qiw8www1",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Fwww::r::Action",
+        "id": "action"
+      },
       "context": {
         "E": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::Fwww::r::A::\"\"",
-      "action": "r::Fwww::r::Action::\"action\"",
-      "resource": "r::Fwww::r::qiw8www1::\"\"",
+      "principal": {
+        "type": "r::Fwww::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Fwww::r::qiw8www1",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Fwww::r::Action",
+        "id": "action"
+      },
       "context": {
         "E": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/226abd401950859a4fc3fe5f82182ed5cd403d17.json b/cedar-integration-tests/corpus_tests/226abd401950859a4fc3fe5f82182ed5cd403d17.json
index 80e703e69..77fb2b8d1 100644
--- a/cedar-integration-tests/corpus_tests/226abd401950859a4fc3fe5f82182ed5cd403d17.json
+++ b/cedar-integration-tests/corpus_tests/226abd401950859a4fc3fe5f82182ed5cd403d17.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}1\\u{1b}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\\u{1b}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021\u001b\"\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021\u001b\"\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}1\\u{1b}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\\u{1b}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021\u001b\"\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021\u001b\"\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}1\\u{1b}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021\u001b\"\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}1\\u{1b}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\\u{1b}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021\u001b\"\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021\u001b\"\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}1\\u{1b}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\\u{1b}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021\u001b\"\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021\u001b\"\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}1\\u{1b}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\\u{1b}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021\u001b\"\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021\u001b\"\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}1\\u{1b}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\\u{1b}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021\u001b\"\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021\u001b\"\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}1\\u{1b}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\\u{1b}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021\u001b\"\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021\u001b\"\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/22779e33ffcbb24ecc0309855ce390a342c7cbb1.json b/cedar-integration-tests/corpus_tests/22779e33ffcbb24ecc0309855ce390a342c7cbb1.json
index 112e11eb8..9dabe460c 100644
--- a/cedar-integration-tests/corpus_tests/22779e33ffcbb24ecc0309855ce390a342c7cbb1.json
+++ b/cedar-integration-tests/corpus_tests/22779e33ffcbb24ecc0309855ce390a342c7cbb1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r333::r::r::uH::\"\"",
-      "action": "r333::r::r::Action::\"action\"",
-      "resource": "r333::r::r::uH::\"\"",
+      "principal": {
+        "type": "r333::r::r::uH",
+        "id": ""
+      },
+      "resource": {
+        "type": "r333::r::r::uH",
+        "id": ""
+      },
+      "action": {
+        "type": "r333::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r333::r::r::uH::\"\"",
-      "action": "r333::r::r::Action::\"action\"",
-      "resource": "r333::r::r::uH::\"\"",
+      "principal": {
+        "type": "r333::r::r::uH",
+        "id": ""
+      },
+      "resource": {
+        "type": "r333::r::r::uH",
+        "id": ""
+      },
+      "action": {
+        "type": "r333::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r333::r::r::uH::\"\"",
-      "action": "r333::r::r::Action::\"action\"",
-      "resource": "r333::r::r::uH::\"\"",
+      "principal": {
+        "type": "r333::r::r::uH",
+        "id": ""
+      },
+      "resource": {
+        "type": "r333::r::r::uH",
+        "id": ""
+      },
+      "action": {
+        "type": "r333::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r333::r::r::uH::\"\"",
-      "action": "r333::r::r::Action::\"action\"",
-      "resource": "r333::r::r::uH::\"\"",
+      "principal": {
+        "type": "r333::r::r::uH",
+        "id": ""
+      },
+      "resource": {
+        "type": "r333::r::r::uH",
+        "id": ""
+      },
+      "action": {
+        "type": "r333::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r333::r::r::uH::\"\"",
-      "action": "r333::r::r::Action::\"action\"",
-      "resource": "r333::r::r::uH::\"\"",
+      "principal": {
+        "type": "r333::r::r::uH",
+        "id": ""
+      },
+      "resource": {
+        "type": "r333::r::r::uH",
+        "id": ""
+      },
+      "action": {
+        "type": "r333::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r333::r::r::uH::\"\"",
-      "action": "r333::r::r::Action::\"action\"",
-      "resource": "r333::r::r::uH::\"\"",
+      "principal": {
+        "type": "r333::r::r::uH",
+        "id": ""
+      },
+      "resource": {
+        "type": "r333::r::r::uH",
+        "id": ""
+      },
+      "action": {
+        "type": "r333::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r333::r::r::uH::\"\"",
-      "action": "r333::r::r::Action::\"action\"",
-      "resource": "r333::r::r::uH::\"\"",
+      "principal": {
+        "type": "r333::r::r::uH",
+        "id": ""
+      },
+      "resource": {
+        "type": "r333::r::r::uH",
+        "id": ""
+      },
+      "action": {
+        "type": "r333::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r333::r::r::uH::\"\"",
-      "action": "r333::r::r::Action::\"action\"",
-      "resource": "r333::r::r::uH::\"\"",
+      "principal": {
+        "type": "r333::r::r::uH",
+        "id": ""
+      },
+      "resource": {
+        "type": "r333::r::r::uH",
+        "id": ""
+      },
+      "action": {
+        "type": "r333::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/227e92bfe69a4c847df6ca869e01c1ac1038e5e9.json b/cedar-integration-tests/corpus_tests/227e92bfe69a4c847df6ca869e01c1ac1038e5e9.json
index ae561a1a8..02a51f57f 100644
--- a/cedar-integration-tests/corpus_tests/227e92bfe69a4c847df6ca869e01c1ac1038e5e9.json
+++ b/cedar-integration-tests/corpus_tests/227e92bfe69a4c847df6ca869e01c1ac1038e5e9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": {
           "": "",
@@ -25,9 +34,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": {
           "": "",
@@ -44,9 +62,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": {
           "": "",
@@ -63,9 +90,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": {
           "": "",
@@ -82,9 +118,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": {
           "": "",
@@ -101,9 +146,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": {
           "": "",
@@ -120,9 +174,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": {
           "": "",
@@ -139,9 +202,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": {
           "": "",
diff --git a/cedar-integration-tests/corpus_tests/22855fc1b09948347a10b2517a2bb436c6451bb6.json b/cedar-integration-tests/corpus_tests/22855fc1b09948347a10b2517a2bb436c6451bb6.json
index 90a541179..af756c63c 100644
--- a/cedar-integration-tests/corpus_tests/22855fc1b09948347a10b2517a2bb436c6451bb6.json
+++ b/cedar-integration-tests/corpus_tests/22855fc1b09948347a10b2517a2bb436c6451bb6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::M::r::uH::r::rh::\"\"",
-      "action": "r::r::M::r::uH::r::Action::\"action\"",
-      "resource": "r::r::M::r::uH::r::R::\"\"",
+      "principal": {
+        "type": "r::r::M::r::uH::r::rh",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::M::r::uH::r::R",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::M::r::uH::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::M::r::uH::r::rh::\"\"",
-      "action": "r::r::M::r::uH::r::Action::\"action\"",
-      "resource": "r::r::M::r::uH::r::R::\"\"",
+      "principal": {
+        "type": "r::r::M::r::uH::r::rh",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::M::r::uH::r::R",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::M::r::uH::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::M::r::uH::r::rh::\"\"",
-      "action": "r::r::M::r::uH::r::Action::\"action\"",
-      "resource": "r::r::M::r::uH::r::R::\"\"",
+      "principal": {
+        "type": "r::r::M::r::uH::r::rh",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::M::r::uH::r::R",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::M::r::uH::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::M::r::uH::r::rh::\"\"",
-      "action": "r::r::M::r::uH::r::Action::\"action\"",
-      "resource": "r::r::M::r::uH::r::R::\"\"",
+      "principal": {
+        "type": "r::r::M::r::uH::r::rh",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::M::r::uH::r::R",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::M::r::uH::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::M::r::uH::r::rh::\"\"",
-      "action": "r::r::M::r::uH::r::Action::\"action\"",
-      "resource": "r::r::M::r::uH::r::R::\"\"",
+      "principal": {
+        "type": "r::r::M::r::uH::r::rh",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::M::r::uH::r::R",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::M::r::uH::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::M::r::uH::r::rh::\"\"",
-      "action": "r::r::M::r::uH::r::Action::\"action\"",
-      "resource": "r::r::M::r::uH::r::R::\"\"",
+      "principal": {
+        "type": "r::r::M::r::uH::r::rh",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::M::r::uH::r::R",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::M::r::uH::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::M::r::uH::r::rh::\"\"",
-      "action": "r::r::M::r::uH::r::Action::\"action\"",
-      "resource": "r::r::M::r::uH::r::R::\"\"",
+      "principal": {
+        "type": "r::r::M::r::uH::r::rh",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::M::r::uH::r::R",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::M::r::uH::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::M::r::uH::r::rh::\"\"",
-      "action": "r::r::M::r::uH::r::Action::\"action\"",
-      "resource": "r::r::M::r::uH::r::R::\"\"",
+      "principal": {
+        "type": "r::r::M::r::uH::r::rh",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::M::r::uH::r::R",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::M::r::uH::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/228801b00e79ed2e44f08cc699ca7e766266fbf5.json b/cedar-integration-tests/corpus_tests/228801b00e79ed2e44f08cc699ca7e766266fbf5.json
index ca2214e75..4c734a0b8 100644
--- a/cedar-integration-tests/corpus_tests/228801b00e79ed2e44f08cc699ca7e766266fbf5.json
+++ b/cedar-integration-tests/corpus_tests/228801b00e79ed2e44f08cc699ca7e766266fbf5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/22948e4b0b465a544b92e1a913262948f0a1fa97.json b/cedar-integration-tests/corpus_tests/22948e4b0b465a544b92e1a913262948f0a1fa97.json
index aeb77a3eb..02ab71ad1 100644
--- a/cedar-integration-tests/corpus_tests/22948e4b0b465a544b92e1a913262948f0a1fa97.json
+++ b/cedar-integration-tests/corpus_tests/22948e4b0b465a544b92e1a913262948f0a1fa97.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::r::T::r::A::\"\"",
-      "action": "r::r::r::T::r::Action::\"action\"",
-      "resource": "r::r::r::T::r::A::\"\"",
+      "principal": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::T::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::r::T::r::A::\"\"",
-      "action": "r::r::r::T::r::Action::\"action\"",
-      "resource": "r::r::r::T::r::A::\"\"",
+      "principal": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::T::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::r::T::r::A::\"\"",
-      "action": "r::r::r::T::r::Action::\"action\"",
-      "resource": "r::r::r::T::r::A::\"\"",
+      "principal": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::T::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::r::T::r::A::\"\"",
-      "action": "r::r::r::T::r::Action::\"action\"",
-      "resource": "r::r::r::T::r::A::\"\"",
+      "principal": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::T::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::r::T::r::A::\"\"",
-      "action": "r::r::r::T::r::Action::\"action\"",
-      "resource": "r::r::r::T::r::A::\"\"",
+      "principal": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::T::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::r::T::r::A::\"\"",
-      "action": "r::r::r::T::r::Action::\"action\"",
-      "resource": "r::r::r::T::r::A::\"\"",
+      "principal": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::T::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::r::T::r::A::\"\"",
-      "action": "r::r::r::T::r::Action::\"action\"",
-      "resource": "r::r::r::T::r::A::\"\"",
+      "principal": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::T::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::r::T::r::A::\"\"",
-      "action": "r::r::r::T::r::Action::\"action\"",
-      "resource": "r::r::r::T::r::A::\"\"",
+      "principal": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::T::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/2298e1594f18009a1088a3f3d460896119ae245e.json b/cedar-integration-tests/corpus_tests/2298e1594f18009a1088a3f3d460896119ae245e.json
index 459100b82..e5b61abd6 100644
--- a/cedar-integration-tests/corpus_tests/2298e1594f18009a1088a3f3d460896119ae245e.json
+++ b/cedar-integration-tests/corpus_tests/2298e1594f18009a1088a3f3d460896119ae245e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/22ab42e8b0c7232dfbe275d0b03c7fb0be5f1888.json b/cedar-integration-tests/corpus_tests/22ab42e8b0c7232dfbe275d0b03c7fb0be5f1888.json
index e97229caf..323c636fa 100644
--- a/cedar-integration-tests/corpus_tests/22ab42e8b0c7232dfbe275d0b03c7fb0be5f1888.json
+++ b/cedar-integration-tests/corpus_tests/22ab42e8b0c7232dfbe275d0b03c7fb0be5f1888.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"es\\0s\\u{2}\\\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "es\u0000s\u0002\""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}01\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}01\"",
+      "principal": {
+        "type": "a",
+        "id": "\u000201"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u000201"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}01\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}01\"",
+      "principal": {
+        "type": "a",
+        "id": "\u000201"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u000201"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}01\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}01\"",
+      "principal": {
+        "type": "a",
+        "id": "\u000201"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u000201"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}01\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}01\"",
+      "principal": {
+        "type": "a",
+        "id": "\u000201"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u000201"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}01\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}01\"",
+      "principal": {
+        "type": "a",
+        "id": "\u000201"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u000201"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}01\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}01\"",
+      "principal": {
+        "type": "a",
+        "id": "\u000201"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u000201"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}01\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}01\"",
+      "principal": {
+        "type": "a",
+        "id": "\u000201"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u000201"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/22ad0a749445ed17a1000b585509607fc2b87a7f.json b/cedar-integration-tests/corpus_tests/22ad0a749445ed17a1000b585509607fc2b87a7f.json
index 387d0e445..6929c97f4 100644
--- a/cedar-integration-tests/corpus_tests/22ad0a749445ed17a1000b585509607fc2b87a7f.json
+++ b/cedar-integration-tests/corpus_tests/22ad0a749445ed17a1000b585509607fc2b87a7f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"$\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "$\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/22b12bec5e1fe2fbc923f91bf85875f7f8a4ddc4.json b/cedar-integration-tests/corpus_tests/22b12bec5e1fe2fbc923f91bf85875f7f8a4ddc4.json
index b56bd054b..cf53a833c 100644
--- a/cedar-integration-tests/corpus_tests/22b12bec5e1fe2fbc923f91bf85875f7f8a4ddc4.json
+++ b/cedar-integration-tests/corpus_tests/22b12bec5e1fe2fbc923f91bf85875f7f8a4ddc4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/22b4a182031e98aa6a6fca4afeb5e43b150a3886.json b/cedar-integration-tests/corpus_tests/22b4a182031e98aa6a6fca4afeb5e43b150a3886.json
index 05bc044c1..a059b577a 100644
--- a/cedar-integration-tests/corpus_tests/22b4a182031e98aa6a6fca4afeb5e43b150a3886.json
+++ b/cedar-integration-tests/corpus_tests/22b4a182031e98aa6a6fca4afeb5e43b150a3886.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/22cca6533b288f8a0bc952f5777475b38eba2a54.json b/cedar-integration-tests/corpus_tests/22cca6533b288f8a0bc952f5777475b38eba2a54.json
index d66cbc4cf..6c3b46684 100644
--- a/cedar-integration-tests/corpus_tests/22cca6533b288f8a0bc952f5777475b38eba2a54.json
+++ b/cedar-integration-tests/corpus_tests/22cca6533b288f8a0bc952f5777475b38eba2a54.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {
         "A0": -157518874852787470
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {
         "A0": 0
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {
         "A0": 0
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {
         "A0": 0
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {
         "A0": 0
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {
         "A0": 0
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {
         "A0": 0
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {
         "A0": 0
       },
diff --git a/cedar-integration-tests/corpus_tests/22ddab875772d1225e1517bed1634f565ce97b02.json b/cedar-integration-tests/corpus_tests/22ddab875772d1225e1517bed1634f565ce97b02.json
index 3f1c52522..0c7736446 100644
--- a/cedar-integration-tests/corpus_tests/22ddab875772d1225e1517bed1634f565ce97b02.json
+++ b/cedar-integration-tests/corpus_tests/22ddab875772d1225e1517bed1634f565ce97b02.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Khhkkhk::a::\"\\r\"",
-      "action": "Khhkkhk::Action::\"action\"",
-      "resource": "Khhkkhk::a::\"\\r\"",
+      "principal": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "resource": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Khhkkhk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Khhkkhk::a::\"\\r\"",
-      "action": "Khhkkhk::Action::\"action\"",
-      "resource": "Khhkkhk::a::\"\\r\"",
+      "principal": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "resource": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Khhkkhk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Khhkkhk::a::\"\\r\"",
-      "action": "Khhkkhk::Action::\"action\"",
-      "resource": "Khhkkhk::a::\"\\r\"",
+      "principal": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "resource": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Khhkkhk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Khhkkhk::a::\"\\r\"",
-      "action": "Khhkkhk::Action::\"action\"",
-      "resource": "Khhkkhk::a::\"\\r\"",
+      "principal": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "resource": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Khhkkhk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Khhkkhk::a::\"\\r\"",
-      "action": "Khhkkhk::Action::\"action\"",
-      "resource": "Khhkkhk::a::\"\\r\"",
+      "principal": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "resource": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Khhkkhk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Khhkkhk::a::\"\\r\"",
-      "action": "Khhkkhk::Action::\"action\"",
-      "resource": "Khhkkhk::a::\"\\r\"",
+      "principal": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "resource": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Khhkkhk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Khhkkhk::a::\"\\r\"",
-      "action": "Khhkkhk::Action::\"action\"",
-      "resource": "Khhkkhk::a::\"\\r\"",
+      "principal": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "resource": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Khhkkhk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Khhkkhk::a::\"\\r\"",
-      "action": "Khhkkhk::Action::\"action\"",
-      "resource": "Khhkkhk::a::\"\\r\"",
+      "principal": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "resource": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Khhkkhk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/22e92ff0f6ef3d799723c536734d846d1c78a197.json b/cedar-integration-tests/corpus_tests/22e92ff0f6ef3d799723c536734d846d1c78a197.json
index e49314170..02d8e0e37 100644
--- a/cedar-integration-tests/corpus_tests/22e92ff0f6ef3d799723c536734d846d1c78a197.json
+++ b/cedar-integration-tests/corpus_tests/22e92ff0f6ef3d799723c536734d846d1c78a197.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "R77::\"Z\"",
-      "action": "Action::\"action\"",
-      "resource": "R77::\"\"",
+      "principal": {
+        "type": "R77",
+        "id": "Z"
+      },
+      "resource": {
+        "type": "R77",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "R77::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "R77::\"\"",
+      "principal": {
+        "type": "R77",
+        "id": ""
+      },
+      "resource": {
+        "type": "R77",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "R77::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "R77::\"\"",
+      "principal": {
+        "type": "R77",
+        "id": ""
+      },
+      "resource": {
+        "type": "R77",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "R77::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "R77::\"\"",
+      "principal": {
+        "type": "R77",
+        "id": ""
+      },
+      "resource": {
+        "type": "R77",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "R77::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "R77::\"\"",
+      "principal": {
+        "type": "R77",
+        "id": ""
+      },
+      "resource": {
+        "type": "R77",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "R77::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "R77::\"\"",
+      "principal": {
+        "type": "R77",
+        "id": ""
+      },
+      "resource": {
+        "type": "R77",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "R77::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "R77::\"\"",
+      "principal": {
+        "type": "R77",
+        "id": ""
+      },
+      "resource": {
+        "type": "R77",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "R77::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "R77::\"\"",
+      "principal": {
+        "type": "R77",
+        "id": ""
+      },
+      "resource": {
+        "type": "R77",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/2315fa6f8a865d109cc7e2da855040ee80099c9b.json b/cedar-integration-tests/corpus_tests/2315fa6f8a865d109cc7e2da855040ee80099c9b.json
index f062c586b..cf97791a8 100644
--- a/cedar-integration-tests/corpus_tests/2315fa6f8a865d109cc7e2da855040ee80099c9b.json
+++ b/cedar-integration-tests/corpus_tests/2315fa6f8a865d109cc7e2da855040ee80099c9b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/231aa19c98e274060191f11f908374c00596c59d.json b/cedar-integration-tests/corpus_tests/231aa19c98e274060191f11f908374c00596c59d.json
index 80f34664b..a86ab7e2c 100644
--- a/cedar-integration-tests/corpus_tests/231aa19c98e274060191f11f908374c00596c59d.json
+++ b/cedar-integration-tests/corpus_tests/231aa19c98e274060191f11f908374c00596c59d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\":A:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ":A:"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":A:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":A:\"",
+      "principal": {
+        "type": "a",
+        "id": ":A:"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":A:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\":A:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ":A:"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -82,9 +145,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/23325a30760c363b387849a8c4c3cbba75313ec0.json b/cedar-integration-tests/corpus_tests/23325a30760c363b387849a8c4c3cbba75313ec0.json
index 87dbcbc8e..55256e12f 100644
--- a/cedar-integration-tests/corpus_tests/23325a30760c363b387849a8c4c3cbba75313ec0.json
+++ b/cedar-integration-tests/corpus_tests/23325a30760c363b387849a8c4c3cbba75313ec0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": ""
+      },
       "context": {
         "qx": {
           "__entity": {
@@ -31,9 +40,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": ""
+      },
       "context": {
         "qx": {
           "__entity": {
@@ -56,9 +74,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": ""
+      },
       "context": {
         "qx": {
           "__entity": {
@@ -81,9 +108,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": ""
+      },
       "context": {
         "qx": {
           "__entity": {
@@ -106,9 +142,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": ""
+      },
       "context": {
         "qx": {
           "__entity": {
@@ -131,9 +176,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": ""
+      },
       "context": {
         "qx": {
           "__entity": {
@@ -156,9 +210,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": ""
+      },
       "context": {
         "qx": {
           "__entity": {
@@ -181,9 +244,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": ""
+      },
       "context": {
         "qx": {
           "__entity": {
diff --git a/cedar-integration-tests/corpus_tests/235aa374664b3c61ac0316bde4984195fa29ab2d.json b/cedar-integration-tests/corpus_tests/235aa374664b3c61ac0316bde4984195fa29ab2d.json
index 23d3fce57..1e9662980 100644
--- a/cedar-integration-tests/corpus_tests/235aa374664b3c61ac0316bde4984195fa29ab2d.json
+++ b/cedar-integration-tests/corpus_tests/235aa374664b3c61ac0316bde4984195fa29ab2d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{3}+\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{3}+\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{3}+\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{3}+\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{3}+\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{3}+\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{3}+\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{3}+\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{3}+\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{3}+\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{3}+\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{3}+\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{3}+\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{3}+\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{3}+\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{3}+\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/236b45d00bcb1c2429e428ea268f631fa5ef626e.json b/cedar-integration-tests/corpus_tests/236b45d00bcb1c2429e428ea268f631fa5ef626e.json
index bbca822e7..578e2a0ea 100644
--- a/cedar-integration-tests/corpus_tests/236b45d00bcb1c2429e428ea268f631fa5ef626e.json
+++ b/cedar-integration-tests/corpus_tests/236b45d00bcb1c2429e428ea268f631fa5ef626e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/239501e7afe41f99231f469c48b00c0971e7ba84.json b/cedar-integration-tests/corpus_tests/239501e7afe41f99231f469c48b00c0971e7ba84.json
index 7f42cb6ca..dd2095f3c 100644
--- a/cedar-integration-tests/corpus_tests/239501e7afe41f99231f469c48b00c0971e7ba84.json
+++ b/cedar-integration-tests/corpus_tests/239501e7afe41f99231f469c48b00c0971e7ba84.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "C::C::\"\"",
-      "action": "C::Action::\"action\"",
-      "resource": "C::C::\"\"",
+      "principal": {
+        "type": "C::C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C::C",
+        "id": ""
+      },
+      "action": {
+        "type": "C::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "C::C::\"\"",
-      "action": "C::Action::\"action\"",
-      "resource": "C::C::\"\"",
+      "principal": {
+        "type": "C::C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C::C",
+        "id": ""
+      },
+      "action": {
+        "type": "C::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "C::C::\"\"",
-      "action": "C::Action::\"action\"",
-      "resource": "C::C::\"\"",
+      "principal": {
+        "type": "C::C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C::C",
+        "id": ""
+      },
+      "action": {
+        "type": "C::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "C::C::\"\"",
-      "action": "C::Action::\"action\"",
-      "resource": "C::C::\"\"",
+      "principal": {
+        "type": "C::C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C::C",
+        "id": ""
+      },
+      "action": {
+        "type": "C::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "C::C::\"\"",
-      "action": "C::Action::\"action\"",
-      "resource": "C::C::\"\"",
+      "principal": {
+        "type": "C::C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C::C",
+        "id": ""
+      },
+      "action": {
+        "type": "C::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "C::C::\"\"",
-      "action": "C::Action::\"action\"",
-      "resource": "C::C::\"\"",
+      "principal": {
+        "type": "C::C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C::C",
+        "id": ""
+      },
+      "action": {
+        "type": "C::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "C::C::\"\"",
-      "action": "C::Action::\"action\"",
-      "resource": "C::C::\"\"",
+      "principal": {
+        "type": "C::C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C::C",
+        "id": ""
+      },
+      "action": {
+        "type": "C::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "C::C::\"\"",
-      "action": "C::Action::\"action\"",
-      "resource": "C::C::\"\"",
+      "principal": {
+        "type": "C::C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C::C",
+        "id": ""
+      },
+      "action": {
+        "type": "C::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/2467f2d0faf23489ec76added7882c5cedb16fa7.json b/cedar-integration-tests/corpus_tests/2467f2d0faf23489ec76added7882c5cedb16fa7.json
index 7bbb39d95..5809f7739 100644
--- a/cedar-integration-tests/corpus_tests/2467f2d0faf23489ec76added7882c5cedb16fa7.json
+++ b/cedar-integration-tests/corpus_tests/2467f2d0faf23489ec76added7882c5cedb16fa7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"907008678127-w\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "907008678127-w"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/247504c448b53f0ca04eec7c7c2e95bbe6349146.json b/cedar-integration-tests/corpus_tests/247504c448b53f0ca04eec7c7c2e95bbe6349146.json
index a99de9cfa..f74d73d69 100644
--- a/cedar-integration-tests/corpus_tests/247504c448b53f0ca04eec7c7c2e95bbe6349146.json
+++ b/cedar-integration-tests/corpus_tests/247504c448b53f0ca04eec7c7c2e95bbe6349146.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "bx7x": [],
         "a": [],
@@ -28,9 +37,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "bx7x": [],
         "a": [],
@@ -50,9 +68,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "bx7x": [],
         "a": [],
@@ -72,9 +99,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "bx7x": [],
         "a": [],
@@ -94,9 +130,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "bx7x": [],
         "a": [],
@@ -116,9 +161,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "bx7x": [],
         "a": [],
@@ -138,9 +192,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "bx7x": [],
         "a": [],
@@ -160,9 +223,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "bx7x": [],
         "a": [],
diff --git a/cedar-integration-tests/corpus_tests/24a1025a6f4b8a759b0234cec2a64f21d7f31f4c.json b/cedar-integration-tests/corpus_tests/24a1025a6f4b8a759b0234cec2a64f21d7f31f4c.json
index 4e6ff6f41..746f7282a 100644
--- a/cedar-integration-tests/corpus_tests/24a1025a6f4b8a759b0234cec2a64f21d7f31f4c.json
+++ b/cedar-integration-tests/corpus_tests/24a1025a6f4b8a759b0234cec2a64f21d7f31f4c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "L::r3ww3w33::a::\"\"",
-      "action": "L::r3ww3w33::Action::\"action\"",
-      "resource": "L::r3ww3w33::a::\"\"",
+      "principal": {
+        "type": "L::r3ww3w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "L::r3ww3w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "L::r3ww3w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "L::r3ww3w33::a::\"\"",
-      "action": "L::r3ww3w33::Action::\"action\"",
-      "resource": "L::r3ww3w33::a::\"\"",
+      "principal": {
+        "type": "L::r3ww3w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "L::r3ww3w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "L::r3ww3w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "L::r3ww3w33::a::\"\"",
-      "action": "L::r3ww3w33::Action::\"action\"",
-      "resource": "L::r3ww3w33::a::\"\"",
+      "principal": {
+        "type": "L::r3ww3w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "L::r3ww3w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "L::r3ww3w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "L::r3ww3w33::a::\"\"",
-      "action": "L::r3ww3w33::Action::\"action\"",
-      "resource": "L::r3ww3w33::a::\"\"",
+      "principal": {
+        "type": "L::r3ww3w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "L::r3ww3w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "L::r3ww3w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "L::r3ww3w33::a::\"\"",
-      "action": "L::r3ww3w33::Action::\"action\"",
-      "resource": "L::r3ww3w33::a::\"\"",
+      "principal": {
+        "type": "L::r3ww3w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "L::r3ww3w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "L::r3ww3w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "L::r3ww3w33::a::\"\"",
-      "action": "L::r3ww3w33::Action::\"action\"",
-      "resource": "L::r3ww3w33::a::\"\"",
+      "principal": {
+        "type": "L::r3ww3w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "L::r3ww3w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "L::r3ww3w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "L::r3ww3w33::a::\"\"",
-      "action": "L::r3ww3w33::Action::\"action\"",
-      "resource": "L::r3ww3w33::a::\"\"",
+      "principal": {
+        "type": "L::r3ww3w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "L::r3ww3w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "L::r3ww3w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "L::r3ww3w33::a::\"\"",
-      "action": "L::r3ww3w33::Action::\"action\"",
-      "resource": "L::r3ww3w33::a::\"\"",
+      "principal": {
+        "type": "L::r3ww3w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "L::r3ww3w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "L::r3ww3w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/24da1a6ccec424d0c222eefee5d87bc6e2988797.json b/cedar-integration-tests/corpus_tests/24da1a6ccec424d0c222eefee5d87bc6e2988797.json
index dc81b3c4f..231054b35 100644
--- a/cedar-integration-tests/corpus_tests/24da1a6ccec424d0c222eefee5d87bc6e2988797.json
+++ b/cedar-integration-tests/corpus_tests/24da1a6ccec424d0c222eefee5d87bc6e2988797.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/250bea468a24ef02741251907f89fe5165b1b7b5.json b/cedar-integration-tests/corpus_tests/250bea468a24ef02741251907f89fe5165b1b7b5.json
index 547bbf2be..f72489356 100644
--- a/cedar-integration-tests/corpus_tests/250bea468a24ef02741251907f89fe5165b1b7b5.json
+++ b/cedar-integration-tests/corpus_tests/250bea468a24ef02741251907f89fe5165b1b7b5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/254cda004d780b9da54d3d3740f66bb8d2773875.json b/cedar-integration-tests/corpus_tests/254cda004d780b9da54d3d3740f66bb8d2773875.json
index 31a0df59d..a5d15d421 100644
--- a/cedar-integration-tests/corpus_tests/254cda004d780b9da54d3d3740f66bb8d2773875.json
+++ b/cedar-integration-tests/corpus_tests/254cda004d780b9da54d3d3740f66bb8d2773875.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"j#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j#\"",
+      "principal": {
+        "type": "a",
+        "id": "j#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"j#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j#\"",
+      "principal": {
+        "type": "a",
+        "id": "j#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0v\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j#\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000v"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"j#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j#\"",
+      "principal": {
+        "type": "a",
+        "id": "j#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"j#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j#\"",
+      "principal": {
+        "type": "a",
+        "id": "j#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"j#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j#\"",
+      "principal": {
+        "type": "a",
+        "id": "j#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"j#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j#\"",
+      "principal": {
+        "type": "a",
+        "id": "j#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"j#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j#\"",
+      "principal": {
+        "type": "a",
+        "id": "j#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/257d63d81965dc91095e15c1828a492ceca7f219.json b/cedar-integration-tests/corpus_tests/257d63d81965dc91095e15c1828a492ceca7f219.json
index 26a52ca0f..ae47ef104 100644
--- a/cedar-integration-tests/corpus_tests/257d63d81965dc91095e15c1828a492ceca7f219.json
+++ b/cedar-integration-tests/corpus_tests/257d63d81965dc91095e15c1828a492ceca7f219.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/25ba1cab0ed510b921e1277889a891d845f19386.json b/cedar-integration-tests/corpus_tests/25ba1cab0ed510b921e1277889a891d845f19386.json
index d27777809..87276af83 100644
--- a/cedar-integration-tests/corpus_tests/25ba1cab0ed510b921e1277889a891d845f19386.json
+++ b/cedar-integration-tests/corpus_tests/25ba1cab0ed510b921e1277889a891d845f19386.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{b}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\u{b}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u000b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u000b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{b}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\u{b}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u000b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u000b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{b}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\u{b}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u000b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u000b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{b}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\u{b}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u000b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u000b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{b}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\u{b}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u000b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u000b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{b}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\u{b}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u000b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u000b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{b}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\u{b}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u000b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u000b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{b}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\u{b}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u000b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u000b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/25e0fdd9c56f74f7ddf8ee29b2f7737a6e33a70d.json b/cedar-integration-tests/corpus_tests/25e0fdd9c56f74f7ddf8ee29b2f7737a6e33a70d.json
index c31b94117..9507eab8a 100644
--- a/cedar-integration-tests/corpus_tests/25e0fdd9c56f74f7ddf8ee29b2f7737a6e33a70d.json
+++ b/cedar-integration-tests/corpus_tests/25e0fdd9c56f74f7ddf8ee29b2f7737a6e33a70d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "R2uvummmkkOhhmmmk::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "R2uvummmkkOhhmmmk::\"\\0\"",
+      "principal": {
+        "type": "R2uvummmkkOhhmmmk",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "R2uvummmkkOhhmmmk",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "R2uvummmkkOhhmmmk::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "R2uvummmkkOhhmmmk::\"\\0\"",
+      "principal": {
+        "type": "R2uvummmkkOhhmmmk",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "R2uvummmkkOhhmmmk",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "R2uvummmkkOhhmmmk::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "R2uvummmkkOhhmmmk::\"\\0\"",
+      "principal": {
+        "type": "R2uvummmkkOhhmmmk",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "R2uvummmkkOhhmmmk",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "R2uvummmkkOhhmmmk::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "R2uvummmkkOhhmmmk::\"\\0\"",
+      "principal": {
+        "type": "R2uvummmkkOhhmmmk",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "R2uvummmkkOhhmmmk",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "R2uvummmkkOhhmmmk::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "R2uvummmkkOhhmmmk::\"\\0\"",
+      "principal": {
+        "type": "R2uvummmkkOhhmmmk",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "R2uvummmkkOhhmmmk",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "R2uvummmkkOhhmmmk::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "R2uvummmkkOhhmmmk::\"\\0\"",
+      "principal": {
+        "type": "R2uvummmkkOhhmmmk",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "R2uvummmkkOhhmmmk",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "R2uvummmkkOhhmmmk::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "R2uvummmkkOhhmmmk::\"\\0\"",
+      "principal": {
+        "type": "R2uvummmkkOhhmmmk",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "R2uvummmkkOhhmmmk",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "R2uvummmkkOhhmmmk::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "R2uvummmkkOhhmmmk::\"\\0\"",
+      "principal": {
+        "type": "R2uvummmkkOhhmmmk",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "R2uvummmkkOhhmmmk",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/261149a4a8004219a52422f61df14589c83382ec.json b/cedar-integration-tests/corpus_tests/261149a4a8004219a52422f61df14589c83382ec.json
index 4570bf0c9..646e9ea6f 100644
--- a/cedar-integration-tests/corpus_tests/261149a4a8004219a52422f61df14589c83382ec.json
+++ b/cedar-integration-tests/corpus_tests/261149a4a8004219a52422f61df14589c83382ec.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/263fea16c36dd7d47f341a225a0d128e5b55e255.json b/cedar-integration-tests/corpus_tests/263fea16c36dd7d47f341a225a0d128e5b55e255.json
index a1e7adfe0..4ad9eb49f 100644
--- a/cedar-integration-tests/corpus_tests/263fea16c36dd7d47f341a225a0d128e5b55e255.json
+++ b/cedar-integration-tests/corpus_tests/263fea16c36dd7d47f341a225a0d128e5b55e255.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/269a223b4f6b39933ab85bfd2f5412cda75d5580.json b/cedar-integration-tests/corpus_tests/269a223b4f6b39933ab85bfd2f5412cda75d5580.json
index 281e299fb..cc308608d 100644
--- a/cedar-integration-tests/corpus_tests/269a223b4f6b39933ab85bfd2f5412cda75d5580.json
+++ b/cedar-integration-tests/corpus_tests/269a223b4f6b39933ab85bfd2f5412cda75d5580.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "vlgmuw9ud::xw0g05::a::\"\"",
-      "action": "vlgmuw9ud::xw0g05::Action::\"action\"",
-      "resource": "vlgmuw9ud::xw0g05::a::\"\"",
+      "principal": {
+        "type": "vlgmuw9ud::xw0g05::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "vlgmuw9ud::xw0g05::a",
+        "id": ""
+      },
+      "action": {
+        "type": "vlgmuw9ud::xw0g05::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "vlgmuw9ud::xw0g05::a::\"\"",
-      "action": "vlgmuw9ud::xw0g05::Action::\"action\"",
-      "resource": "vlgmuw9ud::xw0g05::a::\"\"",
+      "principal": {
+        "type": "vlgmuw9ud::xw0g05::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "vlgmuw9ud::xw0g05::a",
+        "id": ""
+      },
+      "action": {
+        "type": "vlgmuw9ud::xw0g05::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "vlgmuw9ud::xw0g05::a::\"\"",
-      "action": "vlgmuw9ud::xw0g05::Action::\"action\"",
-      "resource": "vlgmuw9ud::xw0g05::a::\"\"",
+      "principal": {
+        "type": "vlgmuw9ud::xw0g05::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "vlgmuw9ud::xw0g05::a",
+        "id": ""
+      },
+      "action": {
+        "type": "vlgmuw9ud::xw0g05::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "vlgmuw9ud::xw0g05::a::\"\"",
-      "action": "vlgmuw9ud::xw0g05::Action::\"action\"",
-      "resource": "vlgmuw9ud::xw0g05::a::\"\"",
+      "principal": {
+        "type": "vlgmuw9ud::xw0g05::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "vlgmuw9ud::xw0g05::a",
+        "id": ""
+      },
+      "action": {
+        "type": "vlgmuw9ud::xw0g05::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "vlgmuw9ud::xw0g05::a::\"\"",
-      "action": "vlgmuw9ud::xw0g05::Action::\"action\"",
-      "resource": "vlgmuw9ud::xw0g05::a::\"\"",
+      "principal": {
+        "type": "vlgmuw9ud::xw0g05::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "vlgmuw9ud::xw0g05::a",
+        "id": ""
+      },
+      "action": {
+        "type": "vlgmuw9ud::xw0g05::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "vlgmuw9ud::xw0g05::a::\"\"",
-      "action": "vlgmuw9ud::xw0g05::Action::\"action\"",
-      "resource": "vlgmuw9ud::xw0g05::a::\"\"",
+      "principal": {
+        "type": "vlgmuw9ud::xw0g05::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "vlgmuw9ud::xw0g05::a",
+        "id": ""
+      },
+      "action": {
+        "type": "vlgmuw9ud::xw0g05::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "vlgmuw9ud::xw0g05::a::\"\"",
-      "action": "vlgmuw9ud::xw0g05::Action::\"action\"",
-      "resource": "vlgmuw9ud::xw0g05::a::\"\"",
+      "principal": {
+        "type": "vlgmuw9ud::xw0g05::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "vlgmuw9ud::xw0g05::a",
+        "id": ""
+      },
+      "action": {
+        "type": "vlgmuw9ud::xw0g05::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "vlgmuw9ud::xw0g05::a::\"\"",
-      "action": "vlgmuw9ud::xw0g05::Action::\"action\"",
-      "resource": "vlgmuw9ud::xw0g05::a::\"\"",
+      "principal": {
+        "type": "vlgmuw9ud::xw0g05::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "vlgmuw9ud::xw0g05::a",
+        "id": ""
+      },
+      "action": {
+        "type": "vlgmuw9ud::xw0g05::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/26a751441be1af538d726a9dc0095d0d32a5a4e6.json b/cedar-integration-tests/corpus_tests/26a751441be1af538d726a9dc0095d0d32a5a4e6.json
index 3d4d6a610..84fe93154 100644
--- a/cedar-integration-tests/corpus_tests/26a751441be1af538d726a9dc0095d0d32a5a4e6.json
+++ b/cedar-integration-tests/corpus_tests/26a751441be1af538d726a9dc0095d0d32a5a4e6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": "",
         "r": ""
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": "",
         "r": ""
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": "",
         "r": ""
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": "",
         "r": ""
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": "",
         "r": ""
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": "",
         "r": ""
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": "",
         "r": ""
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": "",
         "r": ""
diff --git a/cedar-integration-tests/corpus_tests/26abefc0cdc3ca369e50d8ad8e7e02fdd1ada405.json b/cedar-integration-tests/corpus_tests/26abefc0cdc3ca369e50d8ad8e7e02fdd1ada405.json
index 7732274df..176e90a2a 100644
--- a/cedar-integration-tests/corpus_tests/26abefc0cdc3ca369e50d8ad8e7e02fdd1ada405.json
+++ b/cedar-integration-tests/corpus_tests/26abefc0cdc3ca369e50d8ad8e7e02fdd1ada405.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Fwwww9::a::\"\\0:om/\"",
-      "action": "Fwwww9::Action::\"action\"",
-      "resource": "Fwwww9::a::\"\\0:om/\"",
+      "principal": {
+        "type": "Fwwww9::a",
+        "id": "\u0000:om/"
+      },
+      "resource": {
+        "type": "Fwwww9::a",
+        "id": "\u0000:om/"
+      },
+      "action": {
+        "type": "Fwwww9::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Fwwww9::a::\"\\0:om/\"",
-      "action": "Fwwww9::Action::\"action\"",
-      "resource": "Fwwww9::a::\"\\0:om/\"",
+      "principal": {
+        "type": "Fwwww9::a",
+        "id": "\u0000:om/"
+      },
+      "resource": {
+        "type": "Fwwww9::a",
+        "id": "\u0000:om/"
+      },
+      "action": {
+        "type": "Fwwww9::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Fwwww9::a::\"\\0:om/\"",
-      "action": "Fwwww9::Action::\"action\"",
-      "resource": "Fwwww9::a::\"\\0:om/\"",
+      "principal": {
+        "type": "Fwwww9::a",
+        "id": "\u0000:om/"
+      },
+      "resource": {
+        "type": "Fwwww9::a",
+        "id": "\u0000:om/"
+      },
+      "action": {
+        "type": "Fwwww9::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Fwwww9::a::\"\\0:om/\"",
-      "action": "Fwwww9::Action::\"action\"",
-      "resource": "Fwwww9::a::\"\\0:om/\"",
+      "principal": {
+        "type": "Fwwww9::a",
+        "id": "\u0000:om/"
+      },
+      "resource": {
+        "type": "Fwwww9::a",
+        "id": "\u0000:om/"
+      },
+      "action": {
+        "type": "Fwwww9::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Fwwww9::a::\"\\0:om/\"",
-      "action": "Fwwww9::Action::\"action\"",
-      "resource": "Fwwww9::a::\"\\0:om/\"",
+      "principal": {
+        "type": "Fwwww9::a",
+        "id": "\u0000:om/"
+      },
+      "resource": {
+        "type": "Fwwww9::a",
+        "id": "\u0000:om/"
+      },
+      "action": {
+        "type": "Fwwww9::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Fwwww9::a::\"\\0:om/\"",
-      "action": "Fwwww9::Action::\"action\"",
-      "resource": "Fwwww9::a::\"\\0:om/\"",
+      "principal": {
+        "type": "Fwwww9::a",
+        "id": "\u0000:om/"
+      },
+      "resource": {
+        "type": "Fwwww9::a",
+        "id": "\u0000:om/"
+      },
+      "action": {
+        "type": "Fwwww9::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Fwwww9::a::\"\\0:om/\"",
-      "action": "Fwwww9::Action::\"action\"",
-      "resource": "Fwwww9::a::\"\\0:om/\"",
+      "principal": {
+        "type": "Fwwww9::a",
+        "id": "\u0000:om/"
+      },
+      "resource": {
+        "type": "Fwwww9::a",
+        "id": "\u0000:om/"
+      },
+      "action": {
+        "type": "Fwwww9::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Fwwww9::a::\"\\0:om/\"",
-      "action": "Fwwww9::Action::\"action\"",
-      "resource": "Fwwww9::a::\"\\0:om/\"",
+      "principal": {
+        "type": "Fwwww9::a",
+        "id": "\u0000:om/"
+      },
+      "resource": {
+        "type": "Fwwww9::a",
+        "id": "\u0000:om/"
+      },
+      "action": {
+        "type": "Fwwww9::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/26ad7265526991a750a796535cebd2affe962356.json b/cedar-integration-tests/corpus_tests/26ad7265526991a750a796535cebd2affe962356.json
index b9524f0f2..c04263013 100644
--- a/cedar-integration-tests/corpus_tests/26ad7265526991a750a796535cebd2affe962356.json
+++ b/cedar-integration-tests/corpus_tests/26ad7265526991a750a796535cebd2affe962356.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/26b830fd9423f8de3ddc676eaea3bc442a68fe12.json b/cedar-integration-tests/corpus_tests/26b830fd9423f8de3ddc676eaea3bc442a68fe12.json
index 4976548cc..cc622ad1d 100644
--- a/cedar-integration-tests/corpus_tests/26b830fd9423f8de3ddc676eaea3bc442a68fe12.json
+++ b/cedar-integration-tests/corpus_tests/26b830fd9423f8de3ddc676eaea3bc442a68fe12.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "."
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/272ae71ac571077560328329952bd2cc5744eafe.json b/cedar-integration-tests/corpus_tests/272ae71ac571077560328329952bd2cc5744eafe.json
index 96c2f039e..f00b9cb02 100644
--- a/cedar-integration-tests/corpus_tests/272ae71ac571077560328329952bd2cc5744eafe.json
+++ b/cedar-integration-tests/corpus_tests/272ae71ac571077560328329952bd2cc5744eafe.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/2730bb0abe3e54013677dcccf7b04f96fb0be285.json b/cedar-integration-tests/corpus_tests/2730bb0abe3e54013677dcccf7b04f96fb0be285.json
index b2347645d..d23d9df86 100644
--- a/cedar-integration-tests/corpus_tests/2730bb0abe3e54013677dcccf7b04f96fb0be285.json
+++ b/cedar-integration-tests/corpus_tests/2730bb0abe3e54013677dcccf7b04f96fb0be285.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/274f63c71d3849f3100d4100b20c3da8832edc98.json b/cedar-integration-tests/corpus_tests/274f63c71d3849f3100d4100b20c3da8832edc98.json
index 0a45a9fef..43cc630fc 100644
--- a/cedar-integration-tests/corpus_tests/274f63c71d3849f3100d4100b20c3da8832edc98.json
+++ b/cedar-integration-tests/corpus_tests/274f63c71d3849f3100d4100b20c3da8832edc98.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/2785cfcda5ecacf34130172e5c1d482f75c5ff03.json b/cedar-integration-tests/corpus_tests/2785cfcda5ecacf34130172e5c1d482f75c5ff03.json
index ca2a737ed..1d6f1e1fa 100644
--- a/cedar-integration-tests/corpus_tests/2785cfcda5ecacf34130172e5c1d482f75c5ff03.json
+++ b/cedar-integration-tests/corpus_tests/2785cfcda5ecacf34130172e5c1d482f75c5ff03.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -84,9 +147,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/278957d677eb2e94f531e9a2807e533952572469.json b/cedar-integration-tests/corpus_tests/278957d677eb2e94f531e9a2807e533952572469.json
index a9be6964b..8ae893af4 100644
--- a/cedar-integration-tests/corpus_tests/278957d677eb2e94f531e9a2807e533952572469.json
+++ b/cedar-integration-tests/corpus_tests/278957d677eb2e94f531e9a2807e533952572469.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"r00`006*7970\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r00`006*7970\"",
+      "principal": {
+        "type": "a",
+        "id": "r00`006*7970"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r00`006*7970"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"r00`006*7970\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r00`006*7970\"",
+      "principal": {
+        "type": "a",
+        "id": "r00`006*7970"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r00`006*7970"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"r00`006*7970\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r00`006*7970\"",
+      "principal": {
+        "type": "a",
+        "id": "r00`006*7970"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r00`006*7970"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"r00`006*7970\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r00`006*7970\"",
+      "principal": {
+        "type": "a",
+        "id": "r00`006*7970"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r00`006*7970"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"r00`006*7970\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r00`006*7970\"",
+      "principal": {
+        "type": "a",
+        "id": "r00`006*7970"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r00`006*7970"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"r00`006*7970\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r00`006*7970\"",
+      "principal": {
+        "type": "a",
+        "id": "r00`006*7970"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r00`006*7970"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"r00`006*7970\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r00`006*7970\"",
+      "principal": {
+        "type": "a",
+        "id": "r00`006*7970"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r00`006*7970"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"r00`006*7970\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r00`006*7970\"",
+      "principal": {
+        "type": "a",
+        "id": "r00`006*7970"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r00`006*7970"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/279dc8ec66ae24655885489ce18e4e1ed8d8b0b9.json b/cedar-integration-tests/corpus_tests/279dc8ec66ae24655885489ce18e4e1ed8d8b0b9.json
index 45dfcbc03..93b52795a 100644
--- a/cedar-integration-tests/corpus_tests/279dc8ec66ae24655885489ce18e4e1ed8d8b0b9.json
+++ b/cedar-integration-tests/corpus_tests/279dc8ec66ae24655885489ce18e4e1ed8d8b0b9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/27b71e9fbe9a6df39d7da362318dccc30c36afb1.json b/cedar-integration-tests/corpus_tests/27b71e9fbe9a6df39d7da362318dccc30c36afb1.json
index ff311593a..433d1f0af 100644
--- a/cedar-integration-tests/corpus_tests/27b71e9fbe9a6df39d7da362318dccc30c36afb1.json
+++ b/cedar-integration-tests/corpus_tests/27b71e9fbe9a6df39d7da362318dccc30c36afb1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Fwwwwwww::\"::::\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww::\"::::\"",
+      "principal": {
+        "type": "Fwwwwwww",
+        "id": "::::"
+      },
+      "resource": {
+        "type": "Fwwwwwww",
+        "id": "::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Fwwwwwww::\"::::\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww::\"::::\"",
+      "principal": {
+        "type": "Fwwwwwww",
+        "id": "::::"
+      },
+      "resource": {
+        "type": "Fwwwwwww",
+        "id": "::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Fwwwwwww::\"::::\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww::\"::::\"",
+      "principal": {
+        "type": "Fwwwwwww",
+        "id": "::::"
+      },
+      "resource": {
+        "type": "Fwwwwwww",
+        "id": "::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Fwwwwwww::\"::::\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww::\"::::\"",
+      "principal": {
+        "type": "Fwwwwwww",
+        "id": "::::"
+      },
+      "resource": {
+        "type": "Fwwwwwww",
+        "id": "::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Fwwwwwww::\"::::\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww::\"::::\"",
+      "principal": {
+        "type": "Fwwwwwww",
+        "id": "::::"
+      },
+      "resource": {
+        "type": "Fwwwwwww",
+        "id": "::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Fwwwwwww::\"::::\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww::\"::::\"",
+      "principal": {
+        "type": "Fwwwwwww",
+        "id": "::::"
+      },
+      "resource": {
+        "type": "Fwwwwwww",
+        "id": "::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Fwwwwwww::\"::::\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww::\"::::\"",
+      "principal": {
+        "type": "Fwwwwwww",
+        "id": "::::"
+      },
+      "resource": {
+        "type": "Fwwwwwww",
+        "id": "::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Fwwwwwww::\"::::\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww::\"::::\"",
+      "principal": {
+        "type": "Fwwwwwww",
+        "id": "::::"
+      },
+      "resource": {
+        "type": "Fwwwwwww",
+        "id": "::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/27befb74bf03f491d43ec29bc2370673d8cb9a7a.json b/cedar-integration-tests/corpus_tests/27befb74bf03f491d43ec29bc2370673d8cb9a7a.json
index 75305e583..9de40e820 100644
--- a/cedar-integration-tests/corpus_tests/27befb74bf03f491d43ec29bc2370673d8cb9a7a.json
+++ b/cedar-integration-tests/corpus_tests/27befb74bf03f491d43ec29bc2370673d8cb9a7a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "u000000000000": "",
         "r": "",
@@ -22,9 +31,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "u000000000000": "",
         "r": "",
@@ -38,9 +56,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "u000000000000": "",
         "r": "",
@@ -54,9 +81,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "u000000000000": "",
         "r": "",
@@ -70,9 +106,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "u000000000000": "",
         "r": "",
@@ -86,9 +131,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "u000000000000": "",
         "r": "",
@@ -102,9 +156,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "u000000000000": "",
         "r": "",
@@ -118,9 +181,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "u000000000000": "",
         "r": "",
diff --git a/cedar-integration-tests/corpus_tests/2808898944b1db80f3d122e1c91357f0895940e8.json b/cedar-integration-tests/corpus_tests/2808898944b1db80f3d122e1c91357f0895940e8.json
index 2e8366bd8..e66ad92aa 100644
--- a/cedar-integration-tests/corpus_tests/2808898944b1db80f3d122e1c91357f0895940e8.json
+++ b/cedar-integration-tests/corpus_tests/2808898944b1db80f3d122e1c91357f0895940e8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/28891adf643671b6a56d0286918ffe88af4841eb.json b/cedar-integration-tests/corpus_tests/28891adf643671b6a56d0286918ffe88af4841eb.json
index f531e17a7..aac6190cf 100644
--- a/cedar-integration-tests/corpus_tests/28891adf643671b6a56d0286918ffe88af4841eb.json
+++ b/cedar-integration-tests/corpus_tests/28891adf643671b6a56d0286918ffe88af4841eb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "FwwwwQw0::\"\"",
-      "action": "Action::\"em\"",
-      "resource": "FwwwwQw0::\"\"",
+      "principal": {
+        "type": "FwwwwQw0",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwwQw0",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "em"
+      },
       "context": {
         "A0000": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "FwwwwQw0::\"\"",
-      "action": "Action::\"em\"",
-      "resource": "FwwwwQw0::\"\"",
+      "principal": {
+        "type": "FwwwwQw0",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwwQw0",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "em"
+      },
       "context": {
         "A0000": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "FwwwwQw0::\"\"",
-      "action": "Action::\"em\"",
-      "resource": "FwwwwQw0::\"\"",
+      "principal": {
+        "type": "FwwwwQw0",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwwQw0",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "em"
+      },
       "context": {
         "A0000": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "FwwwwQw0::\"\"",
-      "action": "Action::\"em\"",
-      "resource": "FwwwwQw0::\"\"",
+      "principal": {
+        "type": "FwwwwQw0",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwwQw0",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "em"
+      },
       "context": {
         "A0000": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "FwwwwQw0::\"\"",
-      "action": "Action::\"em\"",
-      "resource": "FwwwwQw0::\"\"",
+      "principal": {
+        "type": "FwwwwQw0",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwwQw0",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "em"
+      },
       "context": {
         "A0000": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "FwwwwQw0::\"\"",
-      "action": "Action::\"em\"",
-      "resource": "FwwwwQw0::\"\"",
+      "principal": {
+        "type": "FwwwwQw0",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwwQw0",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "em"
+      },
       "context": {
         "A0000": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "FwwwwQw0::\"\"",
-      "action": "Action::\"em\"",
-      "resource": "FwwwwQw0::\"\"",
+      "principal": {
+        "type": "FwwwwQw0",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwwQw0",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "em"
+      },
       "context": {
         "A0000": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "FwwwwQw0::\"\"",
-      "action": "Action::\"em\"",
-      "resource": "FwwwwQw0::\"\"",
+      "principal": {
+        "type": "FwwwwQw0",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwwQw0",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "em"
+      },
       "context": {
         "A0000": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/288e7853fae2ea13998c5bbff4380fa4736d05bd.json b/cedar-integration-tests/corpus_tests/288e7853fae2ea13998c5bbff4380fa4736d05bd.json
index 7fd16d8d5..2552106f2 100644
--- a/cedar-integration-tests/corpus_tests/288e7853fae2ea13998c5bbff4380fa4736d05bd.json
+++ b/cedar-integration-tests/corpus_tests/288e7853fae2ea13998c5bbff4380fa4736d05bd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"O\\u{2}@\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}+\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}@\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}+\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002@\u0002\u0002\u0002\u0002\u0002\u0002+\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002@\u0002\u0002\u0002\u0002\u0002\u0002+\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"O\\u{2}@\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}+\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}@\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}+\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002@\u0002\u0002\u0002\u0002\u0002\u0002+\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002@\u0002\u0002\u0002\u0002\u0002\u0002+\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"O\\u{2}@\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}+\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}@\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}+\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002@\u0002\u0002\u0002\u0002\u0002\u0002+\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002@\u0002\u0002\u0002\u0002\u0002\u0002+\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"O\\u{2}@\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}+\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}@\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}+\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002@\u0002\u0002\u0002\u0002\u0002\u0002+\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002@\u0002\u0002\u0002\u0002\u0002\u0002+\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"O\\u{2}@\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}+\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}@\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}+\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002@\u0002\u0002\u0002\u0002\u0002\u0002+\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002@\u0002\u0002\u0002\u0002\u0002\u0002+\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"O\\u{2}@\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}+\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}@\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}+\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002@\u0002\u0002\u0002\u0002\u0002\u0002+\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002@\u0002\u0002\u0002\u0002\u0002\u0002+\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"O\\u{2}@\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}+\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}@\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}+\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002@\u0002\u0002\u0002\u0002\u0002\u0002+\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002@\u0002\u0002\u0002\u0002\u0002\u0002+\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"O\\u{2}@\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}+\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}@\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}+\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002@\u0002\u0002\u0002\u0002\u0002\u0002+\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002@\u0002\u0002\u0002\u0002\u0002\u0002+\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/28c81f40923f9bed77b1554dd71f0c13d0d0a08d.json b/cedar-integration-tests/corpus_tests/28c81f40923f9bed77b1554dd71f0c13d0d0a08d.json
index 3ba76773c..49aad8fc7 100644
--- a/cedar-integration-tests/corpus_tests/28c81f40923f9bed77b1554dd71f0c13d0d0a08d.json
+++ b/cedar-integration-tests/corpus_tests/28c81f40923f9bed77b1554dd71f0c13d0d0a08d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -84,9 +147,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/28e96c657852232c265a56e24b9d12ee242fa477.json b/cedar-integration-tests/corpus_tests/28e96c657852232c265a56e24b9d12ee242fa477.json
index 6bf4fcde0..c11634908 100644
--- a/cedar-integration-tests/corpus_tests/28e96c657852232c265a56e24b9d12ee242fa477.json
+++ b/cedar-integration-tests/corpus_tests/28e96c657852232c265a56e24b9d12ee242fa477.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n6107008678\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n6107008678\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n6107008678"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n6107008678"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n6107008678\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n6107008678\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n6107008678"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n6107008678"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n6107008678\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n6107008678\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n6107008678"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n6107008678"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n6107008678\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n6107008678\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n6107008678"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n6107008678"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n6107008678\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n6107008678\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n6107008678"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n6107008678"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n6107008678\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n6107008678\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n6107008678"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n6107008678"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n6107008678\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n6107008678\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n6107008678"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n6107008678"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n6107008678\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n6107008678\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n6107008678"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n6107008678"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/28f2a33ec169a9d5d4f08602156ca79bcb9ae755.json b/cedar-integration-tests/corpus_tests/28f2a33ec169a9d5d4f08602156ca79bcb9ae755.json
index f7ab70dc1..7af1b2e25 100644
--- a/cedar-integration-tests/corpus_tests/28f2a33ec169a9d5d4f08602156ca79bcb9ae755.json
+++ b/cedar-integration-tests/corpus_tests/28f2a33ec169a9d5d4f08602156ca79bcb9ae755.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/2939b834ab5bcb99cdb7050100c28a9b421cf492.json b/cedar-integration-tests/corpus_tests/2939b834ab5bcb99cdb7050100c28a9b421cf492.json
index f4358a4a8..48f149300 100644
--- a/cedar-integration-tests/corpus_tests/2939b834ab5bcb99cdb7050100c28a9b421cf492.json
+++ b/cedar-integration-tests/corpus_tests/2939b834ab5bcb99cdb7050100c28a9b421cf492.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/294094e7c55158d15d4b8ad3a2900b44cacdd859.json b/cedar-integration-tests/corpus_tests/294094e7c55158d15d4b8ad3a2900b44cacdd859.json
index 28cfbc63c..ad747670c 100644
--- a/cedar-integration-tests/corpus_tests/294094e7c55158d15d4b8ad3a2900b44cacdd859.json
+++ b/cedar-integration-tests/corpus_tests/294094e7c55158d15d4b8ad3a2900b44cacdd859.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/2967da6826bf5a7404b811b6948b326725337f4c.json b/cedar-integration-tests/corpus_tests/2967da6826bf5a7404b811b6948b326725337f4c.json
index fe52098ed..572e4444e 100644
--- a/cedar-integration-tests/corpus_tests/2967da6826bf5a7404b811b6948b326725337f4c.json
+++ b/cedar-integration-tests/corpus_tests/2967da6826bf5a7404b811b6948b326725337f4c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/297a9fa0fb81c1ea84f2c745faa7437e42b691b5.json b/cedar-integration-tests/corpus_tests/297a9fa0fb81c1ea84f2c745faa7437e42b691b5.json
index 135811d21..54c4fc3d0 100644
--- a/cedar-integration-tests/corpus_tests/297a9fa0fb81c1ea84f2c745faa7437e42b691b5.json
+++ b/cedar-integration-tests/corpus_tests/297a9fa0fb81c1ea84f2c745faa7437e42b691b5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{2}>si0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002>si0"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}>si0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{2}>si0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002>si0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002>si0"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}>si0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{2}>si0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002>si0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002>si0"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}>si0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{2}>si0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002>si0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002>si0"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}>si0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{2}>si0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002>si0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002>si0"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}>si0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{2}>si0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002>si0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002>si0"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}>si0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{2}>si0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002>si0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002>si0"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}>si0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{2}>si0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002>si0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002>si0"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/298423e730f2241a57e0c47d2966eedc87ad734c.json b/cedar-integration-tests/corpus_tests/298423e730f2241a57e0c47d2966eedc87ad734c.json
index 07bdececf..1fc96fc16 100644
--- a/cedar-integration-tests/corpus_tests/298423e730f2241a57e0c47d2966eedc87ad734c.json
+++ b/cedar-integration-tests/corpus_tests/298423e730f2241a57e0c47d2966eedc87ad734c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/29a58ad3bd458097fd0a19b29f16e2435339f87f.json b/cedar-integration-tests/corpus_tests/29a58ad3bd458097fd0a19b29f16e2435339f87f.json
index 1520e2193..ebc0c8d11 100644
--- a/cedar-integration-tests/corpus_tests/29a58ad3bd458097fd0a19b29f16e2435339f87f.json
+++ b/cedar-integration-tests/corpus_tests/29a58ad3bd458097fd0a19b29f16e2435339f87f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"O\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"O\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"O\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"O\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"O\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"O\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"O\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"O\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/29c852068851eff3d2ac701a81ddc671e346f0fb.json b/cedar-integration-tests/corpus_tests/29c852068851eff3d2ac701a81ddc671e346f0fb.json
index b81cef000..f7c20da1c 100644
--- a/cedar-integration-tests/corpus_tests/29c852068851eff3d2ac701a81ddc671e346f0fb.json
+++ b/cedar-integration-tests/corpus_tests/29c852068851eff3d2ac701a81ddc671e346f0fb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0FFF\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0FFF\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000FFF\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000FFF\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0FFF\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0FFF\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000FFF\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000FFF\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0FFF\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0FFF\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000FFF\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000FFF\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0FFF\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0FFF\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000FFF\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000FFF\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0FFF\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0FFF\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000FFF\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000FFF\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0FFF\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0FFF\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000FFF\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000FFF\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0FFF\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0FFF\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000FFF\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000FFF\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0FFF\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0FFF\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000FFF\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000FFF\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/29d43a94a589a278779f275e33ce27df9bce935f.json b/cedar-integration-tests/corpus_tests/29d43a94a589a278779f275e33ce27df9bce935f.json
index 939404921..e3d19fff0 100644
--- a/cedar-integration-tests/corpus_tests/29d43a94a589a278779f275e33ce27df9bce935f.json
+++ b/cedar-integration-tests/corpus_tests/29d43a94a589a278779f275e33ce27df9bce935f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"zzzzPR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzPR\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzPR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzPR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"zzzzPR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzPR\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzPR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzPR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"zzzzPR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzPR\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzPR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzPR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"zzzzPR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzPR\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzPR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzPR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"zzzzPR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzPR\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzPR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzPR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"zzzzPR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzPR\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzPR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzPR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"zzzzPR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzPR\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzPR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzPR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"zzzzPR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzPR\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzPR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzPR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/29eaecbeb520e625e4fb499d4020a6c66db79d3d.json b/cedar-integration-tests/corpus_tests/29eaecbeb520e625e4fb499d4020a6c66db79d3d.json
index 5a498afd4..cac0772c5 100644
--- a/cedar-integration-tests/corpus_tests/29eaecbeb520e625e4fb499d4020a6c66db79d3d.json
+++ b/cedar-integration-tests/corpus_tests/29eaecbeb520e625e4fb499d4020a6c66db79d3d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/2a501921cf1b30900cab66e49cb20fea18b23cc3.json b/cedar-integration-tests/corpus_tests/2a501921cf1b30900cab66e49cb20fea18b23cc3.json
index bc3b4c6e0..d7533832a 100644
--- a/cedar-integration-tests/corpus_tests/2a501921cf1b30900cab66e49cb20fea18b23cc3.json
+++ b/cedar-integration-tests/corpus_tests/2a501921cf1b30900cab66e49cb20fea18b23cc3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/2a92a0a79c92959ca359751d8de6dfbe1dc0babe.json b/cedar-integration-tests/corpus_tests/2a92a0a79c92959ca359751d8de6dfbe1dc0babe.json
index 04cc18c8f..3f72a51bd 100644
--- a/cedar-integration-tests/corpus_tests/2a92a0a79c92959ca359751d8de6dfbe1dc0babe.json
+++ b/cedar-integration-tests/corpus_tests/2a92a0a79c92959ca359751d8de6dfbe1dc0babe.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"fffffff* f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffff* f\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffff* f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffff* f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"fffffff* f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffff* f\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffff* f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffff* f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"fffffff* f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffff* f\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffff* f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffff* f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"fffffff* f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffff* f\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffff* f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffff* f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"fffffff* f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffff* f\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffff* f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffff* f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"fffffff* f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffff* f\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffff* f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffff* f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"fffffff* f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffff* f\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffff* f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffff* f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"fffffff* f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffff* f\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffff* f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffff* f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/2a970a29a476251738d85165757de0a961c68f7b.json b/cedar-integration-tests/corpus_tests/2a970a29a476251738d85165757de0a961c68f7b.json
index 2536cb9b2..61e1a5080 100644
--- a/cedar-integration-tests/corpus_tests/2a970a29a476251738d85165757de0a961c68f7b.json
+++ b/cedar-integration-tests/corpus_tests/2a970a29a476251738d85165757de0a961c68f7b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\" \\0\\0\\u{1b}ffgff00000066791035$\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\" \\0\\0\\u{1b}ffgff00000066791035$\"",
+      "principal": {
+        "type": "a",
+        "id": " \u0000\u0000\u001bffgff00000066791035$"
+      },
+      "resource": {
+        "type": "a",
+        "id": " \u0000\u0000\u001bffgff00000066791035$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\" \\0\\0\\u{1b}ffgff00000066791035$\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\" \\0\\0\\u{1b}ffgff00000066791035$\"",
+      "principal": {
+        "type": "a",
+        "id": " \u0000\u0000\u001bffgff00000066791035$"
+      },
+      "resource": {
+        "type": "a",
+        "id": " \u0000\u0000\u001bffgff00000066791035$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\" \\0\\0\\u{1b}ffgff00000066791035$\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\" \\0\\0\\u{1b}ffgff00000066791035$\"",
+      "principal": {
+        "type": "a",
+        "id": " \u0000\u0000\u001bffgff00000066791035$"
+      },
+      "resource": {
+        "type": "a",
+        "id": " \u0000\u0000\u001bffgff00000066791035$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\" \\0\\0\\u{1b}ffgff00000066791035$\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\" \\0\\0\\u{1b}ffgff00000066791035$\"",
+      "principal": {
+        "type": "a",
+        "id": " \u0000\u0000\u001bffgff00000066791035$"
+      },
+      "resource": {
+        "type": "a",
+        "id": " \u0000\u0000\u001bffgff00000066791035$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\" \\0\\0\\u{1b}ffgff00000066791035$\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\" \\0\\0\\u{1b}ffgff00000066791035$\"",
+      "principal": {
+        "type": "a",
+        "id": " \u0000\u0000\u001bffgff00000066791035$"
+      },
+      "resource": {
+        "type": "a",
+        "id": " \u0000\u0000\u001bffgff00000066791035$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\" \\0\\0\\u{1b}ffgff00000066791035$\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\" \\0\\0\\u{1b}ffgff00000066791035$\"",
+      "principal": {
+        "type": "a",
+        "id": " \u0000\u0000\u001bffgff00000066791035$"
+      },
+      "resource": {
+        "type": "a",
+        "id": " \u0000\u0000\u001bffgff00000066791035$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\" \\0\\0\\u{1b}ffgff00000066791035$\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\" \\0\\0\\u{1b}ffgff00000066791035$\"",
+      "principal": {
+        "type": "a",
+        "id": " \u0000\u0000\u001bffgff00000066791035$"
+      },
+      "resource": {
+        "type": "a",
+        "id": " \u0000\u0000\u001bffgff00000066791035$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\" \\0\\0\\u{1b}ffgff00000066791035$\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\" \\0\\0\\u{1b}ffgff00000066791035$\"",
+      "principal": {
+        "type": "a",
+        "id": " \u0000\u0000\u001bffgff00000066791035$"
+      },
+      "resource": {
+        "type": "a",
+        "id": " \u0000\u0000\u001bffgff00000066791035$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/2ab4dc91a56bfaf8d12d58b647a0a7d6e51bd8ed.json b/cedar-integration-tests/corpus_tests/2ab4dc91a56bfaf8d12d58b647a0a7d6e51bd8ed.json
index 89013ceb5..508c83247 100644
--- a/cedar-integration-tests/corpus_tests/2ab4dc91a56bfaf8d12d58b647a0a7d6e51bd8ed.json
+++ b/cedar-integration-tests/corpus_tests/2ab4dc91a56bfaf8d12d58b647a0a7d6e51bd8ed.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"y/Fu\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "y/Fu"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"y/Fu\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"y/Fu\"",
+      "principal": {
+        "type": "a",
+        "id": "y/Fu"
+      },
+      "resource": {
+        "type": "a",
+        "id": "y/Fu"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"y/Fu\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"y/Fu\"",
+      "principal": {
+        "type": "a",
+        "id": "y/Fu"
+      },
+      "resource": {
+        "type": "a",
+        "id": "y/Fu"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"y/Fu\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"y/Fu\"",
+      "principal": {
+        "type": "a",
+        "id": "y/Fu"
+      },
+      "resource": {
+        "type": "a",
+        "id": "y/Fu"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"y/Fu\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"y/Fu\"",
+      "principal": {
+        "type": "a",
+        "id": "y/Fu"
+      },
+      "resource": {
+        "type": "a",
+        "id": "y/Fu"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"y/Fu\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"y/Fu\"",
+      "principal": {
+        "type": "a",
+        "id": "y/Fu"
+      },
+      "resource": {
+        "type": "a",
+        "id": "y/Fu"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"y/Fu\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"y/Fu\"",
+      "principal": {
+        "type": "a",
+        "id": "y/Fu"
+      },
+      "resource": {
+        "type": "a",
+        "id": "y/Fu"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"y/Fu\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"y/Fu\"",
+      "principal": {
+        "type": "a",
+        "id": "y/Fu"
+      },
+      "resource": {
+        "type": "a",
+        "id": "y/Fu"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/2adbc697e6a4307319167e11381a5264e8da8746.json b/cedar-integration-tests/corpus_tests/2adbc697e6a4307319167e11381a5264e8da8746.json
index 9500d3c8a..747fd24cd 100644
--- a/cedar-integration-tests/corpus_tests/2adbc697e6a4307319167e11381a5264e8da8746.json
+++ b/cedar-integration-tests/corpus_tests/2adbc697e6a4307319167e11381a5264e8da8746.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/2af3948403ce9144fb57f1df45e657229368e1bb.json b/cedar-integration-tests/corpus_tests/2af3948403ce9144fb57f1df45e657229368e1bb.json
index c42b89535..7d94ebe80 100644
--- a/cedar-integration-tests/corpus_tests/2af3948403ce9144fb57f1df45e657229368e1bb.json
+++ b/cedar-integration-tests/corpus_tests/2af3948403ce9144fb57f1df45e657229368e1bb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::rhBhLKKJJ033::r::i::r::a::\"\"",
-      "action": "r::rhBhLKKJJ033::r::i::r::Action::\"action\"",
-      "resource": "r::rhBhLKKJJ033::r::i::r::a::\"\"",
+      "principal": {
+        "type": "r::rhBhLKKJJ033::r::i::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::rhBhLKKJJ033::r::i::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::rhBhLKKJJ033::r::i::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::rhBhLKKJJ033::r::i::r::a::\"\"",
-      "action": "r::rhBhLKKJJ033::r::i::r::Action::\"action\"",
-      "resource": "r::rhBhLKKJJ033::r::i::r::a::\"\"",
+      "principal": {
+        "type": "r::rhBhLKKJJ033::r::i::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::rhBhLKKJJ033::r::i::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::rhBhLKKJJ033::r::i::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::rhBhLKKJJ033::r::i::r::a::\"\"",
-      "action": "r::rhBhLKKJJ033::r::i::r::Action::\"action\"",
-      "resource": "r::rhBhLKKJJ033::r::i::r::a::\"\"",
+      "principal": {
+        "type": "r::rhBhLKKJJ033::r::i::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::rhBhLKKJJ033::r::i::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::rhBhLKKJJ033::r::i::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::rhBhLKKJJ033::r::i::r::a::\"\"",
-      "action": "r::rhBhLKKJJ033::r::i::r::Action::\"action\"",
-      "resource": "r::rhBhLKKJJ033::r::i::r::a::\"\"",
+      "principal": {
+        "type": "r::rhBhLKKJJ033::r::i::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::rhBhLKKJJ033::r::i::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::rhBhLKKJJ033::r::i::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::rhBhLKKJJ033::r::i::r::a::\"\"",
-      "action": "r::rhBhLKKJJ033::r::i::r::Action::\"action\"",
-      "resource": "r::rhBhLKKJJ033::r::i::r::a::\"\"",
+      "principal": {
+        "type": "r::rhBhLKKJJ033::r::i::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::rhBhLKKJJ033::r::i::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::rhBhLKKJJ033::r::i::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::rhBhLKKJJ033::r::i::r::a::\"\"",
-      "action": "r::rhBhLKKJJ033::r::i::r::Action::\"action\"",
-      "resource": "r::rhBhLKKJJ033::r::i::r::a::\"\"",
+      "principal": {
+        "type": "r::rhBhLKKJJ033::r::i::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::rhBhLKKJJ033::r::i::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::rhBhLKKJJ033::r::i::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::rhBhLKKJJ033::r::i::r::a::\"\"",
-      "action": "r::rhBhLKKJJ033::r::i::r::Action::\"action\"",
-      "resource": "r::rhBhLKKJJ033::r::i::r::a::\"\"",
+      "principal": {
+        "type": "r::rhBhLKKJJ033::r::i::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::rhBhLKKJJ033::r::i::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::rhBhLKKJJ033::r::i::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::rhBhLKKJJ033::r::i::r::a::\"\"",
-      "action": "r::rhBhLKKJJ033::r::i::r::Action::\"action\"",
-      "resource": "r::rhBhLKKJJ033::r::i::r::a::\"\"",
+      "principal": {
+        "type": "r::rhBhLKKJJ033::r::i::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::rhBhLKKJJ033::r::i::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::rhBhLKKJJ033::r::i::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/2b10dbdef1754d180cb4858be9dcff0cd3be653e.json b/cedar-integration-tests/corpus_tests/2b10dbdef1754d180cb4858be9dcff0cd3be653e.json
index 911ef507f..35ea38229 100644
--- a/cedar-integration-tests/corpus_tests/2b10dbdef1754d180cb4858be9dcff0cd3be653e.json
+++ b/cedar-integration-tests/corpus_tests/2b10dbdef1754d180cb4858be9dcff0cd3be653e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"fff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fff\"",
+      "principal": {
+        "type": "a",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"fff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fff\"",
+      "principal": {
+        "type": "a",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"fff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fff\"",
+      "principal": {
+        "type": "a",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"fff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fff\"",
+      "principal": {
+        "type": "a",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"fff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fff\"",
+      "principal": {
+        "type": "a",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"fff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fff\"",
+      "principal": {
+        "type": "a",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"fff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fff\"",
+      "principal": {
+        "type": "a",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"fff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fff\"",
+      "principal": {
+        "type": "a",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/2b1fc2caecbcaf4c09a99ef3a2cc3f156112e495.json b/cedar-integration-tests/corpus_tests/2b1fc2caecbcaf4c09a99ef3a2cc3f156112e495.json
index 258082377..428295a9a 100644
--- a/cedar-integration-tests/corpus_tests/2b1fc2caecbcaf4c09a99ef3a2cc3f156112e495.json
+++ b/cedar-integration-tests/corpus_tests/2b1fc2caecbcaf4c09a99ef3a2cc3f156112e495.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"2\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"2\"",
+      "principal": {
+        "type": "a",
+        "id": "2"
+      },
+      "resource": {
+        "type": "a",
+        "id": "2"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"2\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"2\"",
+      "principal": {
+        "type": "a",
+        "id": "2"
+      },
+      "resource": {
+        "type": "a",
+        "id": "2"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"2\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"2\"",
+      "principal": {
+        "type": "a",
+        "id": "2"
+      },
+      "resource": {
+        "type": "a",
+        "id": "2"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"2\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"2\"",
+      "principal": {
+        "type": "a",
+        "id": "2"
+      },
+      "resource": {
+        "type": "a",
+        "id": "2"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"2\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"2\"",
+      "principal": {
+        "type": "a",
+        "id": "2"
+      },
+      "resource": {
+        "type": "a",
+        "id": "2"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"2\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"2\"",
+      "principal": {
+        "type": "a",
+        "id": "2"
+      },
+      "resource": {
+        "type": "a",
+        "id": "2"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"2\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"2\"",
+      "principal": {
+        "type": "a",
+        "id": "2"
+      },
+      "resource": {
+        "type": "a",
+        "id": "2"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"2\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"2\"",
+      "principal": {
+        "type": "a",
+        "id": "2"
+      },
+      "resource": {
+        "type": "a",
+        "id": "2"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/2b4f5976ba2de3e7a4113188816841635e7ce9ef.json b/cedar-integration-tests/corpus_tests/2b4f5976ba2de3e7a4113188816841635e7ce9ef.json
index effdafbc0..d83715825 100644
--- a/cedar-integration-tests/corpus_tests/2b4f5976ba2de3e7a4113188816841635e7ce9ef.json
+++ b/cedar-integration-tests/corpus_tests/2b4f5976ba2de3e7a4113188816841635e7ce9ef.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/2bbf8c5159544988a0b9a9e3cb449aabcbd76e19.json b/cedar-integration-tests/corpus_tests/2bbf8c5159544988a0b9a9e3cb449aabcbd76e19.json
index 339e33b9f..72e518e0e 100644
--- a/cedar-integration-tests/corpus_tests/2bbf8c5159544988a0b9a9e3cb449aabcbd76e19.json
+++ b/cedar-integration-tests/corpus_tests/2bbf8c5159544988a0b9a9e3cb449aabcbd76e19.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::a::\">x\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\">x\"",
+      "principal": {
+        "type": "A::a",
+        "id": ">x"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ">x"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::a::\">x\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\">x\"",
+      "principal": {
+        "type": "A::a",
+        "id": ">x"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ">x"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::a::\">x\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\">x\"",
+      "principal": {
+        "type": "A::a",
+        "id": ">x"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ">x"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::a::\">x\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\">x\"",
+      "principal": {
+        "type": "A::a",
+        "id": ">x"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ">x"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::a::\">x\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\">x\"",
+      "principal": {
+        "type": "A::a",
+        "id": ">x"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ">x"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::a::\">x\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\">x\"",
+      "principal": {
+        "type": "A::a",
+        "id": ">x"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ">x"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::a::\">x\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\">x\"",
+      "principal": {
+        "type": "A::a",
+        "id": ">x"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ">x"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::a::\">x\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\">x\"",
+      "principal": {
+        "type": "A::a",
+        "id": ">x"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ">x"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/2be730f03e17dff06a3b162a5bab74a5a8b443ef.json b/cedar-integration-tests/corpus_tests/2be730f03e17dff06a3b162a5bab74a5a8b443ef.json
index cdda75bae..4220a90fc 100644
--- a/cedar-integration-tests/corpus_tests/2be730f03e17dff06a3b162a5bab74a5a8b443ef.json
+++ b/cedar-integration-tests/corpus_tests/2be730f03e17dff06a3b162a5bab74a5a8b443ef.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0FFFF\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFF\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFF\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011\u0011\u0011\u0011\u0011\u0011\u0011"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFF\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011\u0011\u0011\u0011\u0011\u0011\u0011"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0FFFF\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFF\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFF\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011\u0011\u0011\u0011\u0011\u0011\u0011"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFF\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011\u0011\u0011\u0011\u0011\u0011\u0011"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0FFFF\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFF\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFF\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011\u0011\u0011\u0011\u0011\u0011\u0011"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFF\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011\u0011\u0011\u0011\u0011\u0011\u0011"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0FFFF\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFF\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFF\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011\u0011\u0011\u0011\u0011\u0011\u0011"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFF\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011\u0011\u0011\u0011\u0011\u0011\u0011"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0FFFF\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFF\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFF\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011\u0011\u0011\u0011\u0011\u0011\u0011"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFF\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011\u0011\u0011\u0011\u0011\u0011\u0011"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0FFFF\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFF\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFF\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011\u0011\u0011\u0011\u0011\u0011\u0011"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFF\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011\u0011\u0011\u0011\u0011\u0011\u0011"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0FFFF\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFF\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFF\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011\u0011\u0011\u0011\u0011\u0011\u0011"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFF\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011\u0011\u0011\u0011\u0011\u0011\u0011"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0FFFF\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFF\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\\u{11}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFF\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011\u0011\u0011\u0011\u0011\u0011\u0011"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFF\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011\u0011\u0011\u0011\u0011\u0011\u0011"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/2d01a9dd1edaeddb62b729a0f6b80e670300517b.json b/cedar-integration-tests/corpus_tests/2d01a9dd1edaeddb62b729a0f6b80e670300517b.json
index 11107ae57..1424f0aca 100644
--- a/cedar-integration-tests/corpus_tests/2d01a9dd1edaeddb62b729a0f6b80e670300517b.json
+++ b/cedar-integration-tests/corpus_tests/2d01a9dd1edaeddb62b729a0f6b80e670300517b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/2d3208bd996226a839e67bb936b7a0311fa45e5f.json b/cedar-integration-tests/corpus_tests/2d3208bd996226a839e67bb936b7a0311fa45e5f.json
index 231b99509..5fc5db007 100644
--- a/cedar-integration-tests/corpus_tests/2d3208bd996226a839e67bb936b7a0311fa45e5f.json
+++ b/cedar-integration-tests/corpus_tests/2d3208bd996226a839e67bb936b7a0311fa45e5f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/2d53f67331b256fccd0dbf0e8cb616b64a5e2886.json b/cedar-integration-tests/corpus_tests/2d53f67331b256fccd0dbf0e8cb616b64a5e2886.json
index 0a4fa632e..63988647c 100644
--- a/cedar-integration-tests/corpus_tests/2d53f67331b256fccd0dbf0e8cb616b64a5e2886.json
+++ b/cedar-integration-tests/corpus_tests/2d53f67331b256fccd0dbf0e8cb616b64a5e2886.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"afny\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"afny\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "afny\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "afny\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"afny\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"afny\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "afny\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "afny\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"afny\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"afny\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "afny\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "afny\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"afny\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"afny\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "afny\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "afny\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"afny\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"afny\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "afny\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "afny\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"afny\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"afny\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "afny\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "afny\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"afny\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"afny\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "afny\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "afny\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"afny\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"afny\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "afny\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "afny\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
diff --git a/cedar-integration-tests/corpus_tests/2d6dc2f9cc6324fe07bec72a98ac623cbdecfa12.json b/cedar-integration-tests/corpus_tests/2d6dc2f9cc6324fe07bec72a98ac623cbdecfa12.json
index be31ecee9..a0cbf1703 100644
--- a/cedar-integration-tests/corpus_tests/2d6dc2f9cc6324fe07bec72a98ac623cbdecfa12.json
+++ b/cedar-integration-tests/corpus_tests/2d6dc2f9cc6324fe07bec72a98ac623cbdecfa12.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/2d8ef9bbd4a39187d62cd78bc8cff5db1d5c2703.json b/cedar-integration-tests/corpus_tests/2d8ef9bbd4a39187d62cd78bc8cff5db1d5c2703.json
index a1b7bdf2c..ba14db91c 100644
--- a/cedar-integration-tests/corpus_tests/2d8ef9bbd4a39187d62cd78bc8cff5db1d5c2703.json
+++ b/cedar-integration-tests/corpus_tests/2d8ef9bbd4a39187d62cd78bc8cff5db1d5c2703.json
@@ -7,8 +7,14 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"pFYrgt\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "pFYrgt"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +25,14 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"pFYrgt\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "pFYrgt"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +43,14 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"pFYrgt\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "pFYrgt"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +61,14 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"pFYrgt\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "pFYrgt"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +79,14 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"pFYrgt\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "pFYrgt"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +97,14 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"pFYrgt\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "pFYrgt"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +115,14 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"pFYrgt\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "pFYrgt"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +133,14 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"pFYrgt\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "pFYrgt"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/2dfeef893ce30fabc766d84a556edd70f9749fcb.json b/cedar-integration-tests/corpus_tests/2dfeef893ce30fabc766d84a556edd70f9749fcb.json
index b5557cd5d..7aa425f36 100644
--- a/cedar-integration-tests/corpus_tests/2dfeef893ce30fabc766d84a556edd70f9749fcb.json
+++ b/cedar-integration-tests/corpus_tests/2dfeef893ce30fabc766d84a556edd70f9749fcb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/2e0f8405e4eb5dca742c420943a4d237a90f3dc7.json b/cedar-integration-tests/corpus_tests/2e0f8405e4eb5dca742c420943a4d237a90f3dc7.json
index f0d1a34f1..b625ea63e 100644
--- a/cedar-integration-tests/corpus_tests/2e0f8405e4eb5dca742c420943a4d237a90f3dc7.json
+++ b/cedar-integration-tests/corpus_tests/2e0f8405e4eb5dca742c420943a4d237a90f3dc7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "ph9kXkkkk40000::ifh::a::\"\"",
-      "action": "ph9kXkkkk40000::ifh::Action::\"action\"",
-      "resource": "ph9kXkkkk40000::ifh::a::\"\"",
+      "principal": {
+        "type": "ph9kXkkkk40000::ifh::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "ph9kXkkkk40000::ifh::a",
+        "id": ""
+      },
+      "action": {
+        "type": "ph9kXkkkk40000::ifh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "ph9kXkkkk40000::ifh::a::\"\"",
-      "action": "ph9kXkkkk40000::ifh::Action::\"action\"",
-      "resource": "ph9kXkkkk40000::ifh::a::\"\"",
+      "principal": {
+        "type": "ph9kXkkkk40000::ifh::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "ph9kXkkkk40000::ifh::a",
+        "id": ""
+      },
+      "action": {
+        "type": "ph9kXkkkk40000::ifh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "ph9kXkkkk40000::ifh::a::\"\"",
-      "action": "ph9kXkkkk40000::ifh::Action::\"action\"",
-      "resource": "ph9kXkkkk40000::ifh::a::\"\"",
+      "principal": {
+        "type": "ph9kXkkkk40000::ifh::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "ph9kXkkkk40000::ifh::a",
+        "id": ""
+      },
+      "action": {
+        "type": "ph9kXkkkk40000::ifh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "ph9kXkkkk40000::ifh::a::\"\"",
-      "action": "ph9kXkkkk40000::ifh::Action::\"action\"",
-      "resource": "ph9kXkkkk40000::ifh::a::\"\"",
+      "principal": {
+        "type": "ph9kXkkkk40000::ifh::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "ph9kXkkkk40000::ifh::a",
+        "id": ""
+      },
+      "action": {
+        "type": "ph9kXkkkk40000::ifh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "ph9kXkkkk40000::ifh::a::\"\"",
-      "action": "ph9kXkkkk40000::ifh::Action::\"action\"",
-      "resource": "ph9kXkkkk40000::ifh::a::\"\"",
+      "principal": {
+        "type": "ph9kXkkkk40000::ifh::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "ph9kXkkkk40000::ifh::a",
+        "id": ""
+      },
+      "action": {
+        "type": "ph9kXkkkk40000::ifh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "ph9kXkkkk40000::ifh::a::\"\"",
-      "action": "ph9kXkkkk40000::ifh::Action::\"action\"",
-      "resource": "ph9kXkkkk40000::ifh::a::\"\"",
+      "principal": {
+        "type": "ph9kXkkkk40000::ifh::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "ph9kXkkkk40000::ifh::a",
+        "id": ""
+      },
+      "action": {
+        "type": "ph9kXkkkk40000::ifh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "ph9kXkkkk40000::ifh::a::\"\"",
-      "action": "ph9kXkkkk40000::ifh::Action::\"action\"",
-      "resource": "ph9kXkkkk40000::ifh::a::\"\"",
+      "principal": {
+        "type": "ph9kXkkkk40000::ifh::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "ph9kXkkkk40000::ifh::a",
+        "id": ""
+      },
+      "action": {
+        "type": "ph9kXkkkk40000::ifh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "ph9kXkkkk40000::ifh::a::\"\"",
-      "action": "ph9kXkkkk40000::ifh::Action::\"action\"",
-      "resource": "ph9kXkkkk40000::ifh::a::\"\"",
+      "principal": {
+        "type": "ph9kXkkkk40000::ifh::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "ph9kXkkkk40000::ifh::a",
+        "id": ""
+      },
+      "action": {
+        "type": "ph9kXkkkk40000::ifh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/2e1ce51bfdf8340949c83d5216899ead6d0cff7b.json b/cedar-integration-tests/corpus_tests/2e1ce51bfdf8340949c83d5216899ead6d0cff7b.json
index 28f4368ac..8ef6bb860 100644
--- a/cedar-integration-tests/corpus_tests/2e1ce51bfdf8340949c83d5216899ead6d0cff7b.json
+++ b/cedar-integration-tests/corpus_tests/2e1ce51bfdf8340949c83d5216899ead6d0cff7b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/2e7de5fbaf5460864156bcda3ca470783782523f.json b/cedar-integration-tests/corpus_tests/2e7de5fbaf5460864156bcda3ca470783782523f.json
index f3a3c2a49..e1e6919ca 100644
--- a/cedar-integration-tests/corpus_tests/2e7de5fbaf5460864156bcda3ca470783782523f.json
+++ b/cedar-integration-tests/corpus_tests/2e7de5fbaf5460864156bcda3ca470783782523f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"fff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "fff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"fff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "fff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"fff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "fff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -82,9 +145,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/2e8149e2e167a7b8c67c06a68578c86e24971a67.json b/cedar-integration-tests/corpus_tests/2e8149e2e167a7b8c67c06a68578c86e24971a67.json
index ab863fb63..e38cff571 100644
--- a/cedar-integration-tests/corpus_tests/2e8149e2e167a7b8c67c06a68578c86e24971a67.json
+++ b/cedar-integration-tests/corpus_tests/2e8149e2e167a7b8c67c06a68578c86e24971a67.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}c\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}c\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}c\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}c\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}c\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}c\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}c\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/2f05c0b59d4013ce1145e6f4fa165f847aae82f2.json b/cedar-integration-tests/corpus_tests/2f05c0b59d4013ce1145e6f4fa165f847aae82f2.json
index d335eae78..a09a4282d 100644
--- a/cedar-integration-tests/corpus_tests/2f05c0b59d4013ce1145e6f4fa165f847aae82f2.json
+++ b/cedar-integration-tests/corpus_tests/2f05c0b59d4013ce1145e6f4fa165f847aae82f2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "L::A000::a::\"+\"",
-      "action": "L::A000::Action::\"action\"",
-      "resource": "L::A000::a::\"+\"",
+      "principal": {
+        "type": "L::A000::a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "L::A000::a",
+        "id": "+"
+      },
+      "action": {
+        "type": "L::A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "L::A000::a::\"+\"",
-      "action": "L::A000::Action::\"action\"",
-      "resource": "L::A000::a::\"+\"",
+      "principal": {
+        "type": "L::A000::a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "L::A000::a",
+        "id": "+"
+      },
+      "action": {
+        "type": "L::A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "L::A000::a::\"+\"",
-      "action": "L::A000::Action::\"action\"",
-      "resource": "L::A000::a::\"+\"",
+      "principal": {
+        "type": "L::A000::a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "L::A000::a",
+        "id": "+"
+      },
+      "action": {
+        "type": "L::A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "L::A000::a::\"+\"",
-      "action": "L::A000::Action::\"action\"",
-      "resource": "L::A000::a::\"+\"",
+      "principal": {
+        "type": "L::A000::a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "L::A000::a",
+        "id": "+"
+      },
+      "action": {
+        "type": "L::A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "L::A000::a::\"+\"",
-      "action": "L::A000::Action::\"action\"",
-      "resource": "L::A000::a::\"+\"",
+      "principal": {
+        "type": "L::A000::a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "L::A000::a",
+        "id": "+"
+      },
+      "action": {
+        "type": "L::A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "L::A000::a::\"+\"",
-      "action": "L::A000::Action::\"action\"",
-      "resource": "L::A000::a::\"+\"",
+      "principal": {
+        "type": "L::A000::a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "L::A000::a",
+        "id": "+"
+      },
+      "action": {
+        "type": "L::A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "L::A000::a::\"+\"",
-      "action": "L::A000::Action::\"action\"",
-      "resource": "L::A000::a::\"+\"",
+      "principal": {
+        "type": "L::A000::a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "L::A000::a",
+        "id": "+"
+      },
+      "action": {
+        "type": "L::A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "L::A000::a::\"+\"",
-      "action": "L::A000::Action::\"action\"",
-      "resource": "L::A000::a::\"+\"",
+      "principal": {
+        "type": "L::A000::a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "L::A000::a",
+        "id": "+"
+      },
+      "action": {
+        "type": "L::A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/2f323549a312eb48a4a6d247e1d27bf876d9c394.json b/cedar-integration-tests/corpus_tests/2f323549a312eb48a4a6d247e1d27bf876d9c394.json
index 1796048a2..bbaa8da71 100644
--- a/cedar-integration-tests/corpus_tests/2f323549a312eb48a4a6d247e1d27bf876d9c394.json
+++ b/cedar-integration-tests/corpus_tests/2f323549a312eb48a4a6d247e1d27bf876d9c394.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"v)\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"v)\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "v)\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "v)\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"v)\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"v)\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "v)\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "v)\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"v)\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"v)\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "v)\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "v)\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"v)\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"v)\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "v)\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "v)\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"v)\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"v)\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "v)\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "v)\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/2f4bf1e01f710500d499dc15cc5b1ec2a663875d.json b/cedar-integration-tests/corpus_tests/2f4bf1e01f710500d499dc15cc5b1ec2a663875d.json
index feaff7f30..89ab064fc 100644
--- a/cedar-integration-tests/corpus_tests/2f4bf1e01f710500d499dc15cc5b1ec2a663875d.json
+++ b/cedar-integration-tests/corpus_tests/2f4bf1e01f710500d499dc15cc5b1ec2a663875d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "S": {
           "": "",
@@ -27,9 +36,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "S": {
           "": "",
@@ -48,9 +66,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "S": {
           "": "",
@@ -69,9 +96,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "S": {
           "": "",
@@ -90,9 +126,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "S": {
           "": "",
@@ -111,9 +156,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "S": {
           "": "",
@@ -132,9 +186,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "S": {
           "": "",
@@ -153,9 +216,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "S": {
           "": "",
diff --git a/cedar-integration-tests/corpus_tests/2f547f49e49d76b32039604ef3b6a9a14db1d3b0.json b/cedar-integration-tests/corpus_tests/2f547f49e49d76b32039604ef3b6a9a14db1d3b0.json
index b46cc3a1d..e8929d8ac 100644
--- a/cedar-integration-tests/corpus_tests/2f547f49e49d76b32039604ef3b6a9a14db1d3b0.json
+++ b/cedar-integration-tests/corpus_tests/2f547f49e49d76b32039604ef3b6a9a14db1d3b0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Fwwwwwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww::\"\"",
+      "principal": {
+        "type": "Fwwwwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Fwwwwwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww::\"\"",
+      "principal": {
+        "type": "Fwwwwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Fwwwwwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww::\"\"",
+      "principal": {
+        "type": "Fwwwwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Fwwwwwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww::\"\"",
+      "principal": {
+        "type": "Fwwwwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Fwwwwwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww::\"\"",
+      "principal": {
+        "type": "Fwwwwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Fwwwwwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww::\"\"",
+      "principal": {
+        "type": "Fwwwwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Fwwwwwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww::\"\"",
+      "principal": {
+        "type": "Fwwwwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Fwwwwwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww::\"\"",
+      "principal": {
+        "type": "Fwwwwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/2f5bd936f79ec4730edf3ff478298079d0f1c774.json b/cedar-integration-tests/corpus_tests/2f5bd936f79ec4730edf3ff478298079d0f1c774.json
index 65a556b9f..1ec644d0d 100644
--- a/cedar-integration-tests/corpus_tests/2f5bd936f79ec4730edf3ff478298079d0f1c774.json
+++ b/cedar-integration-tests/corpus_tests/2f5bd936f79ec4730edf3ff478298079d0f1c774.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "C22::a::\"\"",
-      "action": "C22::Action::\"action\"",
-      "resource": "C22::a::\"\\0\\0\"",
+      "principal": {
+        "type": "C22::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C22::a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "C22::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "C22::a::\"\\0\\0\"",
-      "action": "C22::Action::\"action\"",
-      "resource": "C22::a::\"\\0\\0\"",
+      "principal": {
+        "type": "C22::a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "C22::a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "C22::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "C22::a::\"\"",
-      "action": "C22::Action::\"action\"",
-      "resource": "C22::a::\"\"",
+      "principal": {
+        "type": "C22::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C22::a",
+        "id": ""
+      },
+      "action": {
+        "type": "C22::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "C22::a::\"\"",
-      "action": "C22::Action::\"action\"",
-      "resource": "C22::a::\"\"",
+      "principal": {
+        "type": "C22::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C22::a",
+        "id": ""
+      },
+      "action": {
+        "type": "C22::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "C22::a::\"\"",
-      "action": "C22::Action::\"action\"",
-      "resource": "C22::a::\"\"",
+      "principal": {
+        "type": "C22::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C22::a",
+        "id": ""
+      },
+      "action": {
+        "type": "C22::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "C22::a::\"\"",
-      "action": "C22::Action::\"action\"",
-      "resource": "C22::a::\"\"",
+      "principal": {
+        "type": "C22::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C22::a",
+        "id": ""
+      },
+      "action": {
+        "type": "C22::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "C22::a::\"\"",
-      "action": "C22::Action::\"action\"",
-      "resource": "C22::a::\"\"",
+      "principal": {
+        "type": "C22::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C22::a",
+        "id": ""
+      },
+      "action": {
+        "type": "C22::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "C22::a::\"\"",
-      "action": "C22::Action::\"action\"",
-      "resource": "C22::a::\"\"",
+      "principal": {
+        "type": "C22::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C22::a",
+        "id": ""
+      },
+      "action": {
+        "type": "C22::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/2fac6819d3964bdcc8380be582566d314be29903.json b/cedar-integration-tests/corpus_tests/2fac6819d3964bdcc8380be582566d314be29903.json
index cb3ed75bb..9337018f9 100644
--- a/cedar-integration-tests/corpus_tests/2fac6819d3964bdcc8380be582566d314be29903.json
+++ b/cedar-integration-tests/corpus_tests/2fac6819d3964bdcc8380be582566d314be29903.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3004e6adb816e399febf4b58bee52dcf52408490.json b/cedar-integration-tests/corpus_tests/3004e6adb816e399febf4b58bee52dcf52408490.json
index 16bab6c86..2a57db2f2 100644
--- a/cedar-integration-tests/corpus_tests/3004e6adb816e399febf4b58bee52dcf52408490.json
+++ b/cedar-integration-tests/corpus_tests/3004e6adb816e399febf4b58bee52dcf52408490.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/30d42aa8f44a1b4c9a9c4e0037eef0d324f50172.json b/cedar-integration-tests/corpus_tests/30d42aa8f44a1b4c9a9c4e0037eef0d324f50172.json
index 52d8c681f..73110d64d 100644
--- a/cedar-integration-tests/corpus_tests/30d42aa8f44a1b4c9a9c4e0037eef0d324f50172.json
+++ b/cedar-integration-tests/corpus_tests/30d42aa8f44a1b4c9a9c4e0037eef0d324f50172.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/30ea78135f731d99845eb1db7002184213ff7a6c.json b/cedar-integration-tests/corpus_tests/30ea78135f731d99845eb1db7002184213ff7a6c.json
index a57110f55..699c8ef9e 100644
--- a/cedar-integration-tests/corpus_tests/30ea78135f731d99845eb1db7002184213ff7a6c.json
+++ b/cedar-integration-tests/corpus_tests/30ea78135f731d99845eb1db7002184213ff7a6c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/30ecdc4abf5662a82a7f8503418b11e737369800.json b/cedar-integration-tests/corpus_tests/30ecdc4abf5662a82a7f8503418b11e737369800.json
index 34f2a96a0..edb2b7f62 100644
--- a/cedar-integration-tests/corpus_tests/30ecdc4abf5662a82a7f8503418b11e737369800.json
+++ b/cedar-integration-tests/corpus_tests/30ecdc4abf5662a82a7f8503418b11e737369800.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fk9": "",
         "A": "",
@@ -23,9 +32,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fk9": "",
         "A": "",
@@ -40,9 +58,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fk9": "",
         "A": "",
@@ -57,9 +84,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fk9": "",
         "A": "",
@@ -74,9 +110,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fk9": "",
         "A": "",
@@ -91,9 +136,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fk9": "",
         "A": "",
@@ -108,9 +162,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fk9": "",
         "A": "",
@@ -125,9 +188,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fk9": "",
         "A": "",
diff --git a/cedar-integration-tests/corpus_tests/314551a580d1c09170f5fbfbdfa1339d757e36e7.json b/cedar-integration-tests/corpus_tests/314551a580d1c09170f5fbfbdfa1339d757e36e7.json
index d197c8eab..a4e289d3a 100644
--- a/cedar-integration-tests/corpus_tests/314551a580d1c09170f5fbfbdfa1339d757e36e7.json
+++ b/cedar-integration-tests/corpus_tests/314551a580d1c09170f5fbfbdfa1339d757e36e7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/314fc8d30b5448db2732113e3807647a0b3b8328.json b/cedar-integration-tests/corpus_tests/314fc8d30b5448db2732113e3807647a0b3b8328.json
index d82a8d24c..2120811b7 100644
--- a/cedar-integration-tests/corpus_tests/314fc8d30b5448db2732113e3807647a0b3b8328.json
+++ b/cedar-integration-tests/corpus_tests/314fc8d30b5448db2732113e3807647a0b3b8328.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r022": "",
         "A0": "",
@@ -26,9 +35,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r022": "",
         "A0": "",
@@ -46,9 +64,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r022": "",
         "A0": "",
@@ -66,9 +93,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r022": "",
         "A0": "",
@@ -86,9 +122,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r022": "",
         "A0": "",
@@ -106,9 +151,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r022": "",
         "A0": "",
@@ -126,9 +180,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r022": "",
         "A0": "",
@@ -146,9 +209,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r022": "",
         "A0": "",
diff --git a/cedar-integration-tests/corpus_tests/315dfa7040e05eacefa4c9ad4ed26555beb7433e.json b/cedar-integration-tests/corpus_tests/315dfa7040e05eacefa4c9ad4ed26555beb7433e.json
index 260dd753c..69a0dfb20 100644
--- a/cedar-integration-tests/corpus_tests/315dfa7040e05eacefa4c9ad4ed26555beb7433e.json
+++ b/cedar-integration-tests/corpus_tests/315dfa7040e05eacefa4c9ad4ed26555beb7433e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3180e80eded244e4e85d7bd1344cc621bee9e305.json b/cedar-integration-tests/corpus_tests/3180e80eded244e4e85d7bd1344cc621bee9e305.json
index 08f7016e9..8e8007d8b 100644
--- a/cedar-integration-tests/corpus_tests/3180e80eded244e4e85d7bd1344cc621bee9e305.json
+++ b/cedar-integration-tests/corpus_tests/3180e80eded244e4e85d7bd1344cc621bee9e305.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"x\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{1}i\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"x\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{1}i\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "x\n\u0002\u0002\u0002\u0002\u0001i\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "x\n\u0002\u0002\u0002\u0002\u0001i\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"x\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{1}i\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"x\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{1}i\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "x\n\u0002\u0002\u0002\u0002\u0001i\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "x\n\u0002\u0002\u0002\u0002\u0001i\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"x\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{1}i\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"x\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{1}i\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "x\n\u0002\u0002\u0002\u0002\u0001i\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "x\n\u0002\u0002\u0002\u0002\u0001i\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"x\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{1}i\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"x\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{1}i\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "x\n\u0002\u0002\u0002\u0002\u0001i\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "x\n\u0002\u0002\u0002\u0002\u0001i\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"x\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{1}i\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"x\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{1}i\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "x\n\u0002\u0002\u0002\u0002\u0001i\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "x\n\u0002\u0002\u0002\u0002\u0001i\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"x\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{1}i\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"x\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{1}i\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "x\n\u0002\u0002\u0002\u0002\u0001i\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "x\n\u0002\u0002\u0002\u0002\u0001i\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"x\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{1}i\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"x\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{1}i\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "x\n\u0002\u0002\u0002\u0002\u0001i\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "x\n\u0002\u0002\u0002\u0002\u0001i\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"x\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{1}i\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"x\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{1}i\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "x\n\u0002\u0002\u0002\u0002\u0001i\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "x\n\u0002\u0002\u0002\u0002\u0001i\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/31db27e3674a66cfe5e5dcd7b339a0a7b67298e5.json b/cedar-integration-tests/corpus_tests/31db27e3674a66cfe5e5dcd7b339a0a7b67298e5.json
index 1c75e7f2a..5a5983d11 100644
--- a/cedar-integration-tests/corpus_tests/31db27e3674a66cfe5e5dcd7b339a0a7b67298e5.json
+++ b/cedar-integration-tests/corpus_tests/31db27e3674a66cfe5e5dcd7b339a0a7b67298e5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "ukkkkkkkk4kkkkkkk::a::\"\"",
-      "action": "ukkkkkkkk4kkkkkkk::Action::\"action\"",
-      "resource": "ukkkkkkkk4kkkkkkk::a::\"\"",
+      "principal": {
+        "type": "ukkkkkkkk4kkkkkkk::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "ukkkkkkkk4kkkkkkk::a",
+        "id": ""
+      },
+      "action": {
+        "type": "ukkkkkkkk4kkkkkkk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "ukkkkkkkk4kkkkkkk::a::\"\"",
-      "action": "ukkkkkkkk4kkkkkkk::Action::\"action\"",
-      "resource": "ukkkkkkkk4kkkkkkk::a::\"\"",
+      "principal": {
+        "type": "ukkkkkkkk4kkkkkkk::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "ukkkkkkkk4kkkkkkk::a",
+        "id": ""
+      },
+      "action": {
+        "type": "ukkkkkkkk4kkkkkkk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "ukkkkkkkk4kkkkkkk::a::\"\"",
-      "action": "ukkkkkkkk4kkkkkkk::Action::\"action\"",
-      "resource": "ukkkkkkkk4kkkkkkk::a::\"\"",
+      "principal": {
+        "type": "ukkkkkkkk4kkkkkkk::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "ukkkkkkkk4kkkkkkk::a",
+        "id": ""
+      },
+      "action": {
+        "type": "ukkkkkkkk4kkkkkkk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "ukkkkkkkk4kkkkkkk::a::\"\"",
-      "action": "ukkkkkkkk4kkkkkkk::Action::\"action\"",
-      "resource": "ukkkkkkkk4kkkkkkk::a::\"\"",
+      "principal": {
+        "type": "ukkkkkkkk4kkkkkkk::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "ukkkkkkkk4kkkkkkk::a",
+        "id": ""
+      },
+      "action": {
+        "type": "ukkkkkkkk4kkkkkkk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "ukkkkkkkk4kkkkkkk::a::\"\"",
-      "action": "ukkkkkkkk4kkkkkkk::Action::\"action\"",
-      "resource": "ukkkkkkkk4kkkkkkk::a::\"\"",
+      "principal": {
+        "type": "ukkkkkkkk4kkkkkkk::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "ukkkkkkkk4kkkkkkk::a",
+        "id": ""
+      },
+      "action": {
+        "type": "ukkkkkkkk4kkkkkkk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "ukkkkkkkk4kkkkkkk::a::\"\"",
-      "action": "ukkkkkkkk4kkkkkkk::Action::\"action\"",
-      "resource": "ukkkkkkkk4kkkkkkk::a::\"\"",
+      "principal": {
+        "type": "ukkkkkkkk4kkkkkkk::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "ukkkkkkkk4kkkkkkk::a",
+        "id": ""
+      },
+      "action": {
+        "type": "ukkkkkkkk4kkkkkkk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "ukkkkkkkk4kkkkkkk::a::\"\"",
-      "action": "ukkkkkkkk4kkkkkkk::Action::\"action\"",
-      "resource": "ukkkkkkkk4kkkkkkk::a::\"\"",
+      "principal": {
+        "type": "ukkkkkkkk4kkkkkkk::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "ukkkkkkkk4kkkkkkk::a",
+        "id": ""
+      },
+      "action": {
+        "type": "ukkkkkkkk4kkkkkkk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "ukkkkkkkk4kkkkkkk::a::\"\"",
-      "action": "ukkkkkkkk4kkkkkkk::Action::\"action\"",
-      "resource": "ukkkkkkkk4kkkkkkk::a::\"\"",
+      "principal": {
+        "type": "ukkkkkkkk4kkkkkkk::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "ukkkkkkkk4kkkkkkk::a",
+        "id": ""
+      },
+      "action": {
+        "type": "ukkkkkkkk4kkkkkkk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3208960eba87a93d580d9f308e89b94716cb1c4d.json b/cedar-integration-tests/corpus_tests/3208960eba87a93d580d9f308e89b94716cb1c4d.json
index 93ce2d43f..54e7d54bf 100644
--- a/cedar-integration-tests/corpus_tests/3208960eba87a93d580d9f308e89b94716cb1c4d.json
+++ b/cedar-integration-tests/corpus_tests/3208960eba87a93d580d9f308e89b94716cb1c4d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3221dffdd3a1ea802e024b5dff4991ac868a2602.json b/cedar-integration-tests/corpus_tests/3221dffdd3a1ea802e024b5dff4991ac868a2602.json
index 863a97b54..dca034eec 100644
--- a/cedar-integration-tests/corpus_tests/3221dffdd3a1ea802e024b5dff4991ac868a2602.json
+++ b/cedar-integration-tests/corpus_tests/3221dffdd3a1ea802e024b5dff4991ac868a2602.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "`"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "`"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3225e27e335e266ee0f5ca87b8e7d2d975de124d.json b/cedar-integration-tests/corpus_tests/3225e27e335e266ee0f5ca87b8e7d2d975de124d.json
index d7a454237..6e1f68904 100644
--- a/cedar-integration-tests/corpus_tests/3225e27e335e266ee0f5ca87b8e7d2d975de124d.json
+++ b/cedar-integration-tests/corpus_tests/3225e27e335e266ee0f5ca87b8e7d2d975de124d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3277f98cc8cef0c9e1dff218f5a7ab0fdb3ba0f0.json b/cedar-integration-tests/corpus_tests/3277f98cc8cef0c9e1dff218f5a7ab0fdb3ba0f0.json
index b652432b4..fb07abe48 100644
--- a/cedar-integration-tests/corpus_tests/3277f98cc8cef0c9e1dff218f5a7ab0fdb3ba0f0.json
+++ b/cedar-integration-tests/corpus_tests/3277f98cc8cef0c9e1dff218f5a7ab0fdb3ba0f0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{13}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{13}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0013"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0013"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{13}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\00\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0013"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\00\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\00\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\00\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\00\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\00\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\00\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3286680bbb9766c861069bf469051e43f6c6d9f8.json b/cedar-integration-tests/corpus_tests/3286680bbb9766c861069bf469051e43f6c6d9f8.json
index 0c092066d..d8a5731eb 100644
--- a/cedar-integration-tests/corpus_tests/3286680bbb9766c861069bf469051e43f6c6d9f8.json
+++ b/cedar-integration-tests/corpus_tests/3286680bbb9766c861069bf469051e43f6c6d9f8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Fwowwwxm::Edml::\":5\"",
-      "action": "Fwowwwxm::Action::\"\\':::\"",
-      "resource": "Fwowwwxm::Edml::\":5\"",
+      "principal": {
+        "type": "Fwowwwxm::Edml",
+        "id": ":5"
+      },
+      "resource": {
+        "type": "Fwowwwxm::Edml",
+        "id": ":5"
+      },
+      "action": {
+        "type": "Fwowwwxm::Action",
+        "id": "':::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Fwowwwxm::Edml::\":5\"",
-      "action": "Fwowwwxm::Action::\"\\':::\"",
-      "resource": "Fwowwwxm::Edml::\":5\"",
+      "principal": {
+        "type": "Fwowwwxm::Edml",
+        "id": ":5"
+      },
+      "resource": {
+        "type": "Fwowwwxm::Edml",
+        "id": ":5"
+      },
+      "action": {
+        "type": "Fwowwwxm::Action",
+        "id": "':::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Fwowwwxm::Edml::\":5\"",
-      "action": "Fwowwwxm::Action::\"\\':::\"",
-      "resource": "Fwowwwxm::Edml::\":5\"",
+      "principal": {
+        "type": "Fwowwwxm::Edml",
+        "id": ":5"
+      },
+      "resource": {
+        "type": "Fwowwwxm::Edml",
+        "id": ":5"
+      },
+      "action": {
+        "type": "Fwowwwxm::Action",
+        "id": "':::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Fwowwwxm::Edml::\":5\"",
-      "action": "Fwowwwxm::Action::\"\\':::\"",
-      "resource": "Fwowwwxm::Edml::\":5\"",
+      "principal": {
+        "type": "Fwowwwxm::Edml",
+        "id": ":5"
+      },
+      "resource": {
+        "type": "Fwowwwxm::Edml",
+        "id": ":5"
+      },
+      "action": {
+        "type": "Fwowwwxm::Action",
+        "id": "':::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Fwowwwxm::Edml::\":5\"",
-      "action": "Fwowwwxm::Action::\"\\':::\"",
-      "resource": "Fwowwwxm::Edml::\":5\"",
+      "principal": {
+        "type": "Fwowwwxm::Edml",
+        "id": ":5"
+      },
+      "resource": {
+        "type": "Fwowwwxm::Edml",
+        "id": ":5"
+      },
+      "action": {
+        "type": "Fwowwwxm::Action",
+        "id": "':::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Fwowwwxm::Edml::\":5\"",
-      "action": "Fwowwwxm::Action::\"\\':::\"",
-      "resource": "Fwowwwxm::Edml::\":5\"",
+      "principal": {
+        "type": "Fwowwwxm::Edml",
+        "id": ":5"
+      },
+      "resource": {
+        "type": "Fwowwwxm::Edml",
+        "id": ":5"
+      },
+      "action": {
+        "type": "Fwowwwxm::Action",
+        "id": "':::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Fwowwwxm::Edml::\":5\"",
-      "action": "Fwowwwxm::Action::\"\\':::\"",
-      "resource": "Fwowwwxm::Edml::\":5\"",
+      "principal": {
+        "type": "Fwowwwxm::Edml",
+        "id": ":5"
+      },
+      "resource": {
+        "type": "Fwowwwxm::Edml",
+        "id": ":5"
+      },
+      "action": {
+        "type": "Fwowwwxm::Action",
+        "id": "':::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Fwowwwxm::Edml::\":5\"",
-      "action": "Fwowwwxm::Action::\"\\':::\"",
-      "resource": "Fwowwwxm::Edml::\":5\"",
+      "principal": {
+        "type": "Fwowwwxm::Edml",
+        "id": ":5"
+      },
+      "resource": {
+        "type": "Fwowwwxm::Edml",
+        "id": ":5"
+      },
+      "action": {
+        "type": "Fwowwwxm::Action",
+        "id": "':::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/328b75efdada2eb6574fb25c99286236d7da72f1.json b/cedar-integration-tests/corpus_tests/328b75efdada2eb6574fb25c99286236d7da72f1.json
index 8eef5400f..62e5d173f 100644
--- a/cedar-integration-tests/corpus_tests/328b75efdada2eb6574fb25c99286236d7da72f1.json
+++ b/cedar-integration-tests/corpus_tests/328b75efdada2eb6574fb25c99286236d7da72f1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "`"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3304305f34656526ad76d538ca92a30f8dd7f787.json b/cedar-integration-tests/corpus_tests/3304305f34656526ad76d538ca92a30f8dd7f787.json
index 45005e4a3..55ee62bee 100644
--- a/cedar-integration-tests/corpus_tests/3304305f34656526ad76d538ca92a30f8dd7f787.json
+++ b/cedar-integration-tests/corpus_tests/3304305f34656526ad76d538ca92a30f8dd7f787.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/33089fa566a0c0200b65f768e03955cc56073945.json b/cedar-integration-tests/corpus_tests/33089fa566a0c0200b65f768e03955cc56073945.json
index e2c157434..43d9f9b1a 100644
--- a/cedar-integration-tests/corpus_tests/33089fa566a0c0200b65f768e03955cc56073945.json
+++ b/cedar-integration-tests/corpus_tests/33089fa566a0c0200b65f768e03955cc56073945.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/33587e74bf62f23c5d247dea697977b23720cc3c.json b/cedar-integration-tests/corpus_tests/33587e74bf62f23c5d247dea697977b23720cc3c.json
index 6e78674dd..4744c2c78 100644
--- a/cedar-integration-tests/corpus_tests/33587e74bf62f23c5d247dea697977b23720cc3c.json
+++ b/cedar-integration-tests/corpus_tests/33587e74bf62f23c5d247dea697977b23720cc3c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": [],
         "xd010dd00": []
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": [],
         "xd010dd00": []
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": [],
         "xd010dd00": []
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": [],
         "xd010dd00": []
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": [],
         "xd010dd00": []
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": [],
         "xd010dd00": []
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": [],
         "xd010dd00": []
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "x": [],
         "xd010dd00": []
diff --git a/cedar-integration-tests/corpus_tests/337815d620753bfc48df590b1e7e157ffd86932b.json b/cedar-integration-tests/corpus_tests/337815d620753bfc48df590b1e7e157ffd86932b.json
index bbcaec0df..ddf7053c3 100644
--- a/cedar-integration-tests/corpus_tests/337815d620753bfc48df590b1e7e157ffd86932b.json
+++ b/cedar-integration-tests/corpus_tests/337815d620753bfc48df590b1e7e157ffd86932b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::n::r::r::r::r::r::r::r::r::a::\"\"",
-      "action": "r::n::r::r::r::r::r::r::r::r::Action::\"action\"",
-      "resource": "r::n::r::r::r::r::r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "r::n::r::r::r::r::r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::r::r::r::r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::r::r::r::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::n::r::r::r::r::r::r::r::r::a::\"\"",
-      "action": "r::n::r::r::r::r::r::r::r::r::Action::\"action\"",
-      "resource": "r::n::r::r::r::r::r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "r::n::r::r::r::r::r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::r::r::r::r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::r::r::r::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::n::r::r::r::r::r::r::r::r::a::\"\"",
-      "action": "r::n::r::r::r::r::r::r::r::r::Action::\"action\"",
-      "resource": "r::n::r::r::r::r::r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "r::n::r::r::r::r::r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::r::r::r::r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::r::r::r::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::n::r::r::r::r::r::r::r::r::a::\"\"",
-      "action": "r::n::r::r::r::r::r::r::r::r::Action::\"action\"",
-      "resource": "r::n::r::r::r::r::r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "r::n::r::r::r::r::r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::r::r::r::r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::r::r::r::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::n::r::r::r::r::r::r::r::r::a::\"\"",
-      "action": "r::n::r::r::r::r::r::r::r::r::Action::\"action\"",
-      "resource": "r::n::r::r::r::r::r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "r::n::r::r::r::r::r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::r::r::r::r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::r::r::r::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::n::r::r::r::r::r::r::r::r::a::\"\"",
-      "action": "r::n::r::r::r::r::r::r::r::r::Action::\"action\"",
-      "resource": "r::n::r::r::r::r::r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "r::n::r::r::r::r::r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::r::r::r::r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::r::r::r::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::n::r::r::r::r::r::r::r::r::a::\"\"",
-      "action": "r::n::r::r::r::r::r::r::r::r::Action::\"action\"",
-      "resource": "r::n::r::r::r::r::r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "r::n::r::r::r::r::r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::r::r::r::r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::r::r::r::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::n::r::r::r::r::r::r::r::r::a::\"\"",
-      "action": "r::n::r::r::r::r::r::r::r::r::Action::\"action\"",
-      "resource": "r::n::r::r::r::r::r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "r::n::r::r::r::r::r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::r::r::r::r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::r::r::r::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/33a0d4d7f76a06f43f5fd89a323855b98dd33630.json b/cedar-integration-tests/corpus_tests/33a0d4d7f76a06f43f5fd89a323855b98dd33630.json
index 4ad3e54b4..276190729 100644
--- a/cedar-integration-tests/corpus_tests/33a0d4d7f76a06f43f5fd89a323855b98dd33630.json
+++ b/cedar-integration-tests/corpus_tests/33a0d4d7f76a06f43f5fd89a323855b98dd33630.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\n\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\n\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\n\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\n\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/33b6de8a02febaf27017c36fda55b014df7f46c5.json b/cedar-integration-tests/corpus_tests/33b6de8a02febaf27017c36fda55b014df7f46c5.json
index 3393a3a2b..8a83234b0 100644
--- a/cedar-integration-tests/corpus_tests/33b6de8a02febaf27017c36fda55b014df7f46c5.json
+++ b/cedar-integration-tests/corpus_tests/33b6de8a02febaf27017c36fda55b014df7f46c5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/33ba9b80d12ea32a9c75a00947821df2bddbaf8a.json b/cedar-integration-tests/corpus_tests/33ba9b80d12ea32a9c75a00947821df2bddbaf8a.json
index 205a260df..01d8cb0f2 100644
--- a/cedar-integration-tests/corpus_tests/33ba9b80d12ea32a9c75a00947821df2bddbaf8a.json
+++ b/cedar-integration-tests/corpus_tests/33ba9b80d12ea32a9c75a00947821df2bddbaf8a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/33bdfe5d90bbcbfee44c1dcb1fa7300bb37ef9a2.json b/cedar-integration-tests/corpus_tests/33bdfe5d90bbcbfee44c1dcb1fa7300bb37ef9a2.json
index 05a42ce36..ad780c88b 100644
--- a/cedar-integration-tests/corpus_tests/33bdfe5d90bbcbfee44c1dcb1fa7300bb37ef9a2.json
+++ b/cedar-integration-tests/corpus_tests/33bdfe5d90bbcbfee44c1dcb1fa7300bb37ef9a2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/33c9613909304c44134d611ad69d72b474ee46e3.json b/cedar-integration-tests/corpus_tests/33c9613909304c44134d611ad69d72b474ee46e3.json
index ea563449f..f5f58ce9f 100644
--- a/cedar-integration-tests/corpus_tests/33c9613909304c44134d611ad69d72b474ee46e3.json
+++ b/cedar-integration-tests/corpus_tests/33c9613909304c44134d611ad69d72b474ee46e3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/33cc1dba8276b82395d85d8bff2da91103f9f272.json b/cedar-integration-tests/corpus_tests/33cc1dba8276b82395d85d8bff2da91103f9f272.json
index bd530b6c1..9555def45 100644
--- a/cedar-integration-tests/corpus_tests/33cc1dba8276b82395d85d8bff2da91103f9f272.json
+++ b/cedar-integration-tests/corpus_tests/33cc1dba8276b82395d85d8bff2da91103f9f272.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/33e240eadef0c867b6154d470b0e7182ffbca850.json b/cedar-integration-tests/corpus_tests/33e240eadef0c867b6154d470b0e7182ffbca850.json
index a77825a13..805a19eec 100644
--- a/cedar-integration-tests/corpus_tests/33e240eadef0c867b6154d470b0e7182ffbca850.json
+++ b/cedar-integration-tests/corpus_tests/33e240eadef0c867b6154d470b0e7182ffbca850.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/33fd42aeebe4235b607ec620224210d394e169b6.json b/cedar-integration-tests/corpus_tests/33fd42aeebe4235b607ec620224210d394e169b6.json
index ec6e415cf..9893a9510 100644
--- a/cedar-integration-tests/corpus_tests/33fd42aeebe4235b607ec620224210d394e169b6.json
+++ b/cedar-integration-tests/corpus_tests/33fd42aeebe4235b607ec620224210d394e169b6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3499f81f5953dccba2a97c7f97f4c5fc46be27ca.json b/cedar-integration-tests/corpus_tests/3499f81f5953dccba2a97c7f97f4c5fc46be27ca.json
index 40f6c4b73..22e8079c8 100644
--- a/cedar-integration-tests/corpus_tests/3499f81f5953dccba2a97c7f97f4c5fc46be27ca.json
+++ b/cedar-integration-tests/corpus_tests/3499f81f5953dccba2a97c7f97f4c5fc46be27ca.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/34a990f481360f9792cfb7c7c7feca7291cbc310.json b/cedar-integration-tests/corpus_tests/34a990f481360f9792cfb7c7c7feca7291cbc310.json
index df528fd1d..358d59a43 100644
--- a/cedar-integration-tests/corpus_tests/34a990f481360f9792cfb7c7c7feca7291cbc310.json
+++ b/cedar-integration-tests/corpus_tests/34a990f481360f9792cfb7c7c7feca7291cbc310.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "v::xd::x::v::a::\"f~\\0ff\\0\"",
-      "action": "v::xd::x::v::Action::\"action\"",
-      "resource": "v::xd::x::v::a::\"f~\\0ff\\0\"",
+      "principal": {
+        "type": "v::xd::x::v::a",
+        "id": "f~\u0000ff\u0000"
+      },
+      "resource": {
+        "type": "v::xd::x::v::a",
+        "id": "f~\u0000ff\u0000"
+      },
+      "action": {
+        "type": "v::xd::x::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "v::xd::x::v::a::\"f~\\0ff\\0\"",
-      "action": "v::xd::x::v::Action::\"action\"",
-      "resource": "v::xd::x::v::a::\"f~\\0ff\\0\"",
+      "principal": {
+        "type": "v::xd::x::v::a",
+        "id": "f~\u0000ff\u0000"
+      },
+      "resource": {
+        "type": "v::xd::x::v::a",
+        "id": "f~\u0000ff\u0000"
+      },
+      "action": {
+        "type": "v::xd::x::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "v::xd::x::v::a::\"f~\\0ff\\0\"",
-      "action": "v::xd::x::v::Action::\"action\"",
-      "resource": "v::xd::x::v::a::\"f~\\0ff\\0\"",
+      "principal": {
+        "type": "v::xd::x::v::a",
+        "id": "f~\u0000ff\u0000"
+      },
+      "resource": {
+        "type": "v::xd::x::v::a",
+        "id": "f~\u0000ff\u0000"
+      },
+      "action": {
+        "type": "v::xd::x::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "v::xd::x::v::a::\"f~\\0ff\\0\"",
-      "action": "v::xd::x::v::Action::\"action\"",
-      "resource": "v::xd::x::v::a::\"f~\\0ff\\0\"",
+      "principal": {
+        "type": "v::xd::x::v::a",
+        "id": "f~\u0000ff\u0000"
+      },
+      "resource": {
+        "type": "v::xd::x::v::a",
+        "id": "f~\u0000ff\u0000"
+      },
+      "action": {
+        "type": "v::xd::x::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "v::xd::x::v::a::\"f~\\0ff\\0\"",
-      "action": "v::xd::x::v::Action::\"action\"",
-      "resource": "v::xd::x::v::a::\"f~\\0ff\\0\"",
+      "principal": {
+        "type": "v::xd::x::v::a",
+        "id": "f~\u0000ff\u0000"
+      },
+      "resource": {
+        "type": "v::xd::x::v::a",
+        "id": "f~\u0000ff\u0000"
+      },
+      "action": {
+        "type": "v::xd::x::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "v::xd::x::v::a::\"f~\\0ff\\0\"",
-      "action": "v::xd::x::v::Action::\"action\"",
-      "resource": "v::xd::x::v::a::\"f~\\0ff\\0\"",
+      "principal": {
+        "type": "v::xd::x::v::a",
+        "id": "f~\u0000ff\u0000"
+      },
+      "resource": {
+        "type": "v::xd::x::v::a",
+        "id": "f~\u0000ff\u0000"
+      },
+      "action": {
+        "type": "v::xd::x::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "v::xd::x::v::a::\"f~\\0ff\\0\"",
-      "action": "v::xd::x::v::Action::\"action\"",
-      "resource": "v::xd::x::v::a::\"f~\\0ff\\0\"",
+      "principal": {
+        "type": "v::xd::x::v::a",
+        "id": "f~\u0000ff\u0000"
+      },
+      "resource": {
+        "type": "v::xd::x::v::a",
+        "id": "f~\u0000ff\u0000"
+      },
+      "action": {
+        "type": "v::xd::x::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "v::xd::x::v::a::\"f~\\0ff\\0\"",
-      "action": "v::xd::x::v::Action::\"action\"",
-      "resource": "v::xd::x::v::a::\"f~\\0ff\\0\"",
+      "principal": {
+        "type": "v::xd::x::v::a",
+        "id": "f~\u0000ff\u0000"
+      },
+      "resource": {
+        "type": "v::xd::x::v::a",
+        "id": "f~\u0000ff\u0000"
+      },
+      "action": {
+        "type": "v::xd::x::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/351318d1185cadb972352f0fd6df3a6801b6df44.json b/cedar-integration-tests/corpus_tests/351318d1185cadb972352f0fd6df3a6801b6df44.json
index cb69c2a3e..a2a8b6385 100644
--- a/cedar-integration-tests/corpus_tests/351318d1185cadb972352f0fd6df3a6801b6df44.json
+++ b/cedar-integration-tests/corpus_tests/351318d1185cadb972352f0fd6df3a6801b6df44.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "W::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\\0\\0\"",
+      "principal": {
+        "type": "W",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "W",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "W::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\\0\\0\"",
+      "principal": {
+        "type": "W",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "W",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "W::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\\0\\0\"",
+      "principal": {
+        "type": "W",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "W",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "W::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\\0\\0\"",
+      "principal": {
+        "type": "W",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "W",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "W::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\\0\\0\"",
+      "principal": {
+        "type": "W",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "W",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "W::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\\0\\0\"",
+      "principal": {
+        "type": "W",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "W",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "W::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\\0\\0\"",
+      "principal": {
+        "type": "W",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "W",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "W::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\\0\\0\"",
+      "principal": {
+        "type": "W",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "W",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/352f0318003a5f7405d9be4285bcad0e73234cff.json b/cedar-integration-tests/corpus_tests/352f0318003a5f7405d9be4285bcad0e73234cff.json
index 9b0159edd..a43a692c2 100644
--- a/cedar-integration-tests/corpus_tests/352f0318003a5f7405d9be4285bcad0e73234cff.json
+++ b/cedar-integration-tests/corpus_tests/352f0318003a5f7405d9be4285bcad0e73234cff.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Kfhhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "ukkkkJ002kkkk": 0
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Kfhhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "ukkkkJ002kkkk": 0
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Kfhhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "ukkkkJ002kkkk": 0
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Kfhhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "ukkkkJ002kkkk": 0
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Kfhhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "ukkkkJ002kkkk": 0
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Kfhhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "ukkkkJ002kkkk": 0
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Kfhhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "ukkkkJ002kkkk": 0
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Kfhhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "ukkkkJ002kkkk": 0
       },
diff --git a/cedar-integration-tests/corpus_tests/352f61b4d81394cf50e3228ce1bce32da88862f5.json b/cedar-integration-tests/corpus_tests/352f61b4d81394cf50e3228ce1bce32da88862f5.json
index c9a1f4d0e..4348edc72 100644
--- a/cedar-integration-tests/corpus_tests/352f61b4d81394cf50e3228ce1bce32da88862f5.json
+++ b/cedar-integration-tests/corpus_tests/352f61b4d81394cf50e3228ce1bce32da88862f5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"RR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RR\"",
+      "principal": {
+        "type": "a",
+        "id": "RR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"RR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RR\"",
+      "principal": {
+        "type": "a",
+        "id": "RR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"RR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RR\"",
+      "principal": {
+        "type": "a",
+        "id": "RR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"RR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RR\"",
+      "principal": {
+        "type": "a",
+        "id": "RR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"RR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RR\"",
+      "principal": {
+        "type": "a",
+        "id": "RR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"RR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RR\"",
+      "principal": {
+        "type": "a",
+        "id": "RR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"RR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RR\"",
+      "principal": {
+        "type": "a",
+        "id": "RR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"RR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RR\"",
+      "principal": {
+        "type": "a",
+        "id": "RR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/356c33ba490261b421556236cbdf3c8a78b02709.json b/cedar-integration-tests/corpus_tests/356c33ba490261b421556236cbdf3c8a78b02709.json
index 6c9862738..df1ce69a6 100644
--- a/cedar-integration-tests/corpus_tests/356c33ba490261b421556236cbdf3c8a78b02709.json
+++ b/cedar-integration-tests/corpus_tests/356c33ba490261b421556236cbdf3c8a78b02709.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\n\\'\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\'\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n'\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n'\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\n\\'\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\'\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n'\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n'\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\n\\'\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\'\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n'\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n'\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\n\\'\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\'\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n'\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n'\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\n\\'\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\'\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n'\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n'\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\n\\'\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\'\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n'\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n'\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\n\\'\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\'\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n'\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n'\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\n\\'\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\'\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n'\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n'\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3610428c0e69a6c0d117385bb428d90b87727d08.json b/cedar-integration-tests/corpus_tests/3610428c0e69a6c0d117385bb428d90b87727d08.json
index 7f680d289..cb757be96 100644
--- a/cedar-integration-tests/corpus_tests/3610428c0e69a6c0d117385bb428d90b87727d08.json
+++ b/cedar-integration-tests/corpus_tests/3610428c0e69a6c0d117385bb428d90b87727d08.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/365807e196ad66c1db5196b3a30992ada55b6d22.json b/cedar-integration-tests/corpus_tests/365807e196ad66c1db5196b3a30992ada55b6d22.json
index 163e3bf77..a1df7f237 100644
--- a/cedar-integration-tests/corpus_tests/365807e196ad66c1db5196b3a30992ada55b6d22.json
+++ b/cedar-integration-tests/corpus_tests/365807e196ad66c1db5196b3a30992ada55b6d22.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/36a8b7ca6f5196693fd24c6f3cdbb627d8a2cfa7.json b/cedar-integration-tests/corpus_tests/36a8b7ca6f5196693fd24c6f3cdbb627d8a2cfa7.json
index a5e870c94..c71a5bcef 100644
--- a/cedar-integration-tests/corpus_tests/36a8b7ca6f5196693fd24c6f3cdbb627d8a2cfa7.json
+++ b/cedar-integration-tests/corpus_tests/36a8b7ca6f5196693fd24c6f3cdbb627d8a2cfa7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "x::a::\"\"",
-      "action": "x::Action::\"action\"",
-      "resource": "x::a::\"\"",
+      "principal": {
+        "type": "x::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "x::a",
+        "id": ""
+      },
+      "action": {
+        "type": "x::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "x::a::\"\"",
-      "action": "x::Action::\"action\"",
-      "resource": "x::a::\"\"",
+      "principal": {
+        "type": "x::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "x::a",
+        "id": ""
+      },
+      "action": {
+        "type": "x::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "x::a::\"\"",
-      "action": "x::Action::\"action\"",
-      "resource": "x::a::\"\"",
+      "principal": {
+        "type": "x::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "x::a",
+        "id": ""
+      },
+      "action": {
+        "type": "x::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "x::a::\"\"",
-      "action": "x::Action::\"action\"",
-      "resource": "x::a::\"\"",
+      "principal": {
+        "type": "x::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "x::a",
+        "id": ""
+      },
+      "action": {
+        "type": "x::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "x::a::\"\"",
-      "action": "x::Action::\"action\"",
-      "resource": "x::a::\"\"",
+      "principal": {
+        "type": "x::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "x::a",
+        "id": ""
+      },
+      "action": {
+        "type": "x::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "x::a::\"\"",
-      "action": "x::Action::\"action\"",
-      "resource": "x::a::\"\"",
+      "principal": {
+        "type": "x::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "x::a",
+        "id": ""
+      },
+      "action": {
+        "type": "x::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "x::a::\"\"",
-      "action": "x::Action::\"action\"",
-      "resource": "x::a::\"\"",
+      "principal": {
+        "type": "x::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "x::a",
+        "id": ""
+      },
+      "action": {
+        "type": "x::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "x::a::\"\"",
-      "action": "x::Action::\"action\"",
-      "resource": "x::a::\"\"",
+      "principal": {
+        "type": "x::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "x::a",
+        "id": ""
+      },
+      "action": {
+        "type": "x::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/36d2e49e789a6339ee9470e61ff03a3fd374b3a9.json b/cedar-integration-tests/corpus_tests/36d2e49e789a6339ee9470e61ff03a3fd374b3a9.json
index 427fd9f55..04e51f215 100644
--- a/cedar-integration-tests/corpus_tests/36d2e49e789a6339ee9470e61ff03a3fd374b3a9.json
+++ b/cedar-integration-tests/corpus_tests/36d2e49e789a6339ee9470e61ff03a3fd374b3a9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/36ede146bf89ead70984d79c687672b07fe8688d.json b/cedar-integration-tests/corpus_tests/36ede146bf89ead70984d79c687672b07fe8688d.json
index 454fd2015..f08144b11 100644
--- a/cedar-integration-tests/corpus_tests/36ede146bf89ead70984d79c687672b07fe8688d.json
+++ b/cedar-integration-tests/corpus_tests/36ede146bf89ead70984d79c687672b07fe8688d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::W::r::a::\"\"",
-      "action": "r::W::r::Action::\"action\"",
-      "resource": "r::W::r::a::\"\"",
+      "principal": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::W::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::W::r::a::\"\"",
-      "action": "r::W::r::Action::\"action\"",
-      "resource": "r::W::r::a::\"\"",
+      "principal": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::W::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::W::r::a::\"\"",
-      "action": "r::W::r::Action::\"action\"",
-      "resource": "r::W::r::a::\"\"",
+      "principal": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::W::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::W::r::a::\"\"",
-      "action": "r::W::r::Action::\"action\"",
-      "resource": "r::W::r::a::\"\"",
+      "principal": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::W::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::W::r::a::\"\"",
-      "action": "r::W::r::Action::\"action\"",
-      "resource": "r::W::r::a::\"\"",
+      "principal": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::W::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::W::r::a::\"\"",
-      "action": "r::W::r::Action::\"action\"",
-      "resource": "r::W::r::a::\"\"",
+      "principal": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::W::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::W::r::a::\"\"",
-      "action": "r::W::r::Action::\"action\"",
-      "resource": "r::W::r::a::\"\"",
+      "principal": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::W::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::W::r::a::\"\"",
-      "action": "r::W::r::Action::\"action\"",
-      "resource": "r::W::r::a::\"\"",
+      "principal": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::W::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/36f8dc2a745bacfb69d84c7787444decdaa2d5fe.json b/cedar-integration-tests/corpus_tests/36f8dc2a745bacfb69d84c7787444decdaa2d5fe.json
index 38f4f69ac..781f0bb84 100644
--- a/cedar-integration-tests/corpus_tests/36f8dc2a745bacfb69d84c7787444decdaa2d5fe.json
+++ b/cedar-integration-tests/corpus_tests/36f8dc2a745bacfb69d84c7787444decdaa2d5fe.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Kfhhfhh::\"\\u{13}.\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhfhh::\"\\u{13}.\"",
+      "principal": {
+        "type": "Kfhhfhh",
+        "id": "\u0013."
+      },
+      "resource": {
+        "type": "Kfhhfhh",
+        "id": "\u0013."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Kfhhfhh::\"\\u{13}.\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhfhh::\"\\u{13}.\"",
+      "principal": {
+        "type": "Kfhhfhh",
+        "id": "\u0013."
+      },
+      "resource": {
+        "type": "Kfhhfhh",
+        "id": "\u0013."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Kfhhfhh::\"\\u{13}.\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhfhh::\"\\u{13}.\"",
+      "principal": {
+        "type": "Kfhhfhh",
+        "id": "\u0013."
+      },
+      "resource": {
+        "type": "Kfhhfhh",
+        "id": "\u0013."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Kfhhfhh::\"\\u{13}.\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhfhh::\"\\u{13}.\"",
+      "principal": {
+        "type": "Kfhhfhh",
+        "id": "\u0013."
+      },
+      "resource": {
+        "type": "Kfhhfhh",
+        "id": "\u0013."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Kfhhfhh::\"\\u{13}.\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhfhh::\"\\u{13}.\"",
+      "principal": {
+        "type": "Kfhhfhh",
+        "id": "\u0013."
+      },
+      "resource": {
+        "type": "Kfhhfhh",
+        "id": "\u0013."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Kfhhfhh::\"\\u{13}.\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhfhh::\"\\u{13}.\"",
+      "principal": {
+        "type": "Kfhhfhh",
+        "id": "\u0013."
+      },
+      "resource": {
+        "type": "Kfhhfhh",
+        "id": "\u0013."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Kfhhfhh::\"\\u{13}.\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhfhh::\"\\u{13}.\"",
+      "principal": {
+        "type": "Kfhhfhh",
+        "id": "\u0013."
+      },
+      "resource": {
+        "type": "Kfhhfhh",
+        "id": "\u0013."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Kfhhfhh::\"\\u{13}.\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhfhh::\"\\u{13}.\"",
+      "principal": {
+        "type": "Kfhhfhh",
+        "id": "\u0013."
+      },
+      "resource": {
+        "type": "Kfhhfhh",
+        "id": "\u0013."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/371a58c4e871e3d31a067809a98b1d6baae6af34.json b/cedar-integration-tests/corpus_tests/371a58c4e871e3d31a067809a98b1d6baae6af34.json
index 11c651893..0d5a8ea01 100644
--- a/cedar-integration-tests/corpus_tests/371a58c4e871e3d31a067809a98b1d6baae6af34.json
+++ b/cedar-integration-tests/corpus_tests/371a58c4e871e3d31a067809a98b1d6baae6af34.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"zzzz\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "zzzz"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +28,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +43,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +58,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +73,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +88,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +103,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +118,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3741301f229f701463ccb88679111a6ee8ec5f3c.json b/cedar-integration-tests/corpus_tests/3741301f229f701463ccb88679111a6ee8ec5f3c.json
index f826d594c..905b6d1ec 100644
--- a/cedar-integration-tests/corpus_tests/3741301f229f701463ccb88679111a6ee8ec5f3c.json
+++ b/cedar-integration-tests/corpus_tests/3741301f229f701463ccb88679111a6ee8ec5f3c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "FwGwwwGw::\":come/f\"",
-      "action": "Action::\"action\"",
-      "resource": "FwGwwwGw::\":come/f\"",
+      "principal": {
+        "type": "FwGwwwGw",
+        "id": ":come/f"
+      },
+      "resource": {
+        "type": "FwGwwwGw",
+        "id": ":come/f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "FwGwwwGw::\":come/f\"",
-      "action": "Action::\"action\"",
-      "resource": "FwGwwwGw::\":come/f\"",
+      "principal": {
+        "type": "FwGwwwGw",
+        "id": ":come/f"
+      },
+      "resource": {
+        "type": "FwGwwwGw",
+        "id": ":come/f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "FwGwwwGw::\":come/f\"",
-      "action": "Action::\"action\"",
-      "resource": "FwGwwwGw::\":come/f\"",
+      "principal": {
+        "type": "FwGwwwGw",
+        "id": ":come/f"
+      },
+      "resource": {
+        "type": "FwGwwwGw",
+        "id": ":come/f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "FwGwwwGw::\":come/f\"",
-      "action": "Action::\"action\"",
-      "resource": "FwGwwwGw::\":come/f\"",
+      "principal": {
+        "type": "FwGwwwGw",
+        "id": ":come/f"
+      },
+      "resource": {
+        "type": "FwGwwwGw",
+        "id": ":come/f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "FwGwwwGw::\":come/f\"",
-      "action": "Action::\"action\"",
-      "resource": "FwGwwwGw::\":come/f\"",
+      "principal": {
+        "type": "FwGwwwGw",
+        "id": ":come/f"
+      },
+      "resource": {
+        "type": "FwGwwwGw",
+        "id": ":come/f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "FwGwwwGw::\":come/f\"",
-      "action": "Action::\"action\"",
-      "resource": "FwGwwwGw::\":come/f\"",
+      "principal": {
+        "type": "FwGwwwGw",
+        "id": ":come/f"
+      },
+      "resource": {
+        "type": "FwGwwwGw",
+        "id": ":come/f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "FwGwwwGw::\":come/f\"",
-      "action": "Action::\"action\"",
-      "resource": "FwGwwwGw::\":come/f\"",
+      "principal": {
+        "type": "FwGwwwGw",
+        "id": ":come/f"
+      },
+      "resource": {
+        "type": "FwGwwwGw",
+        "id": ":come/f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "FwGwwwGw::\":come/f\"",
-      "action": "Action::\"action\"",
-      "resource": "FwGwwwGw::\":come/f\"",
+      "principal": {
+        "type": "FwGwwwGw",
+        "id": ":come/f"
+      },
+      "resource": {
+        "type": "FwGwwwGw",
+        "id": ":come/f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3789f3fb4358bddc1dac1aa750ce1a17e8fed5ed.json b/cedar-integration-tests/corpus_tests/3789f3fb4358bddc1dac1aa750ce1a17e8fed5ed.json
index b5acce3da..4222e3537 100644
--- a/cedar-integration-tests/corpus_tests/3789f3fb4358bddc1dac1aa750ce1a17e8fed5ed.json
+++ b/cedar-integration-tests/corpus_tests/3789f3fb4358bddc1dac1aa750ce1a17e8fed5ed.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/378c8e39436421f57d284ffc9da9160e430d1748.json b/cedar-integration-tests/corpus_tests/378c8e39436421f57d284ffc9da9160e430d1748.json
index 2932c0525..4b839cd08 100644
--- a/cedar-integration-tests/corpus_tests/378c8e39436421f57d284ffc9da9160e430d1748.json
+++ b/cedar-integration-tests/corpus_tests/378c8e39436421f57d284ffc9da9160e430d1748.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::r::p::a::\"R\"",
-      "action": "r::r::r::p::Action::\"action\"",
-      "resource": "r::r::r::p::a::\"R\"",
+      "principal": {
+        "type": "r::r::r::p::a",
+        "id": "R"
+      },
+      "resource": {
+        "type": "r::r::r::p::a",
+        "id": "R"
+      },
+      "action": {
+        "type": "r::r::r::p::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::r::p::a::\"R\"",
-      "action": "r::r::r::p::Action::\"action\"",
-      "resource": "r::r::r::p::a::\"R\"",
+      "principal": {
+        "type": "r::r::r::p::a",
+        "id": "R"
+      },
+      "resource": {
+        "type": "r::r::r::p::a",
+        "id": "R"
+      },
+      "action": {
+        "type": "r::r::r::p::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::r::p::a::\"R\"",
-      "action": "r::r::r::p::Action::\"action\"",
-      "resource": "r::r::r::p::a::\"R\"",
+      "principal": {
+        "type": "r::r::r::p::a",
+        "id": "R"
+      },
+      "resource": {
+        "type": "r::r::r::p::a",
+        "id": "R"
+      },
+      "action": {
+        "type": "r::r::r::p::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::r::p::a::\"R\"",
-      "action": "r::r::r::p::Action::\"action\"",
-      "resource": "r::r::r::p::a::\"R\"",
+      "principal": {
+        "type": "r::r::r::p::a",
+        "id": "R"
+      },
+      "resource": {
+        "type": "r::r::r::p::a",
+        "id": "R"
+      },
+      "action": {
+        "type": "r::r::r::p::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::r::p::a::\"R\"",
-      "action": "r::r::r::p::Action::\"action\"",
-      "resource": "r::r::r::p::a::\"R\"",
+      "principal": {
+        "type": "r::r::r::p::a",
+        "id": "R"
+      },
+      "resource": {
+        "type": "r::r::r::p::a",
+        "id": "R"
+      },
+      "action": {
+        "type": "r::r::r::p::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::r::p::a::\"R\"",
-      "action": "r::r::r::p::Action::\"action\"",
-      "resource": "r::r::r::p::a::\"R\"",
+      "principal": {
+        "type": "r::r::r::p::a",
+        "id": "R"
+      },
+      "resource": {
+        "type": "r::r::r::p::a",
+        "id": "R"
+      },
+      "action": {
+        "type": "r::r::r::p::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::r::p::a::\"R\"",
-      "action": "r::r::r::p::Action::\"action\"",
-      "resource": "r::r::r::p::a::\"R\"",
+      "principal": {
+        "type": "r::r::r::p::a",
+        "id": "R"
+      },
+      "resource": {
+        "type": "r::r::r::p::a",
+        "id": "R"
+      },
+      "action": {
+        "type": "r::r::r::p::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::r::p::a::\"R\"",
-      "action": "r::r::r::p::Action::\"action\"",
-      "resource": "r::r::r::p::a::\"R\"",
+      "principal": {
+        "type": "r::r::r::p::a",
+        "id": "R"
+      },
+      "resource": {
+        "type": "r::r::r::p::a",
+        "id": "R"
+      },
+      "action": {
+        "type": "r::r::r::p::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/37a4a36a832a2c109875c4482a1c757c07e7689a.json b/cedar-integration-tests/corpus_tests/37a4a36a832a2c109875c4482a1c757c07e7689a.json
index f4f09ee65..d47b6e9b4 100644
--- a/cedar-integration-tests/corpus_tests/37a4a36a832a2c109875c4482a1c757c07e7689a.json
+++ b/cedar-integration-tests/corpus_tests/37a4a36a832a2c109875c4482a1c757c07e7689a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/37a94913231a0c1763cf0519062419837a2d57e8.json b/cedar-integration-tests/corpus_tests/37a94913231a0c1763cf0519062419837a2d57e8.json
index f2dfd612e..4bf7f583d 100644
--- a/cedar-integration-tests/corpus_tests/37a94913231a0c1763cf0519062419837a2d57e8.json
+++ b/cedar-integration-tests/corpus_tests/37a94913231a0c1763cf0519062419837a2d57e8.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/37dde9c2116b0f8e994c76ed68805f489f24046d.json b/cedar-integration-tests/corpus_tests/37dde9c2116b0f8e994c76ed68805f489f24046d.json
index 74e2935d2..1a099d811 100644
--- a/cedar-integration-tests/corpus_tests/37dde9c2116b0f8e994c76ed68805f489f24046d.json
+++ b/cedar-integration-tests/corpus_tests/37dde9c2116b0f8e994c76ed68805f489f24046d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"000000000\\u{4}##\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "000000000\u0004##"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"000000000\\u{4}##\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"000000000\\u{4}##\"",
+      "principal": {
+        "type": "a",
+        "id": "000000000\u0004##"
+      },
+      "resource": {
+        "type": "a",
+        "id": "000000000\u0004##"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"000000000\\u{4}##\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"000000000\\u{4}##\"",
+      "principal": {
+        "type": "a",
+        "id": "000000000\u0004##"
+      },
+      "resource": {
+        "type": "a",
+        "id": "000000000\u0004##"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"000000000\\u{4}##\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"000000000\\u{4}##\"",
+      "principal": {
+        "type": "a",
+        "id": "000000000\u0004##"
+      },
+      "resource": {
+        "type": "a",
+        "id": "000000000\u0004##"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"000000000\\u{4}##\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"000000000\\u{4}##\"",
+      "principal": {
+        "type": "a",
+        "id": "000000000\u0004##"
+      },
+      "resource": {
+        "type": "a",
+        "id": "000000000\u0004##"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"000000000\\u{4}##\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"000000000\\u{4}##\"",
+      "principal": {
+        "type": "a",
+        "id": "000000000\u0004##"
+      },
+      "resource": {
+        "type": "a",
+        "id": "000000000\u0004##"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"000000000\\u{4}##\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"000000000\\u{4}##\"",
+      "principal": {
+        "type": "a",
+        "id": "000000000\u0004##"
+      },
+      "resource": {
+        "type": "a",
+        "id": "000000000\u0004##"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"000000000\\u{4}##\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"000000000\\u{4}##\"",
+      "principal": {
+        "type": "a",
+        "id": "000000000\u0004##"
+      },
+      "resource": {
+        "type": "a",
+        "id": "000000000\u0004##"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3809ebc3065747fbc30b6ef8ff72d7c461aea32c.json b/cedar-integration-tests/corpus_tests/3809ebc3065747fbc30b6ef8ff72d7c461aea32c.json
index 6f732b470..7c71476ab 100644
--- a/cedar-integration-tests/corpus_tests/3809ebc3065747fbc30b6ef8ff72d7c461aea32c.json
+++ b/cedar-integration-tests/corpus_tests/3809ebc3065747fbc30b6ef8ff72d7c461aea32c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::a::\"\\0\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\\0\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/38188a0d43f07656dd70781417c7bad5b05a4764.json b/cedar-integration-tests/corpus_tests/38188a0d43f07656dd70781417c7bad5b05a4764.json
index 6299e4a7a..f777bdb08 100644
--- a/cedar-integration-tests/corpus_tests/38188a0d43f07656dd70781417c7bad5b05a4764.json
+++ b/cedar-integration-tests/corpus_tests/38188a0d43f07656dd70781417c7bad5b05a4764.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "v": false,
         "qi": false,
@@ -22,9 +31,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "v": false,
         "qi": false,
@@ -38,9 +56,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "v": false,
         "qi": false,
@@ -54,9 +81,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "v": false,
         "qi": false,
@@ -70,9 +106,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "v": false,
         "qi": false,
@@ -86,9 +131,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "v": false,
         "qi": false,
@@ -102,9 +156,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "v": false,
         "qi": false,
@@ -118,9 +181,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "v::Qx::OMRR::a::\"\"",
-      "action": "v::Qx::OMRR::Action::\"action\"",
-      "resource": "v::Qx::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::OMRR::Action",
+        "id": "action"
+      },
       "context": {
         "v": false,
         "qi": false,
diff --git a/cedar-integration-tests/corpus_tests/3827da6b1d7c162c41f57c178ea845a2baf5d2bc.json b/cedar-integration-tests/corpus_tests/3827da6b1d7c162c41f57c178ea845a2baf5d2bc.json
index b1950d1af..2ecf0feb9 100644
--- a/cedar-integration-tests/corpus_tests/3827da6b1d7c162c41f57c178ea845a2baf5d2bc.json
+++ b/cedar-integration-tests/corpus_tests/3827da6b1d7c162c41f57c178ea845a2baf5d2bc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "W::v::a::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::a::\"\"",
+      "principal": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "W::v::a::\"o\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::a::\"\"",
+      "principal": {
+        "type": "W::v::a",
+        "id": "o"
+      },
+      "resource": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "W::v::a::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::a::\"\"",
+      "principal": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "W::v::a::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::a::\"\"",
+      "principal": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "W::v::a::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::a::\"\"",
+      "principal": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "W::v::a::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::a::\"\"",
+      "principal": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "W::v::a::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::a::\"\"",
+      "principal": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "W::v::a::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::a::\"\"",
+      "principal": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3874dfebce65ae9a05be5d59bdc10ee5d4d756dc.json b/cedar-integration-tests/corpus_tests/3874dfebce65ae9a05be5d59bdc10ee5d4d756dc.json
index ae729707f..8147af847 100644
--- a/cedar-integration-tests/corpus_tests/3874dfebce65ae9a05be5d59bdc10ee5d4d756dc.json
+++ b/cedar-integration-tests/corpus_tests/3874dfebce65ae9a05be5d59bdc10ee5d4d756dc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "AJHH::a::\"\"",
-      "action": "AJHH::Action::\"action\"",
-      "resource": "AJHH::a::\"\\0\"",
+      "principal": {
+        "type": "AJHH::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "AJHH::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "AJHH::a::\"\\0\"",
-      "action": "AJHH::Action::\"action\"",
-      "resource": "AJHH::a::\"\\0\"",
+      "principal": {
+        "type": "AJHH::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "AJHH::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "AJHH::a::\"\\0\"",
-      "action": "AJHH::Action::\"action\"",
-      "resource": "AJHH::a::\"\\0\"",
+      "principal": {
+        "type": "AJHH::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "AJHH::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "AJHH::a::\"\\0\"",
-      "action": "AJHH::Action::\"action\"",
-      "resource": "AJHH::a::\"\\0\"",
+      "principal": {
+        "type": "AJHH::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "AJHH::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "AJHH::a::\"\\0\"",
-      "action": "AJHH::Action::\"action\"",
-      "resource": "AJHH::a::\"\\0\"",
+      "principal": {
+        "type": "AJHH::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "AJHH::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "AJHH::a::\"\\0\"",
-      "action": "AJHH::Action::\"action\"",
-      "resource": "AJHH::a::\"\\0\"",
+      "principal": {
+        "type": "AJHH::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "AJHH::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "AJHH::a::\"\\0\"",
-      "action": "AJHH::Action::\"action\"",
-      "resource": "AJHH::a::\"\\0\"",
+      "principal": {
+        "type": "AJHH::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "AJHH::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "AJHH::a::\"\\0\"",
-      "action": "AJHH::Action::\"action\"",
-      "resource": "AJHH::a::\"\\0\"",
+      "principal": {
+        "type": "AJHH::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "AJHH::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/38814b2226b344165e2b0bfddda558ad08183d84.json b/cedar-integration-tests/corpus_tests/38814b2226b344165e2b0bfddda558ad08183d84.json
index e1d41b92e..8c0a73dda 100644
--- a/cedar-integration-tests/corpus_tests/38814b2226b344165e2b0bfddda558ad08183d84.json
+++ b/cedar-integration-tests/corpus_tests/38814b2226b344165e2b0bfddda558ad08183d84.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "T": "",
         "vh92223": "",
@@ -22,9 +31,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "T": "",
         "vh92223": "",
@@ -38,9 +56,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "T": "",
         "vh92223": "",
@@ -54,9 +81,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "T": "",
         "vh92223": "",
@@ -70,9 +106,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "T": "",
         "vh92223": "",
@@ -86,9 +131,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "T": "",
         "vh92223": "",
@@ -102,9 +156,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "T": "",
         "vh92223": "",
@@ -118,9 +181,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "T": "",
         "vh92223": "",
diff --git a/cedar-integration-tests/corpus_tests/388e55628e201183633520a571bee2ea8e44f70a.json b/cedar-integration-tests/corpus_tests/388e55628e201183633520a571bee2ea8e44f70a.json
index f547114c8..d3877e628 100644
--- a/cedar-integration-tests/corpus_tests/388e55628e201183633520a571bee2ea8e44f70a.json
+++ b/cedar-integration-tests/corpus_tests/388e55628e201183633520a571bee2ea8e44f70a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{5}\\u{5}\\u{5}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0005\u0005\u0005"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{5}\\u{5}\\u{5}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0005\u0005\u0005"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{5}\\u{5}\\u{5}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0005\u0005\u0005"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{5}\\u{5}\\u{5}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0005\u0005\u0005"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{5}\\u{5}\\u{5}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0005\u0005\u0005"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{5}\\u{5}\\u{5}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0005\u0005\u0005"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{5}\\u{5}\\u{5}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0005\u0005\u0005"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{5}\\u{5}\\u{5}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0005\u0005\u0005"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/38c1eb9343c6973a49a3d8e09787970693505a0d.json b/cedar-integration-tests/corpus_tests/38c1eb9343c6973a49a3d8e09787970693505a0d.json
index 58b5b72c6..17b378a7e 100644
--- a/cedar-integration-tests/corpus_tests/38c1eb9343c6973a49a3d8e09787970693505a0d.json
+++ b/cedar-integration-tests/corpus_tests/38c1eb9343c6973a49a3d8e09787970693505a0d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/38c8127d570b3df790b767d9521379cebf56f2b0.json b/cedar-integration-tests/corpus_tests/38c8127d570b3df790b767d9521379cebf56f2b0.json
index 58a37ef5f..17e1d530c 100644
--- a/cedar-integration-tests/corpus_tests/38c8127d570b3df790b767d9521379cebf56f2b0.json
+++ b/cedar-integration-tests/corpus_tests/38c8127d570b3df790b767d9521379cebf56f2b0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/38d1fcf284cdf4f1c53cb41c358b757918075cc0.json b/cedar-integration-tests/corpus_tests/38d1fcf284cdf4f1c53cb41c358b757918075cc0.json
index 2b750fa11..a1e7db1e4 100644
--- a/cedar-integration-tests/corpus_tests/38d1fcf284cdf4f1c53cb41c358b757918075cc0.json
+++ b/cedar-integration-tests/corpus_tests/38d1fcf284cdf4f1c53cb41c358b757918075cc0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/38dfe4c1c5a135e45453f22f50bc144f1b576bd1.json b/cedar-integration-tests/corpus_tests/38dfe4c1c5a135e45453f22f50bc144f1b576bd1.json
index 00173e57f..ce0ca3472 100644
--- a/cedar-integration-tests/corpus_tests/38dfe4c1c5a135e45453f22f50bc144f1b576bd1.json
+++ b/cedar-integration-tests/corpus_tests/38dfe4c1c5a135e45453f22f50bc144f1b576bd1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\":\\u{8}~\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ":\b~\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":\\u{8}~\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ":\b~\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\u{8}~\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\b~\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\":\\u{8}~\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\u{8}~\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":\b~\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\b~\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\":\\u{8}~\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\u{8}~\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":\b~\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\b~\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\":\\u{8}~\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\u{8}~\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":\b~\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\b~\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\":\\u{8}~\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\u{8}~\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":\b~\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\b~\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\":\\u{8}~\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\u{8}~\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":\b~\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\b~\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/390204acdefac94867af9dd006a51a4773709753.json b/cedar-integration-tests/corpus_tests/390204acdefac94867af9dd006a51a4773709753.json
index 6522f1b67..f005c7df5 100644
--- a/cedar-integration-tests/corpus_tests/390204acdefac94867af9dd006a51a4773709753.json
+++ b/cedar-integration-tests/corpus_tests/390204acdefac94867af9dd006a51a4773709753.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3916d8b81ea7add70c41de29fa49a7eae2992fc1.json b/cedar-integration-tests/corpus_tests/3916d8b81ea7add70c41de29fa49a7eae2992fc1.json
index 3337fdb2a..a263eaac0 100644
--- a/cedar-integration-tests/corpus_tests/3916d8b81ea7add70c41de29fa49a7eae2992fc1.json
+++ b/cedar-integration-tests/corpus_tests/3916d8b81ea7add70c41de29fa49a7eae2992fc1.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "A000::Action::\"dafnyȹun\"",
       "resource": null,
+      "action": {
+        "type": "A000::Action",
+        "id": "dafnyȹun"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "A000::Action::\"dafnyȹun\"",
       "resource": null,
+      "action": {
+        "type": "A000::Action",
+        "id": "dafnyȹun"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "A000::Action::\"dafnyȹun\"",
       "resource": null,
+      "action": {
+        "type": "A000::Action",
+        "id": "dafnyȹun"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "A000::Action::\"dafnyȹun\"",
       "resource": null,
+      "action": {
+        "type": "A000::Action",
+        "id": "dafnyȹun"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "A000::Action::\"dafnyȹun\"",
       "resource": null,
+      "action": {
+        "type": "A000::Action",
+        "id": "dafnyȹun"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "A000::Action::\"dafnyȹun\"",
       "resource": null,
+      "action": {
+        "type": "A000::Action",
+        "id": "dafnyȹun"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "A000::Action::\"dafnyȹun\"",
       "resource": null,
+      "action": {
+        "type": "A000::Action",
+        "id": "dafnyȹun"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "A000::Action::\"dafnyȹun\"",
       "resource": null,
+      "action": {
+        "type": "A000::Action",
+        "id": "dafnyȹun"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/39310c282d59af031138d9d5c4a34fb72ee09942.json b/cedar-integration-tests/corpus_tests/39310c282d59af031138d9d5c4a34fb72ee09942.json
index 6bbd195ea..ee360a69d 100644
--- a/cedar-integration-tests/corpus_tests/39310c282d59af031138d9d5c4a34fb72ee09942.json
+++ b/cedar-integration-tests/corpus_tests/39310c282d59af031138d9d5c4a34fb72ee09942.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/397320fbd52194b13fa26e8f971001d9f710c4ed.json b/cedar-integration-tests/corpus_tests/397320fbd52194b13fa26e8f971001d9f710c4ed.json
index 42f361c37..9d062320b 100644
--- a/cedar-integration-tests/corpus_tests/397320fbd52194b13fa26e8f971001d9f710c4ed.json
+++ b/cedar-integration-tests/corpus_tests/397320fbd52194b13fa26e8f971001d9f710c4ed.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"RRRR\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "RRRR"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -17,8 +20,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"RRRR\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "RRRR"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -27,8 +33,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"RRRR\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "RRRR"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -37,8 +46,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"RRRR\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "RRRR"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -47,8 +59,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"RRRR\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "RRRR"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -57,8 +72,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"RRRR\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "RRRR"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -67,8 +85,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"RRRR\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "RRRR"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -77,8 +98,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"RRRR\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "RRRR"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/39825f1656b5b6b58d6ab231ac5592c55781c0ba.json b/cedar-integration-tests/corpus_tests/39825f1656b5b6b58d6ab231ac5592c55781c0ba.json
index 410c7ac1b..8796bfa22 100644
--- a/cedar-integration-tests/corpus_tests/39825f1656b5b6b58d6ab231ac5592c55781c0ba.json
+++ b/cedar-integration-tests/corpus_tests/39825f1656b5b6b58d6ab231ac5592c55781c0ba.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/39a6b7a23a22c49ff6d3b49e0ef9c41840c07441.json b/cedar-integration-tests/corpus_tests/39a6b7a23a22c49ff6d3b49e0ef9c41840c07441.json
index 5f2ae893f..dfa3e90f7 100644
--- a/cedar-integration-tests/corpus_tests/39a6b7a23a22c49ff6d3b49e0ef9c41840c07441.json
+++ b/cedar-integration-tests/corpus_tests/39a6b7a23a22c49ff6d3b49e0ef9c41840c07441.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/39c55e64c93a32d13ae513181176d1769f7c9a61.json b/cedar-integration-tests/corpus_tests/39c55e64c93a32d13ae513181176d1769f7c9a61.json
index 9f1994ea2..e3c34c189 100644
--- a/cedar-integration-tests/corpus_tests/39c55e64c93a32d13ae513181176d1769f7c9a61.json
+++ b/cedar-integration-tests/corpus_tests/39c55e64c93a32d13ae513181176d1769f7c9a61.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "nF000000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "nF000000::\"\"",
+      "principal": {
+        "type": "nF000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "nF000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "M": "",
         "M24xwwwwwwwwn00": "",
@@ -23,9 +32,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "nF000000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "nF000000::\"\"",
+      "principal": {
+        "type": "nF000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "nF000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "M": "",
         "M24xwwwwwwwwn00": "",
@@ -40,9 +58,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "nF000000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "nF000000::\"\"",
+      "principal": {
+        "type": "nF000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "nF000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "M": "",
         "M24xwwwwwwwwn00": "",
@@ -57,9 +84,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "nF000000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "nF000000::\"\"",
+      "principal": {
+        "type": "nF000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "nF000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "M": "",
         "M24xwwwwwwwwn00": "",
@@ -74,9 +110,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "nF000000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "nF000000::\"\"",
+      "principal": {
+        "type": "nF000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "nF000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "M": "",
         "M24xwwwwwwwwn00": "",
@@ -91,9 +136,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "nF000000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "nF000000::\"\"",
+      "principal": {
+        "type": "nF000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "nF000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "M": "",
         "M24xwwwwwwwwn00": "",
@@ -108,9 +162,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "nF000000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "nF000000::\"\"",
+      "principal": {
+        "type": "nF000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "nF000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "M": "",
         "M24xwwwwwwwwn00": "",
@@ -125,9 +188,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "nF000000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "nF000000::\"\"",
+      "principal": {
+        "type": "nF000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "nF000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "M": "",
         "M24xwwwwwwwwn00": "",
diff --git a/cedar-integration-tests/corpus_tests/39e580df8ad4aa5957fb8a24896dbf7fe4a1ef70.json b/cedar-integration-tests/corpus_tests/39e580df8ad4aa5957fb8a24896dbf7fe4a1ef70.json
index 87a7e97a8..386d28481 100644
--- a/cedar-integration-tests/corpus_tests/39e580df8ad4aa5957fb8a24896dbf7fe4a1ef70.json
+++ b/cedar-integration-tests/corpus_tests/39e580df8ad4aa5957fb8a24896dbf7fe4a1ef70.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "fB::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "fB::\"\"",
+      "principal": {
+        "type": "fB",
+        "id": ""
+      },
+      "resource": {
+        "type": "fB",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "fB::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "fB::\"\"",
+      "principal": {
+        "type": "fB",
+        "id": ""
+      },
+      "resource": {
+        "type": "fB",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "fB::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "fB::\"\"",
+      "principal": {
+        "type": "fB",
+        "id": ""
+      },
+      "resource": {
+        "type": "fB",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "fB::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "fB::\"\"",
+      "principal": {
+        "type": "fB",
+        "id": ""
+      },
+      "resource": {
+        "type": "fB",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "fB::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "fB::\"\"",
+      "principal": {
+        "type": "fB",
+        "id": ""
+      },
+      "resource": {
+        "type": "fB",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "fB::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "fB::\"\"",
+      "principal": {
+        "type": "fB",
+        "id": ""
+      },
+      "resource": {
+        "type": "fB",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "fB::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "fB::\"\"",
+      "principal": {
+        "type": "fB",
+        "id": ""
+      },
+      "resource": {
+        "type": "fB",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "fB::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "fB::\"\"",
+      "principal": {
+        "type": "fB",
+        "id": ""
+      },
+      "resource": {
+        "type": "fB",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/39ebe7f7f0cf48c209b352eb056595af84119c3a.json b/cedar-integration-tests/corpus_tests/39ebe7f7f0cf48c209b352eb056595af84119c3a.json
index 86f1356a2..aaa5c4f48 100644
--- a/cedar-integration-tests/corpus_tests/39ebe7f7f0cf48c209b352eb056595af84119c3a.json
+++ b/cedar-integration-tests/corpus_tests/39ebe7f7f0cf48c209b352eb056595af84119c3a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Gxxxxxkjj::a::\"\"",
-      "action": "Gxxxxxkjj::Action::\"action\"",
-      "resource": "Gxxxxxkjj::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxkjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxxxkjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxkjj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Gxxxxxkjj::a::\"\"",
-      "action": "Gxxxxxkjj::Action::\"action\"",
-      "resource": "Gxxxxxkjj::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxkjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxxxkjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxkjj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Gxxxxxkjj::a::\"\"",
-      "action": "Gxxxxxkjj::Action::\"action\"",
-      "resource": "Gxxxxxkjj::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxkjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxxxkjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxkjj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Gxxxxxkjj::a::\"\"",
-      "action": "Gxxxxxkjj::Action::\"action\"",
-      "resource": "Gxxxxxkjj::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxkjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxxxkjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxkjj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Gxxxxxkjj::a::\"\"",
-      "action": "Gxxxxxkjj::Action::\"action\"",
-      "resource": "Gxxxxxkjj::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxkjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxxxkjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxkjj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Gxxxxxkjj::a::\"\"",
-      "action": "Gxxxxxkjj::Action::\"action\"",
-      "resource": "Gxxxxxkjj::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxkjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxxxkjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxkjj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Gxxxxxkjj::a::\"\"",
-      "action": "Gxxxxxkjj::Action::\"action\"",
-      "resource": "Gxxxxxkjj::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxkjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxxxkjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxkjj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Gxxxxxkjj::a::\"\"",
-      "action": "Gxxxxxkjj::Action::\"action\"",
-      "resource": "Gxxxxxkjj::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxkjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxxxkjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxkjj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3a09e8d2f341ac0ed163d93913263a19a622fce2.json b/cedar-integration-tests/corpus_tests/3a09e8d2f341ac0ed163d93913263a19a622fce2.json
index 2e516c50a..eafcadf28 100644
--- a/cedar-integration-tests/corpus_tests/3a09e8d2f341ac0ed163d93913263a19a622fce2.json
+++ b/cedar-integration-tests/corpus_tests/3a09e8d2f341ac0ed163d93913263a19a622fce2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{1}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"v\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "v\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"v\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"v\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "v\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "v\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"v\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"v\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "v\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "v\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"v\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"v\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "v\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "v\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"v\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"v\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "v\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "v\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"v\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"v\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "v\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "v\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"v\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"v\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "v\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "v\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"v\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"v\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "v\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "v\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3a23d32c802b205472c72110a5b81b20a505f7ef.json b/cedar-integration-tests/corpus_tests/3a23d32c802b205472c72110a5b81b20a505f7ef.json
index 23b6524dd..7fb094ffa 100644
--- a/cedar-integration-tests/corpus_tests/3a23d32c802b205472c72110a5b81b20a505f7ef.json
+++ b/cedar-integration-tests/corpus_tests/3a23d32c802b205472c72110a5b81b20a505f7ef.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3a571207f4cd211aa19031dedc06f50d8ca584cb.json b/cedar-integration-tests/corpus_tests/3a571207f4cd211aa19031dedc06f50d8ca584cb.json
index c2e830a6e..eea275dcc 100644
--- a/cedar-integration-tests/corpus_tests/3a571207f4cd211aa19031dedc06f50d8ca584cb.json
+++ b/cedar-integration-tests/corpus_tests/3a571207f4cd211aa19031dedc06f50d8ca584cb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "L::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwww3sww3::\"\"",
+      "principal": {
+        "type": "L",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwww3sww3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "L::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwww3sww3::\"\"",
+      "principal": {
+        "type": "L",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwww3sww3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "L::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwww3sww3::\"\"",
+      "principal": {
+        "type": "L",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwww3sww3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "L::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwww3sww3::\"\"",
+      "principal": {
+        "type": "L",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwww3sww3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "L::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwww3sww3::\"\"",
+      "principal": {
+        "type": "L",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwww3sww3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "L::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwww3sww3::\"\"",
+      "principal": {
+        "type": "L",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwww3sww3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "L::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwww3sww3::\"\"",
+      "principal": {
+        "type": "L",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwww3sww3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "L::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwww3sww3::\"\"",
+      "principal": {
+        "type": "L",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwww3sww3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3a881612f6960c26ed5052ea9d78db86b326bb7b.json b/cedar-integration-tests/corpus_tests/3a881612f6960c26ed5052ea9d78db86b326bb7b.json
index fc1cc5f35..26df8897d 100644
--- a/cedar-integration-tests/corpus_tests/3a881612f6960c26ed5052ea9d78db86b326bb7b.json
+++ b/cedar-integration-tests/corpus_tests/3a881612f6960c26ed5052ea9d78db86b326bb7b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"..\"",
-      "action": "Action::\"Js\"",
-      "resource": "a::\"..\"",
+      "principal": {
+        "type": "a",
+        "id": ".."
+      },
+      "resource": {
+        "type": "a",
+        "id": ".."
+      },
+      "action": {
+        "type": "Action",
+        "id": "Js"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"..\"",
-      "action": "Action::\"Js\"",
-      "resource": "a::\"..\"",
+      "principal": {
+        "type": "a",
+        "id": ".."
+      },
+      "resource": {
+        "type": "a",
+        "id": ".."
+      },
+      "action": {
+        "type": "Action",
+        "id": "Js"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"..\"",
-      "action": "Action::\"Js\"",
-      "resource": "a::\"..\"",
+      "principal": {
+        "type": "a",
+        "id": ".."
+      },
+      "resource": {
+        "type": "a",
+        "id": ".."
+      },
+      "action": {
+        "type": "Action",
+        "id": "Js"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"..\"",
-      "action": "Action::\"Js\"",
-      "resource": "a::\"..\"",
+      "principal": {
+        "type": "a",
+        "id": ".."
+      },
+      "resource": {
+        "type": "a",
+        "id": ".."
+      },
+      "action": {
+        "type": "Action",
+        "id": "Js"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"..\"",
-      "action": "Action::\"Js\"",
-      "resource": "a::\"..\"",
+      "principal": {
+        "type": "a",
+        "id": ".."
+      },
+      "resource": {
+        "type": "a",
+        "id": ".."
+      },
+      "action": {
+        "type": "Action",
+        "id": "Js"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"..\"",
-      "action": "Action::\"Js\"",
-      "resource": "a::\"..\"",
+      "principal": {
+        "type": "a",
+        "id": ".."
+      },
+      "resource": {
+        "type": "a",
+        "id": ".."
+      },
+      "action": {
+        "type": "Action",
+        "id": "Js"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"..\"",
-      "action": "Action::\"Js\"",
-      "resource": "a::\"..\"",
+      "principal": {
+        "type": "a",
+        "id": ".."
+      },
+      "resource": {
+        "type": "a",
+        "id": ".."
+      },
+      "action": {
+        "type": "Action",
+        "id": "Js"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"..\"",
-      "action": "Action::\"Js\"",
-      "resource": "a::\"..\"",
+      "principal": {
+        "type": "a",
+        "id": ".."
+      },
+      "resource": {
+        "type": "a",
+        "id": ".."
+      },
+      "action": {
+        "type": "Action",
+        "id": "Js"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3aaa25af5b727ce4dd50a3f9fdb8065c1efc2d55.json b/cedar-integration-tests/corpus_tests/3aaa25af5b727ce4dd50a3f9fdb8065c1efc2d55.json
index 60ed4c79d..b8af86cca 100644
--- a/cedar-integration-tests/corpus_tests/3aaa25af5b727ce4dd50a3f9fdb8065c1efc2d55.json
+++ b/cedar-integration-tests/corpus_tests/3aaa25af5b727ce4dd50a3f9fdb8065c1efc2d55.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
@@ -29,9 +38,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
@@ -52,9 +70,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
@@ -75,9 +102,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
@@ -98,9 +134,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
@@ -121,9 +166,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
@@ -144,9 +198,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
@@ -167,9 +230,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
diff --git a/cedar-integration-tests/corpus_tests/3ad80e815e9862d1c3e514155ac87ae740a19216.json b/cedar-integration-tests/corpus_tests/3ad80e815e9862d1c3e514155ac87ae740a19216.json
index 1e9282af3..2306e8dd8 100644
--- a/cedar-integration-tests/corpus_tests/3ad80e815e9862d1c3e514155ac87ae740a19216.json
+++ b/cedar-integration-tests/corpus_tests/3ad80e815e9862d1c3e514155ac87ae740a19216.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"::\\0\\0\\u{1}\\0\\0C\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0\\u{1}\\0\\0C\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000\u0001\u0000\u0000C"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000\u0001\u0000\u0000C"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"::\\0\\0\\u{1}\\0\\0C\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000\u0001\u0000\u0000C"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"::\\0\\0\\u{1}\\0\\0C\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0\\u{1}\\0\\0C\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000\u0001\u0000\u0000C"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000\u0001\u0000\u0000C"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"::\\0\\0\\u{1}\\0\\0C\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0\\u{1}\\0\\0C\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000\u0001\u0000\u0000C"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000\u0001\u0000\u0000C"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"::\\0\\0\\u{1}\\0\\0C\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0\\u{1}\\0\\0C\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000\u0001\u0000\u0000C"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000\u0001\u0000\u0000C"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"::\\0\\0\\u{1}\\0\\0C\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0\\u{1}\\0\\0C\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000\u0001\u0000\u0000C"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000\u0001\u0000\u0000C"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"::\\0\\0\\u{1}\\0\\0C\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0\\u{1}\\0\\0C\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000\u0001\u0000\u0000C"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000\u0001\u0000\u0000C"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"::\\0\\0\\u{1}\\0\\0C\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0\\u{1}\\0\\0C\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000\u0001\u0000\u0000C"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000\u0001\u0000\u0000C"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3ae6afb11e33926e2cb1dc54cf36e174ab7414e5.json b/cedar-integration-tests/corpus_tests/3ae6afb11e33926e2cb1dc54cf36e174ab7414e5.json
index 049d0d02e..fc92be974 100644
--- a/cedar-integration-tests/corpus_tests/3ae6afb11e33926e2cb1dc54cf36e174ab7414e5.json
+++ b/cedar-integration-tests/corpus_tests/3ae6afb11e33926e2cb1dc54cf36e174ab7414e5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "m80::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwww8u8::\"\"",
+      "principal": {
+        "type": "m80",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwww8u8",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "m80::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwww8u8::\"\"",
+      "principal": {
+        "type": "m80",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwww8u8",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "m80::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwww8u8::\"\"",
+      "principal": {
+        "type": "m80",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwww8u8",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "m80::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwww8u8::\"\"",
+      "principal": {
+        "type": "m80",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwww8u8",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "m80::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwww8u8::\"\"",
+      "principal": {
+        "type": "m80",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwww8u8",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "m80::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwww8u8::\"\"",
+      "principal": {
+        "type": "m80",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwww8u8",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "m80::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwww8u8::\"\"",
+      "principal": {
+        "type": "m80",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwww8u8",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "m80::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwww8u8::\"\"",
+      "principal": {
+        "type": "m80",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwww8u8",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3af08a3dfbcbda787190470df772019a5f81d7d3.json b/cedar-integration-tests/corpus_tests/3af08a3dfbcbda787190470df772019a5f81d7d3.json
index 57229c25a..424ddb992 100644
--- a/cedar-integration-tests/corpus_tests/3af08a3dfbcbda787190470df772019a5f81d7d3.json
+++ b/cedar-integration-tests/corpus_tests/3af08a3dfbcbda787190470df772019a5f81d7d3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3af5c7c5f21236beb923bb3b497f21e215b05303.json b/cedar-integration-tests/corpus_tests/3af5c7c5f21236beb923bb3b497f21e215b05303.json
index 311a27581..38de97508 100644
--- a/cedar-integration-tests/corpus_tests/3af5c7c5f21236beb923bb3b497f21e215b05303.json
+++ b/cedar-integration-tests/corpus_tests/3af5c7c5f21236beb923bb3b497f21e215b05303.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "l777Ixxjj3::r::r::N8xt22337::a::\"\"",
-      "action": "l777Ixxjj3::r::r::N8xt22337::Action::\"action\"",
-      "resource": "l777Ixxjj3::r::r::N8xt22337::a::\"\"",
+      "principal": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::Action",
+        "id": "action"
+      },
       "context": {
         "K00000000": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "l777Ixxjj3::r::r::N8xt22337::a::\"\"",
-      "action": "l777Ixxjj3::r::r::N8xt22337::Action::\"action\"",
-      "resource": "l777Ixxjj3::r::r::N8xt22337::a::\"\"",
+      "principal": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::Action",
+        "id": "action"
+      },
       "context": {
         "K00000000": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "l777Ixxjj3::r::r::N8xt22337::a::\"\"",
-      "action": "l777Ixxjj3::r::r::N8xt22337::Action::\"action\"",
-      "resource": "l777Ixxjj3::r::r::N8xt22337::a::\"\"",
+      "principal": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::Action",
+        "id": "action"
+      },
       "context": {
         "K00000000": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "l777Ixxjj3::r::r::N8xt22337::a::\"\"",
-      "action": "l777Ixxjj3::r::r::N8xt22337::Action::\"action\"",
-      "resource": "l777Ixxjj3::r::r::N8xt22337::a::\"\"",
+      "principal": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::Action",
+        "id": "action"
+      },
       "context": {
         "K00000000": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "l777Ixxjj3::r::r::N8xt22337::a::\"\"",
-      "action": "l777Ixxjj3::r::r::N8xt22337::Action::\"action\"",
-      "resource": "l777Ixxjj3::r::r::N8xt22337::a::\"\"",
+      "principal": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::Action",
+        "id": "action"
+      },
       "context": {
         "K00000000": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "l777Ixxjj3::r::r::N8xt22337::a::\"\"",
-      "action": "l777Ixxjj3::r::r::N8xt22337::Action::\"action\"",
-      "resource": "l777Ixxjj3::r::r::N8xt22337::a::\"\"",
+      "principal": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::Action",
+        "id": "action"
+      },
       "context": {
         "K00000000": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "l777Ixxjj3::r::r::N8xt22337::a::\"\"",
-      "action": "l777Ixxjj3::r::r::N8xt22337::Action::\"action\"",
-      "resource": "l777Ixxjj3::r::r::N8xt22337::a::\"\"",
+      "principal": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::Action",
+        "id": "action"
+      },
       "context": {
         "K00000000": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "l777Ixxjj3::r::r::N8xt22337::a::\"\"",
-      "action": "l777Ixxjj3::r::r::N8xt22337::Action::\"action\"",
-      "resource": "l777Ixxjj3::r::r::N8xt22337::a::\"\"",
+      "principal": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l777Ixxjj3::r::r::N8xt22337::Action",
+        "id": "action"
+      },
       "context": {
         "K00000000": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/3b0cae408ac4ec7cf82e19f801891541c54f8e44.json b/cedar-integration-tests/corpus_tests/3b0cae408ac4ec7cf82e19f801891541c54f8e44.json
index 5ace3f076..6d95bc8e1 100644
--- a/cedar-integration-tests/corpus_tests/3b0cae408ac4ec7cf82e19f801891541c54f8e44.json
+++ b/cedar-integration-tests/corpus_tests/3b0cae408ac4ec7cf82e19f801891541c54f8e44.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0": [
           {},
@@ -25,9 +34,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0": []
       },
@@ -39,9 +57,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0": []
       },
@@ -53,9 +80,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0": []
       },
@@ -67,9 +103,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0": []
       },
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0": []
       },
@@ -95,9 +149,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0": []
       },
@@ -109,9 +172,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0": []
       },
diff --git a/cedar-integration-tests/corpus_tests/3b168243eb643d9339793f4bc155ac2828ab860d.json b/cedar-integration-tests/corpus_tests/3b168243eb643d9339793f4bc155ac2828ab860d.json
index 1c416c55f..6f001268c 100644
--- a/cedar-integration-tests/corpus_tests/3b168243eb643d9339793f4bc155ac2828ab860d.json
+++ b/cedar-integration-tests/corpus_tests/3b168243eb643d9339793f4bc155ac2828ab860d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"da\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "da"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": [
           {},
@@ -23,9 +32,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": []
       },
@@ -35,9 +53,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": []
       },
@@ -47,9 +74,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": []
       },
@@ -59,9 +95,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": []
       },
@@ -71,9 +116,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": []
       },
@@ -83,9 +137,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": []
       },
@@ -95,9 +158,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": []
       },
diff --git a/cedar-integration-tests/corpus_tests/3b21176e99540ef52dd4daacf1eb70d71ecdce0b.json b/cedar-integration-tests/corpus_tests/3b21176e99540ef52dd4daacf1eb70d71ecdce0b.json
index 022b04105..47b1fc099 100644
--- a/cedar-integration-tests/corpus_tests/3b21176e99540ef52dd4daacf1eb70d71ecdce0b.json
+++ b/cedar-integration-tests/corpus_tests/3b21176e99540ef52dd4daacf1eb70d71ecdce0b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::Fwww::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::Fwww::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::Fwww::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::Fwww::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::Fwww::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::Fwww::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::Fwww::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::Fwww::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3b404fbd0ca2eae78b2dff027d8c9a7278caf317.json b/cedar-integration-tests/corpus_tests/3b404fbd0ca2eae78b2dff027d8c9a7278caf317.json
index 01ca6911a..a34eef9c2 100644
--- a/cedar-integration-tests/corpus_tests/3b404fbd0ca2eae78b2dff027d8c9a7278caf317.json
+++ b/cedar-integration-tests/corpus_tests/3b404fbd0ca2eae78b2dff027d8c9a7278caf317.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::G::r::F::\"\"",
-      "action": "r::G::r::Action::\"action\"",
-      "resource": "r::G::r::F::\"\"",
+      "principal": {
+        "type": "r::G::r::F",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::G::r::F",
+        "id": ""
+      },
+      "action": {
+        "type": "r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::G::r::F::\"\"",
-      "action": "r::G::r::Action::\"action\"",
-      "resource": "r::G::r::F::\"\"",
+      "principal": {
+        "type": "r::G::r::F",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::G::r::F",
+        "id": ""
+      },
+      "action": {
+        "type": "r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::G::r::F::\"\"",
-      "action": "r::G::r::Action::\"action\"",
-      "resource": "r::G::r::F::\"\"",
+      "principal": {
+        "type": "r::G::r::F",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::G::r::F",
+        "id": ""
+      },
+      "action": {
+        "type": "r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::G::r::F::\"\"",
-      "action": "r::G::r::Action::\"action\"",
-      "resource": "r::G::r::F::\"\"",
+      "principal": {
+        "type": "r::G::r::F",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::G::r::F",
+        "id": ""
+      },
+      "action": {
+        "type": "r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::G::r::F::\"\"",
-      "action": "r::G::r::Action::\"action\"",
-      "resource": "r::G::r::F::\"\"",
+      "principal": {
+        "type": "r::G::r::F",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::G::r::F",
+        "id": ""
+      },
+      "action": {
+        "type": "r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::G::r::F::\"\"",
-      "action": "r::G::r::Action::\"action\"",
-      "resource": "r::G::r::F::\"\"",
+      "principal": {
+        "type": "r::G::r::F",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::G::r::F",
+        "id": ""
+      },
+      "action": {
+        "type": "r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::G::r::F::\"\"",
-      "action": "r::G::r::Action::\"action\"",
-      "resource": "r::G::r::F::\"\"",
+      "principal": {
+        "type": "r::G::r::F",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::G::r::F",
+        "id": ""
+      },
+      "action": {
+        "type": "r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::G::r::F::\"\"",
-      "action": "r::G::r::Action::\"action\"",
-      "resource": "r::G::r::F::\"\"",
+      "principal": {
+        "type": "r::G::r::F",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::G::r::F",
+        "id": ""
+      },
+      "action": {
+        "type": "r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3b5b1e469ee9944b3481a2a17500eff50f90fa8f.json b/cedar-integration-tests/corpus_tests/3b5b1e469ee9944b3481a2a17500eff50f90fa8f.json
index 97fc07c78..683c72da1 100644
--- a/cedar-integration-tests/corpus_tests/3b5b1e469ee9944b3481a2a17500eff50f90fa8f.json
+++ b/cedar-integration-tests/corpus_tests/3b5b1e469ee9944b3481a2a17500eff50f90fa8f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -84,9 +147,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3b5c2e23156d25cb6edb89b64ac639cce1d65bb3.json b/cedar-integration-tests/corpus_tests/3b5c2e23156d25cb6edb89b64ac639cce1d65bb3.json
index 214073c4a..c3d614f94 100644
--- a/cedar-integration-tests/corpus_tests/3b5c2e23156d25cb6edb89b64ac639cce1d65bb3.json
+++ b/cedar-integration-tests/corpus_tests/3b5c2e23156d25cb6edb89b64ac639cce1d65bb3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3b97e31ddca44e918597c1626cd4e662328203ff.json b/cedar-integration-tests/corpus_tests/3b97e31ddca44e918597c1626cd4e662328203ff.json
index a483b3e76..f43c3ed0a 100644
--- a/cedar-integration-tests/corpus_tests/3b97e31ddca44e918597c1626cd4e662328203ff.json
+++ b/cedar-integration-tests/corpus_tests/3b97e31ddca44e918597c1626cd4e662328203ff.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "v": {
           "__entity": {
@@ -26,9 +35,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "v": {
           "__entity": {
@@ -46,9 +64,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "v": {
           "__entity": {
@@ -66,9 +93,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "v": {
           "__entity": {
@@ -86,9 +122,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "v": {
           "__entity": {
@@ -106,9 +151,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "v": {
           "__entity": {
@@ -126,9 +180,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "v": {
           "__entity": {
@@ -146,9 +209,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "v": {
           "__entity": {
diff --git a/cedar-integration-tests/corpus_tests/3bb2b0bd7d31d589039ea349f2461b7a90c8238c.json b/cedar-integration-tests/corpus_tests/3bb2b0bd7d31d589039ea349f2461b7a90c8238c.json
index 056f024de..041ea8b96 100644
--- a/cedar-integration-tests/corpus_tests/3bb2b0bd7d31d589039ea349f2461b7a90c8238c.json
+++ b/cedar-integration-tests/corpus_tests/3bb2b0bd7d31d589039ea349f2461b7a90c8238c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"O\\u{2}~\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}~\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002~\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002~\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"O\\u{2}~\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}~\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002~\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002~\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"O\\u{2}~\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}~\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002~\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002~\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"O\\u{2}~\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}~\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002~\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002~\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"O\\u{2}~\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}~\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002~\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002~\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"O\\u{2}~\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}~\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002~\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002~\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"O\\u{2}~\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}~\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002~\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002~\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"O\\u{2}~\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\\u{2}~\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "O\u0002~\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O\u0002~\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3bb34a1db124f10d7f5cc0a12156f7d4de1545ab.json b/cedar-integration-tests/corpus_tests/3bb34a1db124f10d7f5cc0a12156f7d4de1545ab.json
index 60b85f81d..ede2ac6b0 100644
--- a/cedar-integration-tests/corpus_tests/3bb34a1db124f10d7f5cc0a12156f7d4de1545ab.json
+++ b/cedar-integration-tests/corpus_tests/3bb34a1db124f10d7f5cc0a12156f7d4de1545ab.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3bd059ed8326d059b6e6a00261c099c633d8efd1.json b/cedar-integration-tests/corpus_tests/3bd059ed8326d059b6e6a00261c099c633d8efd1.json
index e9064e1dd..f54813583 100644
--- a/cedar-integration-tests/corpus_tests/3bd059ed8326d059b6e6a00261c099c633d8efd1.json
+++ b/cedar-integration-tests/corpus_tests/3bd059ed8326d059b6e6a00261c099c633d8efd1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "lAdw6wyUy6U784::g333::\"\"",
-      "action": "lAdw6wyUy6U784::Action::\"\\u{7}\"",
-      "resource": "lAdw6wyUy6U784::g333::\"\"",
+      "principal": {
+        "type": "lAdw6wyUy6U784::g333",
+        "id": ""
+      },
+      "resource": {
+        "type": "lAdw6wyUy6U784::g333",
+        "id": ""
+      },
+      "action": {
+        "type": "lAdw6wyUy6U784::Action",
+        "id": "\u0007"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "lAdw6wyUy6U784::g333::\"\"",
-      "action": "lAdw6wyUy6U784::Action::\"\\u{7}\"",
-      "resource": "lAdw6wyUy6U784::g333::\"\"",
+      "principal": {
+        "type": "lAdw6wyUy6U784::g333",
+        "id": ""
+      },
+      "resource": {
+        "type": "lAdw6wyUy6U784::g333",
+        "id": ""
+      },
+      "action": {
+        "type": "lAdw6wyUy6U784::Action",
+        "id": "\u0007"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "lAdw6wyUy6U784::g333::\"\"",
-      "action": "lAdw6wyUy6U784::Action::\"\\u{7}\"",
-      "resource": "lAdw6wyUy6U784::g333::\"\"",
+      "principal": {
+        "type": "lAdw6wyUy6U784::g333",
+        "id": ""
+      },
+      "resource": {
+        "type": "lAdw6wyUy6U784::g333",
+        "id": ""
+      },
+      "action": {
+        "type": "lAdw6wyUy6U784::Action",
+        "id": "\u0007"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "lAdw6wyUy6U784::g333::\"\"",
-      "action": "lAdw6wyUy6U784::Action::\"\\u{7}\"",
-      "resource": "lAdw6wyUy6U784::g333::\"\"",
+      "principal": {
+        "type": "lAdw6wyUy6U784::g333",
+        "id": ""
+      },
+      "resource": {
+        "type": "lAdw6wyUy6U784::g333",
+        "id": ""
+      },
+      "action": {
+        "type": "lAdw6wyUy6U784::Action",
+        "id": "\u0007"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "lAdw6wyUy6U784::g333::\"\"",
-      "action": "lAdw6wyUy6U784::Action::\"\\u{7}\"",
-      "resource": "lAdw6wyUy6U784::g333::\"\"",
+      "principal": {
+        "type": "lAdw6wyUy6U784::g333",
+        "id": ""
+      },
+      "resource": {
+        "type": "lAdw6wyUy6U784::g333",
+        "id": ""
+      },
+      "action": {
+        "type": "lAdw6wyUy6U784::Action",
+        "id": "\u0007"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "lAdw6wyUy6U784::g333::\"\"",
-      "action": "lAdw6wyUy6U784::Action::\"\\u{7}\"",
-      "resource": "lAdw6wyUy6U784::g333::\"\"",
+      "principal": {
+        "type": "lAdw6wyUy6U784::g333",
+        "id": ""
+      },
+      "resource": {
+        "type": "lAdw6wyUy6U784::g333",
+        "id": ""
+      },
+      "action": {
+        "type": "lAdw6wyUy6U784::Action",
+        "id": "\u0007"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "lAdw6wyUy6U784::g333::\"\"",
-      "action": "lAdw6wyUy6U784::Action::\"\\u{7}\"",
-      "resource": "lAdw6wyUy6U784::g333::\"\"",
+      "principal": {
+        "type": "lAdw6wyUy6U784::g333",
+        "id": ""
+      },
+      "resource": {
+        "type": "lAdw6wyUy6U784::g333",
+        "id": ""
+      },
+      "action": {
+        "type": "lAdw6wyUy6U784::Action",
+        "id": "\u0007"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "lAdw6wyUy6U784::g333::\"\"",
-      "action": "lAdw6wyUy6U784::Action::\"\\u{7}\"",
-      "resource": "lAdw6wyUy6U784::g333::\"\"",
+      "principal": {
+        "type": "lAdw6wyUy6U784::g333",
+        "id": ""
+      },
+      "resource": {
+        "type": "lAdw6wyUy6U784::g333",
+        "id": ""
+      },
+      "action": {
+        "type": "lAdw6wyUy6U784::Action",
+        "id": "\u0007"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3bd634896540861f1eaa5dced860ca24b38ce552.json b/cedar-integration-tests/corpus_tests/3bd634896540861f1eaa5dced860ca24b38ce552.json
index 14ec3c04e..12b5c0ca5 100644
--- a/cedar-integration-tests/corpus_tests/3bd634896540861f1eaa5dced860ca24b38ce552.json
+++ b/cedar-integration-tests/corpus_tests/3bd634896540861f1eaa5dced860ca24b38ce552.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Kxx0xnx::Edml::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Edml::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Kxx0xnx::Edml::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Edml::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Kxx0xnx::Edml::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Edml::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Kxx0xnx::Edml::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Edml::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Kxx0xnx::Edml::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Edml::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Kxx0xnx::Edml::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Edml::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Kxx0xnx::Edml::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Edml::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Kxx0xnx::Edml::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Edml::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3bde040244b04439e604f4bc68db039890f4fc15.json b/cedar-integration-tests/corpus_tests/3bde040244b04439e604f4bc68db039890f4fc15.json
index 83b9f6913..51ad6c84f 100644
--- a/cedar-integration-tests/corpus_tests/3bde040244b04439e604f4bc68db039890f4fc15.json
+++ b/cedar-integration-tests/corpus_tests/3bde040244b04439e604f4bc68db039890f4fc15.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": [
           "u",
@@ -27,9 +36,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
@@ -41,9 +59,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
@@ -55,9 +82,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
@@ -69,9 +105,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
@@ -83,9 +128,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
@@ -97,9 +151,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
diff --git a/cedar-integration-tests/corpus_tests/3be7217c9c8e8d5aff2d052aa2047e5822b71b09.json b/cedar-integration-tests/corpus_tests/3be7217c9c8e8d5aff2d052aa2047e5822b71b09.json
index fcd6e0b1c..312390526 100644
--- a/cedar-integration-tests/corpus_tests/3be7217c9c8e8d5aff2d052aa2047e5822b71b09.json
+++ b/cedar-integration-tests/corpus_tests/3be7217c9c8e8d5aff2d052aa2047e5822b71b09.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"l\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "l"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3bed68b4af7ad00f858003e793a209c2755563e6.json b/cedar-integration-tests/corpus_tests/3bed68b4af7ad00f858003e793a209c2755563e6.json
index d45593c3d..0936ea5a7 100644
--- a/cedar-integration-tests/corpus_tests/3bed68b4af7ad00f858003e793a209c2755563e6.json
+++ b/cedar-integration-tests/corpus_tests/3bed68b4af7ad00f858003e793a209c2755563e6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Kxx0xnx::Qm0::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Qm0::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Qm0",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Qm0",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Kxx0xnx::Qm0::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Qm0::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Qm0",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Qm0",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Kxx0xnx::Qm0::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Qm0::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Qm0",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Qm0",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Kxx0xnx::Qm0::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Qm0::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Qm0",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Qm0",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Kxx0xnx::Qm0::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Qm0::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Qm0",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Qm0",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Kxx0xnx::Qm0::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Qm0::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Qm0",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Qm0",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Kxx0xnx::Qm0::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Qm0::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Qm0",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Qm0",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Kxx0xnx::Qm0::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Qm0::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Qm0",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Qm0",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3c0a85d7813bf5e4eda9f5d796c838025e1e3695.json b/cedar-integration-tests/corpus_tests/3c0a85d7813bf5e4eda9f5d796c838025e1e3695.json
index cb5f57afb..6e6643240 100644
--- a/cedar-integration-tests/corpus_tests/3c0a85d7813bf5e4eda9f5d796c838025e1e3695.json
+++ b/cedar-integration-tests/corpus_tests/3c0a85d7813bf5e4eda9f5d796c838025e1e3695.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -82,9 +145,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3c2951c32b8cc2ced0d43ee0387d8c3d4933f5ad.json b/cedar-integration-tests/corpus_tests/3c2951c32b8cc2ced0d43ee0387d8c3d4933f5ad.json
index 305576a18..d06be9858 100644
--- a/cedar-integration-tests/corpus_tests/3c2951c32b8cc2ced0d43ee0387d8c3d4933f5ad.json
+++ b/cedar-integration-tests/corpus_tests/3c2951c32b8cc2ced0d43ee0387d8c3d4933f5ad.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3c41a82958bcbdb29cbf5f6484151423d17f73d8.json b/cedar-integration-tests/corpus_tests/3c41a82958bcbdb29cbf5f6484151423d17f73d8.json
index 76b368fa2..2d53d2a0e 100644
--- a/cedar-integration-tests/corpus_tests/3c41a82958bcbdb29cbf5f6484151423d17f73d8.json
+++ b/cedar-integration-tests/corpus_tests/3c41a82958bcbdb29cbf5f6484151423d17f73d8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3c4c1d09710a15a2e915c4be60ec4c9755322cf1.json b/cedar-integration-tests/corpus_tests/3c4c1d09710a15a2e915c4be60ec4c9755322cf1.json
index 61764852a..4a3411492 100644
--- a/cedar-integration-tests/corpus_tests/3c4c1d09710a15a2e915c4be60ec4c9755322cf1.json
+++ b/cedar-integration-tests/corpus_tests/3c4c1d09710a15a2e915c4be60ec4c9755322cf1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3d0e48d2cc7268c89f217b05d96c68087eebec1a.json b/cedar-integration-tests/corpus_tests/3d0e48d2cc7268c89f217b05d96c68087eebec1a.json
index 24ab84963..a83903ec9 100644
--- a/cedar-integration-tests/corpus_tests/3d0e48d2cc7268c89f217b05d96c68087eebec1a.json
+++ b/cedar-integration-tests/corpus_tests/3d0e48d2cc7268c89f217b05d96c68087eebec1a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\0\\r\\u{2}\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\0\\r\\u{2}\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0000\r\u0002\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0000\r\u0002\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\0\\r\\u{2}\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\0\\r\\u{2}\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0000\r\u0002\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0000\r\u0002\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\0\\r\\u{2}\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\0\\r\\u{2}\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0000\r\u0002\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0000\r\u0002\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\0\\r\\u{2}\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\0\\r\\u{2}\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0000\r\u0002\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0000\r\u0002\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\0\\r\\u{2}\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\0\\r\\u{2}\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0000\r\u0002\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0000\r\u0002\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\0\\r\\u{2}\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\0\\r\\u{2}\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0000\r\u0002\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0000\r\u0002\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\0\\r\\u{2}\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\0\\r\\u{2}\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0000\r\u0002\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0000\r\u0002\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\0\\r\\u{2}\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\0\\r\\u{2}\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0000\r\u0002\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0000\r\u0002\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3d6ffca287c3df90bc95ce6c90cc5fa524b6d997.json b/cedar-integration-tests/corpus_tests/3d6ffca287c3df90bc95ce6c90cc5fa524b6d997.json
index dc0bb3ebe..1bbed5744 100644
--- a/cedar-integration-tests/corpus_tests/3d6ffca287c3df90bc95ce6c90cc5fa524b6d997.json
+++ b/cedar-integration-tests/corpus_tests/3d6ffca287c3df90bc95ce6c90cc5fa524b6d997.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "F::\":\\':\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ":':"
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "F::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "F::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "F::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "F::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "F::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "F::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "F::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3d707a276da82a88c7ca84ee7a2707e3dabb60e9.json b/cedar-integration-tests/corpus_tests/3d707a276da82a88c7ca84ee7a2707e3dabb60e9.json
index 432f6bcf6..cfaa2dbe0 100644
--- a/cedar-integration-tests/corpus_tests/3d707a276da82a88c7ca84ee7a2707e3dabb60e9.json
+++ b/cedar-integration-tests/corpus_tests/3d707a276da82a88c7ca84ee7a2707e3dabb60e9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3d7cf966b39a2e156d00c3d1bf96af90c89c0ee8.json b/cedar-integration-tests/corpus_tests/3d7cf966b39a2e156d00c3d1bf96af90c89c0ee8.json
index 5bc298512..70847090c 100644
--- a/cedar-integration-tests/corpus_tests/3d7cf966b39a2e156d00c3d1bf96af90c89c0ee8.json
+++ b/cedar-integration-tests/corpus_tests/3d7cf966b39a2e156d00c3d1bf96af90c89c0ee8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3da7d9c089f2d548fbe1dc274b9ea5a81a1bd482.json b/cedar-integration-tests/corpus_tests/3da7d9c089f2d548fbe1dc274b9ea5a81a1bd482.json
index 571e936e8..83967e61f 100644
--- a/cedar-integration-tests/corpus_tests/3da7d9c089f2d548fbe1dc274b9ea5a81a1bd482.json
+++ b/cedar-integration-tests/corpus_tests/3da7d9c089f2d548fbe1dc274b9ea5a81a1bd482.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\">:::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\">:::::\"",
+      "principal": {
+        "type": "a",
+        "id": ">:::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ">:::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\">:::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\">:::::\"",
+      "principal": {
+        "type": "a",
+        "id": ">:::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ">:::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\">:::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\">:::::\"",
+      "principal": {
+        "type": "a",
+        "id": ">:::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ">:::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\">:::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\">:::::\"",
+      "principal": {
+        "type": "a",
+        "id": ">:::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ">:::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\">:::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\">:::::\"",
+      "principal": {
+        "type": "a",
+        "id": ">:::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ">:::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\">:::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\">:::::\"",
+      "principal": {
+        "type": "a",
+        "id": ">:::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ">:::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\">:::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\">:::::\"",
+      "principal": {
+        "type": "a",
+        "id": ">:::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ">:::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\">:::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\">:::::\"",
+      "principal": {
+        "type": "a",
+        "id": ">:::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ">:::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3dd6f048ecfe5ab938cea0224dac0a5b3e1fb998.json b/cedar-integration-tests/corpus_tests/3dd6f048ecfe5ab938cea0224dac0a5b3e1fb998.json
index 1120ceec2..621bd28fc 100644
--- a/cedar-integration-tests/corpus_tests/3dd6f048ecfe5ab938cea0224dac0a5b3e1fb998.json
+++ b/cedar-integration-tests/corpus_tests/3dd6f048ecfe5ab938cea0224dac0a5b3e1fb998.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3dd9ae8abf6cbd88f196b47738a3eb19d6150691.json b/cedar-integration-tests/corpus_tests/3dd9ae8abf6cbd88f196b47738a3eb19d6150691.json
index 359ad4b36..4c213876e 100644
--- a/cedar-integration-tests/corpus_tests/3dd9ae8abf6cbd88f196b47738a3eb19d6150691.json
+++ b/cedar-integration-tests/corpus_tests/3dd9ae8abf6cbd88f196b47738a3eb19d6150691.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bhh02": ""
       },
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bhh02": ""
       },
@@ -32,9 +50,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bhh02": ""
       },
@@ -46,9 +73,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bhh02": ""
       },
@@ -60,9 +96,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bhh02": ""
       },
@@ -74,9 +119,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bhh02": ""
       },
@@ -88,9 +142,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bhh02": ""
       },
@@ -102,9 +165,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bhh02": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/3dfc706ec30800296e59c197bc0b57cca67e690a.json b/cedar-integration-tests/corpus_tests/3dfc706ec30800296e59c197bc0b57cca67e690a.json
index 5f3a2b9c3..487adb99b 100644
--- a/cedar-integration-tests/corpus_tests/3dfc706ec30800296e59c197bc0b57cca67e690a.json
+++ b/cedar-integration-tests/corpus_tests/3dfc706ec30800296e59c197bc0b57cca67e690a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "`"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "`"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3e086215db8ab6f898e05b2d9d42da7a189d69ea.json b/cedar-integration-tests/corpus_tests/3e086215db8ab6f898e05b2d9d42da7a189d69ea.json
index 9146401c7..7d1cad6f4 100644
--- a/cedar-integration-tests/corpus_tests/3e086215db8ab6f898e05b2d9d42da7a189d69ea.json
+++ b/cedar-integration-tests/corpus_tests/3e086215db8ab6f898e05b2d9d42da7a189d69ea.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3e3053c1416c941469f10c33aa234dc0245665d6.json b/cedar-integration-tests/corpus_tests/3e3053c1416c941469f10c33aa234dc0245665d6.json
index 9ea89385c..92a901374 100644
--- a/cedar-integration-tests/corpus_tests/3e3053c1416c941469f10c33aa234dc0245665d6.json
+++ b/cedar-integration-tests/corpus_tests/3e3053c1416c941469f10c33aa234dc0245665d6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\\0\\0\\0\\0\\0\\0\\0\\0\\01\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\".=\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001"
+      },
+      "resource": {
+        "type": "a",
+        "id": ".="
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}\\0\\0\\0\\0\\0\\0\\0\\0\\01\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\0\\0\\0\\0\\0\\0\\0\\0\\01\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{2}\\0\\0\\0\\0\\0\\0\\0\\0\\01\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\0\\0\\0\\0\\0\\0\\0\\0\\01\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}\\0\\0\\0\\0\\0\\0\\0\\0\\01\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\0\\0\\0\\0\\0\\0\\0\\0\\01\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{2}\\0\\0\\0\\0\\0\\0\\0\\0\\01\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\0\\0\\0\\0\\0\\0\\0\\0\\01\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}\\0\\0\\0\\0\\0\\0\\0\\0\\01\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\0\\0\\0\\0\\0\\0\\0\\0\\01\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}\\0\\0\\0\\0\\0\\0\\0\\0\\01\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\0\\0\\0\\0\\0\\0\\0\\0\\01\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}\\0\\0\\0\\0\\0\\0\\0\\0\\01\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\0\\0\\0\\0\\0\\0\\0\\0\\01\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3e4d7a1c10e8f73b07964cc389aeac2a26364f36.json b/cedar-integration-tests/corpus_tests/3e4d7a1c10e8f73b07964cc389aeac2a26364f36.json
index 22c25f492..a4b1ff92d 100644
--- a/cedar-integration-tests/corpus_tests/3e4d7a1c10e8f73b07964cc389aeac2a26364f36.json
+++ b/cedar-integration-tests/corpus_tests/3e4d7a1c10e8f73b07964cc389aeac2a26364f36.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3e80eb97896da06eadf20906b9e82cd670e0eb62.json b/cedar-integration-tests/corpus_tests/3e80eb97896da06eadf20906b9e82cd670e0eb62.json
index 5f567b0d2..30ac99f41 100644
--- a/cedar-integration-tests/corpus_tests/3e80eb97896da06eadf20906b9e82cd670e0eb62.json
+++ b/cedar-integration-tests/corpus_tests/3e80eb97896da06eadf20906b9e82cd670e0eb62.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0:::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0:::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000:::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000:::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0:::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0:::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000:::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000:::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0:::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0:::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000:::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000:::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0:::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0:::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000:::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000:::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0:::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0:::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000:::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000:::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0:::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0:::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000:::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000:::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0:::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0:::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000:::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000:::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0:::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0:::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000:::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000:::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3e9e94546d3cebfdefdb52c437e3a7b91a38fcca.json b/cedar-integration-tests/corpus_tests/3e9e94546d3cebfdefdb52c437e3a7b91a38fcca.json
index a8397b903..236f87e01 100644
--- a/cedar-integration-tests/corpus_tests/3e9e94546d3cebfdefdb52c437e3a7b91a38fcca.json
+++ b/cedar-integration-tests/corpus_tests/3e9e94546d3cebfdefdb52c437e3a7b91a38fcca.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3f108515ed95ea8e4b5a58e5c06dc0233554f8bd.json b/cedar-integration-tests/corpus_tests/3f108515ed95ea8e4b5a58e5c06dc0233554f8bd.json
index a67bfe6f9..60d9bf888 100644
--- a/cedar-integration-tests/corpus_tests/3f108515ed95ea8e4b5a58e5c06dc0233554f8bd.json
+++ b/cedar-integration-tests/corpus_tests/3f108515ed95ea8e4b5a58e5c06dc0233554f8bd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{6}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0006"
+      },
       "context": {
         "_q": {
           "__entity": {
@@ -25,9 +34,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{6}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0006"
+      },
       "context": {
         "_q": {
           "__entity": {
@@ -44,9 +62,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{6}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0006"
+      },
       "context": {
         "_q": {
           "__entity": {
@@ -63,9 +90,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{6}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0006"
+      },
       "context": {
         "_q": {
           "__entity": {
@@ -82,9 +118,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{6}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0006"
+      },
       "context": {
         "_q": {
           "__entity": {
@@ -101,9 +146,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{6}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0006"
+      },
       "context": {
         "_q": {
           "__entity": {
@@ -120,9 +174,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{6}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0006"
+      },
       "context": {
         "_q": {
           "__entity": {
@@ -139,9 +202,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{6}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0006"
+      },
       "context": {
         "_q": {
           "__entity": {
diff --git a/cedar-integration-tests/corpus_tests/3f56d8aabac70355cefffd94c1cdd0c8632bd415.json b/cedar-integration-tests/corpus_tests/3f56d8aabac70355cefffd94c1cdd0c8632bd415.json
index df4d22207..c28d0c016 100644
--- a/cedar-integration-tests/corpus_tests/3f56d8aabac70355cefffd94c1cdd0c8632bd415.json
+++ b/cedar-integration-tests/corpus_tests/3f56d8aabac70355cefffd94c1cdd0c8632bd415.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"+\\u{6}\\0\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0006\u0000\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"+\\u{6}\\0\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\u{6}\\0\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0006\u0000\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0006\u0000\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"+\\u{6}\\0\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\u{6}\\0\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0006\u0000\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0006\u0000\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"+\\u{6}\\0\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\u{6}\\0\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0006\u0000\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0006\u0000\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"+\\u{6}\\0\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\u{6}\\0\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0006\u0000\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0006\u0000\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"+\\u{6}\\0\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\u{6}\\0\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0006\u0000\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0006\u0000\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"+\\u{6}\\0\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\u{6}\\0\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0006\u0000\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0006\u0000\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"+\\u{6}\\0\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\u{6}\\0\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0006\u0000\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0006\u0000\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3f5e6b7dc70669824b8a9f41b0ce477464b69d75.json b/cedar-integration-tests/corpus_tests/3f5e6b7dc70669824b8a9f41b0ce477464b69d75.json
index 62bf07bf9..c2e67f744 100644
--- a/cedar-integration-tests/corpus_tests/3f5e6b7dc70669824b8a9f41b0ce477464b69d75.json
+++ b/cedar-integration-tests/corpus_tests/3f5e6b7dc70669824b8a9f41b0ce477464b69d75.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "l0www0ww::a::\":\"",
-      "action": "l0www0ww::Action::\"action\"",
-      "resource": "l0www0ww::a::\":\"",
+      "principal": {
+        "type": "l0www0ww::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "l0www0ww::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "l0www0ww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "l0www0ww::a::\":\"",
-      "action": "l0www0ww::Action::\"action\"",
-      "resource": "l0www0ww::a::\":\"",
+      "principal": {
+        "type": "l0www0ww::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "l0www0ww::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "l0www0ww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "l0www0ww::a::\":\"",
-      "action": "l0www0ww::Action::\"action\"",
-      "resource": "l0www0ww::a::\":\"",
+      "principal": {
+        "type": "l0www0ww::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "l0www0ww::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "l0www0ww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "l0www0ww::a::\":\"",
-      "action": "l0www0ww::Action::\"action\"",
-      "resource": "l0www0ww::a::\":\"",
+      "principal": {
+        "type": "l0www0ww::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "l0www0ww::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "l0www0ww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "l0www0ww::a::\":\"",
-      "action": "l0www0ww::Action::\"action\"",
-      "resource": "l0www0ww::a::\":\"",
+      "principal": {
+        "type": "l0www0ww::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "l0www0ww::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "l0www0ww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "l0www0ww::a::\":\"",
-      "action": "l0www0ww::Action::\"action\"",
-      "resource": "l0www0ww::a::\":\"",
+      "principal": {
+        "type": "l0www0ww::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "l0www0ww::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "l0www0ww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "l0www0ww::a::\":\"",
-      "action": "l0www0ww::Action::\"action\"",
-      "resource": "l0www0ww::a::\":\"",
+      "principal": {
+        "type": "l0www0ww::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "l0www0ww::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "l0www0ww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "l0www0ww::a::\":\"",
-      "action": "l0www0ww::Action::\"action\"",
-      "resource": "l0www0ww::a::\":\"",
+      "principal": {
+        "type": "l0www0ww::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "l0www0ww::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "l0www0ww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3f61d3cf86466ac28b1895e4661050b46903c7a8.json b/cedar-integration-tests/corpus_tests/3f61d3cf86466ac28b1895e4661050b46903c7a8.json
index 68007826d..5221a2dad 100644
--- a/cedar-integration-tests/corpus_tests/3f61d3cf86466ac28b1895e4661050b46903c7a8.json
+++ b/cedar-integration-tests/corpus_tests/3f61d3cf86466ac28b1895e4661050b46903c7a8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0W\\0@jj\\'\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000W\u0000@jj'\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3f7b0ffba42bc51579c020cef13dd8e226b1838c.json b/cedar-integration-tests/corpus_tests/3f7b0ffba42bc51579c020cef13dd8e226b1838c.json
index 7215becc3..476263add 100644
--- a/cedar-integration-tests/corpus_tests/3f7b0ffba42bc51579c020cef13dd8e226b1838c.json
+++ b/cedar-integration-tests/corpus_tests/3f7b0ffba42bc51579c020cef13dd8e226b1838c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/3f83703d388cd9b69ca17c95a29a89cadff67ba4.json b/cedar-integration-tests/corpus_tests/3f83703d388cd9b69ca17c95a29a89cadff67ba4.json
index 8e17fcae9..724ed131f 100644
--- a/cedar-integration-tests/corpus_tests/3f83703d388cd9b69ca17c95a29a89cadff67ba4.json
+++ b/cedar-integration-tests/corpus_tests/3f83703d388cd9b69ca17c95a29a89cadff67ba4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A0::FwwwU::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::FwwwU::\"\"",
+      "principal": {
+        "type": "A0::FwwwU",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::FwwwU",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A0::FwwwU::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::FwwwU::\"\"",
+      "principal": {
+        "type": "A0::FwwwU",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::FwwwU",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A0::FwwwU::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::FwwwU::\"\"",
+      "principal": {
+        "type": "A0::FwwwU",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::FwwwU",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A0::FwwwU::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::FwwwU::\"\"",
+      "principal": {
+        "type": "A0::FwwwU",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::FwwwU",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A0::FwwwU::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::FwwwU::\"\"",
+      "principal": {
+        "type": "A0::FwwwU",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::FwwwU",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A0::FwwwU::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::FwwwU::\"\"",
+      "principal": {
+        "type": "A0::FwwwU",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::FwwwU",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A0::FwwwU::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::FwwwU::\"\"",
+      "principal": {
+        "type": "A0::FwwwU",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::FwwwU",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A0::FwwwU::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::FwwwU::\"\"",
+      "principal": {
+        "type": "A0::FwwwU",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::FwwwU",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3fc5409b18d589862941b8e943a52c8a0a229fac.json b/cedar-integration-tests/corpus_tests/3fc5409b18d589862941b8e943a52c8a0a229fac.json
index 7a7b0b90d..ebc9c2e46 100644
--- a/cedar-integration-tests/corpus_tests/3fc5409b18d589862941b8e943a52c8a0a229fac.json
+++ b/cedar-integration-tests/corpus_tests/3fc5409b18d589862941b8e943a52c8a0a229fac.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/3fed84e6d367c88bde42d53e756d528905a4d4fc.json b/cedar-integration-tests/corpus_tests/3fed84e6d367c88bde42d53e756d528905a4d4fc.json
index 40680f6ab..1a0f18ba9 100644
--- a/cedar-integration-tests/corpus_tests/3fed84e6d367c88bde42d53e756d528905a4d4fc.json
+++ b/cedar-integration-tests/corpus_tests/3fed84e6d367c88bde42d53e756d528905a4d4fc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "N8xt37x77::a::\"\"",
-      "action": "N8xt37x77::Action::\"action\"",
-      "resource": "N8xt37x77::a::\"\"",
+      "principal": {
+        "type": "N8xt37x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "N8xt37x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "N8xt37x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "N8xt37x77::a::\"\"",
-      "action": "N8xt37x77::Action::\"action\"",
-      "resource": "N8xt37x77::a::\"\"",
+      "principal": {
+        "type": "N8xt37x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "N8xt37x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "N8xt37x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "N8xt37x77::a::\"\"",
-      "action": "N8xt37x77::Action::\"action\"",
-      "resource": "N8xt37x77::a::\"\"",
+      "principal": {
+        "type": "N8xt37x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "N8xt37x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "N8xt37x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "N8xt37x77::a::\"\"",
-      "action": "N8xt37x77::Action::\"action\"",
-      "resource": "N8xt37x77::a::\"\"",
+      "principal": {
+        "type": "N8xt37x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "N8xt37x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "N8xt37x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "N8xt37x77::a::\"\"",
-      "action": "N8xt37x77::Action::\"action\"",
-      "resource": "N8xt37x77::a::\"\"",
+      "principal": {
+        "type": "N8xt37x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "N8xt37x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "N8xt37x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "N8xt37x77::a::\"\"",
-      "action": "N8xt37x77::Action::\"action\"",
-      "resource": "N8xt37x77::a::\"\"",
+      "principal": {
+        "type": "N8xt37x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "N8xt37x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "N8xt37x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "N8xt37x77::a::\"\"",
-      "action": "N8xt37x77::Action::\"action\"",
-      "resource": "N8xt37x77::a::\"\"",
+      "principal": {
+        "type": "N8xt37x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "N8xt37x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "N8xt37x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "N8xt37x77::a::\"\"",
-      "action": "N8xt37x77::Action::\"action\"",
-      "resource": "N8xt37x77::a::\"\"",
+      "principal": {
+        "type": "N8xt37x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "N8xt37x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "N8xt37x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/400b93e7ff96634977e53d3f7b0b183f35a5291a.json b/cedar-integration-tests/corpus_tests/400b93e7ff96634977e53d3f7b0b183f35a5291a.json
index a4505bf8d..563433d9b 100644
--- a/cedar-integration-tests/corpus_tests/400b93e7ff96634977e53d3f7b0b183f35a5291a.json
+++ b/cedar-integration-tests/corpus_tests/400b93e7ff96634977e53d3f7b0b183f35a5291a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0jj#\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000jj#\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0jj#\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000jj#\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0jj#\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0jj#\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000jj#\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000jj#\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0jj#\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0jj#\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000jj#\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000jj#\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0jj#\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0jj#\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000jj#\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000jj#\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0jj#\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0jj#\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000jj#\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000jj#\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0jj#\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0jj#\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000jj#\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000jj#\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/409414c9f886f7fc05131ff28e7e2e1fe5dc98f8.json b/cedar-integration-tests/corpus_tests/409414c9f886f7fc05131ff28e7e2e1fe5dc98f8.json
index f2eadc05e..2f9d0d8eb 100644
--- a/cedar-integration-tests/corpus_tests/409414c9f886f7fc05131ff28e7e2e1fe5dc98f8.json
+++ b/cedar-integration-tests/corpus_tests/409414c9f886f7fc05131ff28e7e2e1fe5dc98f8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/4117e182dc897acdefc83bb0e8d17dad400d84b5.json b/cedar-integration-tests/corpus_tests/4117e182dc897acdefc83bb0e8d17dad400d84b5.json
index da8aac6ee..dfec4c620 100644
--- a/cedar-integration-tests/corpus_tests/4117e182dc897acdefc83bb0e8d17dad400d84b5.json
+++ b/cedar-integration-tests/corpus_tests/4117e182dc897acdefc83bb0e8d17dad400d84b5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "K::n33333x::r::a::\"\\u{2}6\"",
-      "action": "K::n33333x::r::Action::\"action\"",
-      "resource": "K::n33333x::r::a::\"\\u{2}6\"",
+      "principal": {
+        "type": "K::n33333x::r::a",
+        "id": "\u00026"
+      },
+      "resource": {
+        "type": "K::n33333x::r::a",
+        "id": "\u00026"
+      },
+      "action": {
+        "type": "K::n33333x::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "K::n33333x::r::a::\"\\u{2}6\"",
-      "action": "K::n33333x::r::Action::\"action\"",
-      "resource": "K::n33333x::r::a::\"\\u{2}6\"",
+      "principal": {
+        "type": "K::n33333x::r::a",
+        "id": "\u00026"
+      },
+      "resource": {
+        "type": "K::n33333x::r::a",
+        "id": "\u00026"
+      },
+      "action": {
+        "type": "K::n33333x::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "K::n33333x::r::a::\"\\u{2}6\"",
-      "action": "K::n33333x::r::Action::\"action\"",
-      "resource": "K::n33333x::r::a::\"\\u{2}6\"",
+      "principal": {
+        "type": "K::n33333x::r::a",
+        "id": "\u00026"
+      },
+      "resource": {
+        "type": "K::n33333x::r::a",
+        "id": "\u00026"
+      },
+      "action": {
+        "type": "K::n33333x::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "K::n33333x::r::a::\"\\u{2}6\"",
-      "action": "K::n33333x::r::Action::\"action\"",
-      "resource": "K::n33333x::r::a::\"\\u{2}6\"",
+      "principal": {
+        "type": "K::n33333x::r::a",
+        "id": "\u00026"
+      },
+      "resource": {
+        "type": "K::n33333x::r::a",
+        "id": "\u00026"
+      },
+      "action": {
+        "type": "K::n33333x::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "K::n33333x::r::a::\"\\u{2}6\"",
-      "action": "K::n33333x::r::Action::\"action\"",
-      "resource": "K::n33333x::r::a::\"\\u{2}6\"",
+      "principal": {
+        "type": "K::n33333x::r::a",
+        "id": "\u00026"
+      },
+      "resource": {
+        "type": "K::n33333x::r::a",
+        "id": "\u00026"
+      },
+      "action": {
+        "type": "K::n33333x::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "K::n33333x::r::a::\"\\u{2}6\"",
-      "action": "K::n33333x::r::Action::\"action\"",
-      "resource": "K::n33333x::r::a::\"\\u{2}6\"",
+      "principal": {
+        "type": "K::n33333x::r::a",
+        "id": "\u00026"
+      },
+      "resource": {
+        "type": "K::n33333x::r::a",
+        "id": "\u00026"
+      },
+      "action": {
+        "type": "K::n33333x::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "K::n33333x::r::a::\"\\u{2}6\"",
-      "action": "K::n33333x::r::Action::\"action\"",
-      "resource": "K::n33333x::r::a::\"\\u{2}6\"",
+      "principal": {
+        "type": "K::n33333x::r::a",
+        "id": "\u00026"
+      },
+      "resource": {
+        "type": "K::n33333x::r::a",
+        "id": "\u00026"
+      },
+      "action": {
+        "type": "K::n33333x::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "K::n33333x::r::a::\"\\u{2}6\"",
-      "action": "K::n33333x::r::Action::\"action\"",
-      "resource": "K::n33333x::r::a::\"\\u{2}6\"",
+      "principal": {
+        "type": "K::n33333x::r::a",
+        "id": "\u00026"
+      },
+      "resource": {
+        "type": "K::n33333x::r::a",
+        "id": "\u00026"
+      },
+      "action": {
+        "type": "K::n33333x::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4152f079059c8e73f72310634b475881b4ebb8ab.json b/cedar-integration-tests/corpus_tests/4152f079059c8e73f72310634b475881b4ebb8ab.json
index 488dd8cdd..46066bd6f 100644
--- a/cedar-integration-tests/corpus_tests/4152f079059c8e73f72310634b475881b4ebb8ab.json
+++ b/cedar-integration-tests/corpus_tests/4152f079059c8e73f72310634b475881b4ebb8ab.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a::\"\"",
-      "action": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::Action::\"action\"",
-      "resource": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a::\"\"",
-      "action": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::Action::\"action\"",
-      "resource": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a::\"\"",
-      "action": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::Action::\"action\"",
-      "resource": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a::\"\"",
-      "action": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::Action::\"action\"",
-      "resource": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a::\"\"",
-      "action": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::Action::\"action\"",
-      "resource": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a::\"\"",
-      "action": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::Action::\"action\"",
-      "resource": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a::\"\"",
-      "action": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::Action::\"action\"",
-      "resource": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a::\"\"",
-      "action": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::Action::\"action\"",
-      "resource": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a::\"\"",
+      "principal": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::a",
+        "id": ""
+      },
+      "action": {
+        "type": "v::Qx::bxxvxxxxxxx::v::qL::OMRR::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/41720d33fd4859c3997248e38c3c2b706cfd290d.json b/cedar-integration-tests/corpus_tests/41720d33fd4859c3997248e38c3c2b706cfd290d.json
index 2aa209342..c4d8f9f5b 100644
--- a/cedar-integration-tests/corpus_tests/41720d33fd4859c3997248e38c3c2b706cfd290d.json
+++ b/cedar-integration-tests/corpus_tests/41720d33fd4859c3997248e38c3c2b706cfd290d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/4175e34243cc2a879f292b2413914b7dcb124a27.json b/cedar-integration-tests/corpus_tests/4175e34243cc2a879f292b2413914b7dcb124a27.json
index a1fe181e1..1a157f115 100644
--- a/cedar-integration-tests/corpus_tests/4175e34243cc2a879f292b2413914b7dcb124a27.json
+++ b/cedar-integration-tests/corpus_tests/4175e34243cc2a879f292b2413914b7dcb124a27.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "W::v::Action::\"kg\"",
       "resource": null,
+      "action": {
+        "type": "W::v::Action",
+        "id": "kg"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -17,8 +20,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "W::v::Action::\"kg\"",
       "resource": null,
+      "action": {
+        "type": "W::v::Action",
+        "id": "kg"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -27,8 +33,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "W::v::Action::\"kg\"",
       "resource": null,
+      "action": {
+        "type": "W::v::Action",
+        "id": "kg"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -37,8 +46,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "W::v::Action::\"kg\"",
       "resource": null,
+      "action": {
+        "type": "W::v::Action",
+        "id": "kg"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -47,8 +59,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "W::v::Action::\"kg\"",
       "resource": null,
+      "action": {
+        "type": "W::v::Action",
+        "id": "kg"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -57,8 +72,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "W::v::Action::\"kg\"",
       "resource": null,
+      "action": {
+        "type": "W::v::Action",
+        "id": "kg"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -67,8 +85,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "W::v::Action::\"kg\"",
       "resource": null,
+      "action": {
+        "type": "W::v::Action",
+        "id": "kg"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -77,8 +98,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "W::v::Action::\"kg\"",
       "resource": null,
+      "action": {
+        "type": "W::v::Action",
+        "id": "kg"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/419f064ced0e79f8e26a9d482d1201c68c3b8dfa.json b/cedar-integration-tests/corpus_tests/419f064ced0e79f8e26a9d482d1201c68c3b8dfa.json
index 3d4e0f1b7..a53d7005c 100644
--- a/cedar-integration-tests/corpus_tests/419f064ced0e79f8e26a9d482d1201c68c3b8dfa.json
+++ b/cedar-integration-tests/corpus_tests/419f064ced0e79f8e26a9d482d1201c68c3b8dfa.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A0ww::a::\"\"",
-      "action": "A0ww::Action::\"action\"",
-      "resource": "A0ww::a::\"\"",
+      "principal": {
+        "type": "A0ww::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0ww::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A0ww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A0ww::a::\"\"",
-      "action": "A0ww::Action::\"action\"",
-      "resource": "A0ww::a::\"\"",
+      "principal": {
+        "type": "A0ww::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0ww::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A0ww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A0ww::a::\"\"",
-      "action": "A0ww::Action::\"action\"",
-      "resource": "A0ww::a::\"\"",
+      "principal": {
+        "type": "A0ww::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0ww::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A0ww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A0ww::a::\"\"",
-      "action": "A0ww::Action::\"action\"",
-      "resource": "A0ww::a::\"\"",
+      "principal": {
+        "type": "A0ww::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0ww::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A0ww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A0ww::a::\"\"",
-      "action": "A0ww::Action::\"action\"",
-      "resource": "A0ww::a::\"\"",
+      "principal": {
+        "type": "A0ww::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0ww::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A0ww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A0ww::a::\"\"",
-      "action": "A0ww::Action::\"action\"",
-      "resource": "A0ww::a::\"\"",
+      "principal": {
+        "type": "A0ww::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0ww::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A0ww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A0ww::a::\"\"",
-      "action": "A0ww::Action::\"action\"",
-      "resource": "A0ww::a::\"\"",
+      "principal": {
+        "type": "A0ww::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0ww::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A0ww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A0ww::a::\"\"",
-      "action": "A0ww::Action::\"action\"",
-      "resource": "A0ww::a::\"\"",
+      "principal": {
+        "type": "A0ww::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0ww::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A0ww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/41b3249bc82e1922148ebe40da27638a1d8f3e45.json b/cedar-integration-tests/corpus_tests/41b3249bc82e1922148ebe40da27638a1d8f3e45.json
index d73b688e8..de42ed03e 100644
--- a/cedar-integration-tests/corpus_tests/41b3249bc82e1922148ebe40da27638a1d8f3e45.json
+++ b/cedar-integration-tests/corpus_tests/41b3249bc82e1922148ebe40da27638a1d8f3e45.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"fffffffffFf\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "fffffffffFf"
+      },
       "context": {
         "I": "",
         "r": ""
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"fffffffffFf\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "fffffffffFf"
+      },
       "context": {
         "I": "",
         "r": ""
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"fffffffffFf\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "fffffffffFf"
+      },
       "context": {
         "I": "",
         "r": ""
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"fffffffffFf\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "fffffffffFf"
+      },
       "context": {
         "I": "",
         "r": ""
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"fffffffffFf\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "fffffffffFf"
+      },
       "context": {
         "I": "",
         "r": ""
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"fffffffffFf\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "fffffffffFf"
+      },
       "context": {
         "I": "",
         "r": ""
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"fffffffffFf\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "fffffffffFf"
+      },
       "context": {
         "I": "",
         "r": ""
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"fffffffffFf\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "fffffffffFf"
+      },
       "context": {
         "I": "",
         "r": ""
diff --git a/cedar-integration-tests/corpus_tests/41ffe03150bfedb110650a025dfc3cbf1026144c.json b/cedar-integration-tests/corpus_tests/41ffe03150bfedb110650a025dfc3cbf1026144c.json
index 430eeb85b..2a9c88470 100644
--- a/cedar-integration-tests/corpus_tests/41ffe03150bfedb110650a025dfc3cbf1026144c.json
+++ b/cedar-integration-tests/corpus_tests/41ffe03150bfedb110650a025dfc3cbf1026144c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
diff --git a/cedar-integration-tests/corpus_tests/423fe689c6591ef101c51473492bd596e3d5ffce.json b/cedar-integration-tests/corpus_tests/423fe689c6591ef101c51473492bd596e3d5ffce.json
index d7826ceae..84907d7c7 100644
--- a/cedar-integration-tests/corpus_tests/423fe689c6591ef101c51473492bd596e3d5ffce.json
+++ b/cedar-integration-tests/corpus_tests/423fe689c6591ef101c51473492bd596e3d5ffce.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"C\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "C"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"C\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"C\"",
+      "principal": {
+        "type": "a",
+        "id": "C"
+      },
+      "resource": {
+        "type": "a",
+        "id": "C"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"C\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"C\"",
+      "principal": {
+        "type": "a",
+        "id": "C"
+      },
+      "resource": {
+        "type": "a",
+        "id": "C"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"C\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"C\"",
+      "principal": {
+        "type": "a",
+        "id": "C"
+      },
+      "resource": {
+        "type": "a",
+        "id": "C"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"C\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"C\"",
+      "principal": {
+        "type": "a",
+        "id": "C"
+      },
+      "resource": {
+        "type": "a",
+        "id": "C"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"C\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"C\"",
+      "principal": {
+        "type": "a",
+        "id": "C"
+      },
+      "resource": {
+        "type": "a",
+        "id": "C"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"C\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"C\"",
+      "principal": {
+        "type": "a",
+        "id": "C"
+      },
+      "resource": {
+        "type": "a",
+        "id": "C"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"C\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"C\"",
+      "principal": {
+        "type": "a",
+        "id": "C"
+      },
+      "resource": {
+        "type": "a",
+        "id": "C"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/424d557b4f611937f98306c623d4ec7e75ca652a.json b/cedar-integration-tests/corpus_tests/424d557b4f611937f98306c623d4ec7e75ca652a.json
index 2d054f17a..d99f73f9e 100644
--- a/cedar-integration-tests/corpus_tests/424d557b4f611937f98306c623d4ec7e75ca652a.json
+++ b/cedar-integration-tests/corpus_tests/424d557b4f611937f98306c623d4ec7e75ca652a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::r::r::a::\"\"",
-      "action": "r::r::r::r::Action::\"\"",
-      "resource": "r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::r::r::a::\"\"",
-      "action": "r::r::r::r::Action::\"\"",
-      "resource": "r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::r::r::a::\"\"",
-      "action": "r::r::r::r::Action::\"\"",
-      "resource": "r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::r::r::a::\"\"",
-      "action": "r::r::r::r::Action::\"\"",
-      "resource": "r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::r::r::a::\"\"",
-      "action": "r::r::r::r::Action::\"\"",
-      "resource": "r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::r::r::a::\"\"",
-      "action": "r::r::r::r::Action::\"\"",
-      "resource": "r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::r::r::a::\"\"",
-      "action": "r::r::r::r::Action::\"\"",
-      "resource": "r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::r::r::a::\"\"",
-      "action": "r::r::r::r::Action::\"\"",
-      "resource": "r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4282a992ca276f1e585951dff5ac730f8ffcbbd2.json b/cedar-integration-tests/corpus_tests/4282a992ca276f1e585951dff5ac730f8ffcbbd2.json
index d97fc3b5e..bfa6b8ee8 100644
--- a/cedar-integration-tests/corpus_tests/4282a992ca276f1e585951dff5ac730f8ffcbbd2.json
+++ b/cedar-integration-tests/corpus_tests/4282a992ca276f1e585951dff5ac730f8ffcbbd2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "CRRRRRRSxxx::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "CRRRRRRSxxx::\"\"",
+      "principal": {
+        "type": "CRRRRRRSxxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "CRRRRRRSxxx",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "O": false,
         "Z00cx": {
@@ -23,9 +32,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "CRRRRRRSxxx::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "CRRRRRRSxxx::\"\"",
+      "principal": {
+        "type": "CRRRRRRSxxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "CRRRRRRSxxx",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "O": false,
         "Z00cx": {
@@ -40,9 +58,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "CRRRRRRSxxx::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "CRRRRRRSxxx::\"\"",
+      "principal": {
+        "type": "CRRRRRRSxxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "CRRRRRRSxxx",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "O": false,
         "Z00cx": {
@@ -57,9 +84,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "CRRRRRRSxxx::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "CRRRRRRSxxx::\"\"",
+      "principal": {
+        "type": "CRRRRRRSxxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "CRRRRRRSxxx",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "O": false,
         "Z00cx": {
@@ -74,9 +110,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "CRRRRRRSxxx::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "CRRRRRRSxxx::\"\"",
+      "principal": {
+        "type": "CRRRRRRSxxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "CRRRRRRSxxx",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "O": false,
         "Z00cx": {
@@ -91,9 +136,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "CRRRRRRSxxx::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "CRRRRRRSxxx::\"\"",
+      "principal": {
+        "type": "CRRRRRRSxxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "CRRRRRRSxxx",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "O": false,
         "Z00cx": {
@@ -108,9 +162,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "CRRRRRRSxxx::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "CRRRRRRSxxx::\"\"",
+      "principal": {
+        "type": "CRRRRRRSxxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "CRRRRRRSxxx",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "O": false,
         "Z00cx": {
@@ -125,9 +188,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "CRRRRRRSxxx::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "CRRRRRRSxxx::\"\"",
+      "principal": {
+        "type": "CRRRRRRSxxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "CRRRRRRSxxx",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "O": false,
         "Z00cx": {
diff --git a/cedar-integration-tests/corpus_tests/42e29f7ee3baccbd111596405523cd365fd7a332.json b/cedar-integration-tests/corpus_tests/42e29f7ee3baccbd111596405523cd365fd7a332.json
index 412fda698..ef9a6a549 100644
--- a/cedar-integration-tests/corpus_tests/42e29f7ee3baccbd111596405523cd365fd7a332.json
+++ b/cedar-integration-tests/corpus_tests/42e29f7ee3baccbd111596405523cd365fd7a332.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/42e56b6e982653162a69d3c87fceb21f39ef6f74.json b/cedar-integration-tests/corpus_tests/42e56b6e982653162a69d3c87fceb21f39ef6f74.json
index 1504c1798..2661f70cd 100644
--- a/cedar-integration-tests/corpus_tests/42e56b6e982653162a69d3c87fceb21f39ef6f74.json
+++ b/cedar-integration-tests/corpus_tests/42e56b6e982653162a69d3c87fceb21f39ef6f74.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "mzzzzz0zwwwwwz::a::\"\"",
-      "action": "mzzzzz0zwwwwwz::Action::\"action\"",
-      "resource": "mzzzzz0zwwwwwz::a::\"\"",
+      "principal": {
+        "type": "mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzz0zwwwwwz::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "mzzzzz0zwwwwwz::a::\"\"",
-      "action": "mzzzzz0zwwwwwz::Action::\"action\"",
-      "resource": "mzzzzz0zwwwwwz::a::\"\"",
+      "principal": {
+        "type": "mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzz0zwwwwwz::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "mzzzzz0zwwwwwz::a::\"\"",
-      "action": "mzzzzz0zwwwwwz::Action::\"action\"",
-      "resource": "mzzzzz0zwwwwwz::a::\"\"",
+      "principal": {
+        "type": "mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzz0zwwwwwz::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "mzzzzz0zwwwwwz::a::\"\"",
-      "action": "mzzzzz0zwwwwwz::Action::\"action\"",
-      "resource": "mzzzzz0zwwwwwz::a::\"\"",
+      "principal": {
+        "type": "mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzz0zwwwwwz::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "mzzzzz0zwwwwwz::a::\"\"",
-      "action": "mzzzzz0zwwwwwz::Action::\"action\"",
-      "resource": "mzzzzz0zwwwwwz::a::\"\"",
+      "principal": {
+        "type": "mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzz0zwwwwwz::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "mzzzzz0zwwwwwz::a::\"\"",
-      "action": "mzzzzz0zwwwwwz::Action::\"action\"",
-      "resource": "mzzzzz0zwwwwwz::a::\"\"",
+      "principal": {
+        "type": "mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzz0zwwwwwz::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "mzzzzz0zwwwwwz::a::\"\"",
-      "action": "mzzzzz0zwwwwwz::Action::\"action\"",
-      "resource": "mzzzzz0zwwwwwz::a::\"\"",
+      "principal": {
+        "type": "mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzz0zwwwwwz::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "mzzzzz0zwwwwwz::a::\"\"",
-      "action": "mzzzzz0zwwwwwz::Action::\"action\"",
-      "resource": "mzzzzz0zwwwwwz::a::\"\"",
+      "principal": {
+        "type": "mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzz0zwwwwwz::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/42ed75aa47e6ff8463496a8af28b64f280165056.json b/cedar-integration-tests/corpus_tests/42ed75aa47e6ff8463496a8af28b64f280165056.json
index d1039ebba..a9d54a1fc 100644
--- a/cedar-integration-tests/corpus_tests/42ed75aa47e6ff8463496a8af28b64f280165056.json
+++ b/cedar-integration-tests/corpus_tests/42ed75aa47e6ff8463496a8af28b64f280165056.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/42f94343b4cf31a6b829959eee9a00f26622c9f6.json b/cedar-integration-tests/corpus_tests/42f94343b4cf31a6b829959eee9a00f26622c9f6.json
index 41adad20d..d18c99d16 100644
--- a/cedar-integration-tests/corpus_tests/42f94343b4cf31a6b829959eee9a00f26622c9f6.json
+++ b/cedar-integration-tests/corpus_tests/42f94343b4cf31a6b829959eee9a00f26622c9f6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/433f18cddaad9fb3bc84e5eb2f0128dc04a14939.json b/cedar-integration-tests/corpus_tests/433f18cddaad9fb3bc84e5eb2f0128dc04a14939.json
index 36b873b7d..fce86707a 100644
--- a/cedar-integration-tests/corpus_tests/433f18cddaad9fb3bc84e5eb2f0128dc04a14939.json
+++ b/cedar-integration-tests/corpus_tests/433f18cddaad9fb3bc84e5eb2f0128dc04a14939.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/438bf26e074c78254f9f05cdadc1e87b1c145a98.json b/cedar-integration-tests/corpus_tests/438bf26e074c78254f9f05cdadc1e87b1c145a98.json
index e8e185e28..de6dd7ed0 100644
--- a/cedar-integration-tests/corpus_tests/438bf26e074c78254f9f05cdadc1e87b1c145a98.json
+++ b/cedar-integration-tests/corpus_tests/438bf26e074c78254f9f05cdadc1e87b1c145a98.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/4398fb79db64ae19a222a5b4473fd1573a0f4c45.json b/cedar-integration-tests/corpus_tests/4398fb79db64ae19a222a5b4473fd1573a0f4c45.json
index dcd2fdd06..55e79e620 100644
--- a/cedar-integration-tests/corpus_tests/4398fb79db64ae19a222a5b4473fd1573a0f4c45.json
+++ b/cedar-integration-tests/corpus_tests/4398fb79db64ae19a222a5b4473fd1573a0f4c45.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/43a7346e3c33f5bfa1225277634c5d7d8272ec31.json b/cedar-integration-tests/corpus_tests/43a7346e3c33f5bfa1225277634c5d7d8272ec31.json
index 8bca7b4a9..c3115afda 100644
--- a/cedar-integration-tests/corpus_tests/43a7346e3c33f5bfa1225277634c5d7d8272ec31.json
+++ b/cedar-integration-tests/corpus_tests/43a7346e3c33f5bfa1225277634c5d7d8272ec31.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/43aff70f1e13f9c08aa33ae1b7987b641816ffd0.json b/cedar-integration-tests/corpus_tests/43aff70f1e13f9c08aa33ae1b7987b641816ffd0.json
index 6f0041fa9..120c82ca2 100644
--- a/cedar-integration-tests/corpus_tests/43aff70f1e13f9c08aa33ae1b7987b641816ffd0.json
+++ b/cedar-integration-tests/corpus_tests/43aff70f1e13f9c08aa33ae1b7987b641816ffd0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C": "",
         "QxH1": "",
@@ -24,9 +33,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C": "",
         "QxH1": "",
@@ -42,9 +60,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C": "",
         "QxH1": "",
@@ -60,9 +87,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C": "",
         "QxH1": "",
@@ -78,9 +114,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C": "",
         "QxH1": "",
@@ -96,9 +141,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C": "",
         "QxH1": "",
@@ -114,9 +168,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C": "",
         "QxH1": "",
@@ -132,9 +195,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C": "",
         "QxH1": "",
diff --git a/cedar-integration-tests/corpus_tests/442b4554c995e3a939dfb9c9a8c6dbecb8fa5688.json b/cedar-integration-tests/corpus_tests/442b4554c995e3a939dfb9c9a8c6dbecb8fa5688.json
index 65725b629..80a56743c 100644
--- a/cedar-integration-tests/corpus_tests/442b4554c995e3a939dfb9c9a8c6dbecb8fa5688.json
+++ b/cedar-integration-tests/corpus_tests/442b4554c995e3a939dfb9c9a8c6dbecb8fa5688.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "lz6D5zxyzzzzz": {
           "1": {
@@ -25,9 +34,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "lz6D5zxyzzzzz": {
           "1": {
@@ -44,9 +62,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "lz6D5zxyzzzzz": {
           "1": {
@@ -63,9 +90,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "lz6D5zxyzzzzz": {
           "1": {
@@ -82,9 +118,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "lz6D5zxyzzzzz": {
           "1": {
@@ -101,9 +146,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "lz6D5zxyzzzzz": {
           "1": {
@@ -120,9 +174,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "lz6D5zxyzzzzz": {
           "1": {
@@ -139,9 +202,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "lz6D5zxyzzzzz": {
           "1": {
diff --git a/cedar-integration-tests/corpus_tests/443a284848778e4b40c74fb093209b78e9eade2a.json b/cedar-integration-tests/corpus_tests/443a284848778e4b40c74fb093209b78e9eade2a.json
index b3d7f3e54..5dadb3cf3 100644
--- a/cedar-integration-tests/corpus_tests/443a284848778e4b40c74fb093209b78e9eade2a.json
+++ b/cedar-integration-tests/corpus_tests/443a284848778e4b40c74fb093209b78e9eade2a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/4442a82e7f7990680c87651d1aaa02d12d4cf237.json b/cedar-integration-tests/corpus_tests/4442a82e7f7990680c87651d1aaa02d12d4cf237.json
index d26300c6b..8d1897478 100644
--- a/cedar-integration-tests/corpus_tests/4442a82e7f7990680c87651d1aaa02d12d4cf237.json
+++ b/cedar-integration-tests/corpus_tests/4442a82e7f7990680c87651d1aaa02d12d4cf237.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::\"\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::r::\"\"",
+      "principal": {
+        "type": "r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::\"\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::r::\"\"",
+      "principal": {
+        "type": "r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::\"\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::r::\"\"",
+      "principal": {
+        "type": "r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::\"\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::r::\"\"",
+      "principal": {
+        "type": "r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::\"\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::r::\"\"",
+      "principal": {
+        "type": "r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::\"\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::r::\"\"",
+      "principal": {
+        "type": "r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::\"\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::r::\"\"",
+      "principal": {
+        "type": "r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::\"\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::r::\"\"",
+      "principal": {
+        "type": "r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4461c2fe905a94188504b0ee99a49459170ee478.json b/cedar-integration-tests/corpus_tests/4461c2fe905a94188504b0ee99a49459170ee478.json
index 6ca60aa0d..1152ce4e1 100644
--- a/cedar-integration-tests/corpus_tests/4461c2fe905a94188504b0ee99a49459170ee478.json
+++ b/cedar-integration-tests/corpus_tests/4461c2fe905a94188504b0ee99a49459170ee478.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/446b4abb9c1958bbf5ba0f8f19564ab82ab9cbed.json b/cedar-integration-tests/corpus_tests/446b4abb9c1958bbf5ba0f8f19564ab82ab9cbed.json
index 52fcd1f75..e442c5834 100644
--- a/cedar-integration-tests/corpus_tests/446b4abb9c1958bbf5ba0f8f19564ab82ab9cbed.json
+++ b/cedar-integration-tests/corpus_tests/446b4abb9c1958bbf5ba0f8f19564ab82ab9cbed.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/44a7ea864f87d288a04dccf9e5b193ec1bee64fd.json b/cedar-integration-tests/corpus_tests/44a7ea864f87d288a04dccf9e5b193ec1bee64fd.json
index 792ed994d..eb35f2a54 100644
--- a/cedar-integration-tests/corpus_tests/44a7ea864f87d288a04dccf9e5b193ec1bee64fd.json
+++ b/cedar-integration-tests/corpus_tests/44a7ea864f87d288a04dccf9e5b193ec1bee64fd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {
         "S": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{4}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0004"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{4}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0004"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{4}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0004"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{4}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0004"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{4}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0004"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{4}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0004"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{4}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0004"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/44d2138de0cacab9b03c955cc57d50a516fbf855.json b/cedar-integration-tests/corpus_tests/44d2138de0cacab9b03c955cc57d50a516fbf855.json
index 47b45cebc..926d308da 100644
--- a/cedar-integration-tests/corpus_tests/44d2138de0cacab9b03c955cc57d50a516fbf855.json
+++ b/cedar-integration-tests/corpus_tests/44d2138de0cacab9b03c955cc57d50a516fbf855.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"7\\u{1}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"7\\u{1}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "7\u0001\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "7\u0001\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "W": "neinfo/."
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"7\\u{1}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"7\\u{1}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "7\u0001\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "7\u0001\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "W": "neinfo/."
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"7\\u{1}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"7\\u{1}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "7\u0001\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "7\u0001\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "W": "neinfo/."
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"7\\u{1}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"7\\u{1}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "7\u0001\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "7\u0001\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "W": "neinfo/."
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"7\\u{1}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"7\\u{1}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "7\u0001\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "7\u0001\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "W": "neinfo/."
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"7\\u{1}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"7\\u{1}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "7\u0001\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "7\u0001\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "W": "neinfo/."
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"7\\u{1}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"7\\u{1}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "7\u0001\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "7\u0001\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "W": "neinfo/."
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"7\\u{1}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"7\\u{1}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "7\u0001\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "7\u0001\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "W": "neinfo/."
       },
diff --git a/cedar-integration-tests/corpus_tests/44d60048712580b0091ff28853c825c17b4996ad.json b/cedar-integration-tests/corpus_tests/44d60048712580b0091ff28853c825c17b4996ad.json
index dd03fa122..8d79a1951 100644
--- a/cedar-integration-tests/corpus_tests/44d60048712580b0091ff28853c825c17b4996ad.json
+++ b/cedar-integration-tests/corpus_tests/44d60048712580b0091ff28853c825c17b4996ad.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "R::\"\"",
-      "action": "Action::\"\\u{15}#\"",
-      "resource": "R::\"\"",
+      "principal": {
+        "type": "R",
+        "id": ""
+      },
+      "resource": {
+        "type": "R",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0015#"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "R::\"\"",
-      "action": "Action::\"\\u{15}#\"",
-      "resource": "R::\"\"",
+      "principal": {
+        "type": "R",
+        "id": ""
+      },
+      "resource": {
+        "type": "R",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0015#"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "R::\"\"",
-      "action": "Action::\"\\u{15}#\"",
-      "resource": "R::\"\"",
+      "principal": {
+        "type": "R",
+        "id": ""
+      },
+      "resource": {
+        "type": "R",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0015#"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "R::\"\"",
-      "action": "Action::\"\\u{15}#\"",
-      "resource": "R::\"\"",
+      "principal": {
+        "type": "R",
+        "id": ""
+      },
+      "resource": {
+        "type": "R",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0015#"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "R::\"\"",
-      "action": "Action::\"\\u{15}#\"",
-      "resource": "R::\"\"",
+      "principal": {
+        "type": "R",
+        "id": ""
+      },
+      "resource": {
+        "type": "R",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0015#"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "R::\"\"",
-      "action": "Action::\"\\u{15}#\"",
-      "resource": "R::\"\"",
+      "principal": {
+        "type": "R",
+        "id": ""
+      },
+      "resource": {
+        "type": "R",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0015#"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "R::\"\"",
-      "action": "Action::\"\\u{15}#\"",
-      "resource": "R::\"\"",
+      "principal": {
+        "type": "R",
+        "id": ""
+      },
+      "resource": {
+        "type": "R",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0015#"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "R::\"\"",
-      "action": "Action::\"\\u{15}#\"",
-      "resource": "R::\"\"",
+      "principal": {
+        "type": "R",
+        "id": ""
+      },
+      "resource": {
+        "type": "R",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0015#"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/44f3f0390a09debab2c1b5cddb98335b930d4ec1.json b/cedar-integration-tests/corpus_tests/44f3f0390a09debab2c1b5cddb98335b930d4ec1.json
index 1ee2619f5..27ea463f1 100644
--- a/cedar-integration-tests/corpus_tests/44f3f0390a09debab2c1b5cddb98335b930d4ec1.json
+++ b/cedar-integration-tests/corpus_tests/44f3f0390a09debab2c1b5cddb98335b930d4ec1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/44fbeb8dd922c2e9149a992a8f284d8fce8cd762.json b/cedar-integration-tests/corpus_tests/44fbeb8dd922c2e9149a992a8f284d8fce8cd762.json
index 6b5a947a4..4fcefe4d3 100644
--- a/cedar-integration-tests/corpus_tests/44fbeb8dd922c2e9149a992a8f284d8fce8cd762.json
+++ b/cedar-integration-tests/corpus_tests/44fbeb8dd922c2e9149a992a8f284d8fce8cd762.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\\n\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\\n\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/458d087908efdf7dbdc6f52607eba655bf5fddb2.json b/cedar-integration-tests/corpus_tests/458d087908efdf7dbdc6f52607eba655bf5fddb2.json
index 9075f860f..2280963b2 100644
--- a/cedar-integration-tests/corpus_tests/458d087908efdf7dbdc6f52607eba655bf5fddb2.json
+++ b/cedar-integration-tests/corpus_tests/458d087908efdf7dbdc6f52607eba655bf5fddb2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\";;\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ";;"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/45932df9e6afa436b8c177221426b97fa245df56.json b/cedar-integration-tests/corpus_tests/45932df9e6afa436b8c177221426b97fa245df56.json
index 9ca653dd1..91ac804bc 100644
--- a/cedar-integration-tests/corpus_tests/45932df9e6afa436b8c177221426b97fa245df56.json
+++ b/cedar-integration-tests/corpus_tests/45932df9e6afa436b8c177221426b97fa245df56.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "mzzzZzz0bYdlw::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzZzz0bYdlw::\"\"",
+      "principal": {
+        "type": "mzzzZzz0bYdlw",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzZzz0bYdlw",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzrzzzz00000": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "mzzzZzz0bYdlw::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzZzz0bYdlw::\"\"",
+      "principal": {
+        "type": "mzzzZzz0bYdlw",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzZzz0bYdlw",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzrzzzz00000": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "mzzzZzz0bYdlw::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzZzz0bYdlw::\"\"",
+      "principal": {
+        "type": "mzzzZzz0bYdlw",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzZzz0bYdlw",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzrzzzz00000": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "mzzzZzz0bYdlw::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzZzz0bYdlw::\"\"",
+      "principal": {
+        "type": "mzzzZzz0bYdlw",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzZzz0bYdlw",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzrzzzz00000": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "mzzzZzz0bYdlw::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzZzz0bYdlw::\"\"",
+      "principal": {
+        "type": "mzzzZzz0bYdlw",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzZzz0bYdlw",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzrzzzz00000": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "mzzzZzz0bYdlw::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzZzz0bYdlw::\"\"",
+      "principal": {
+        "type": "mzzzZzz0bYdlw",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzZzz0bYdlw",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzrzzzz00000": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "mzzzZzz0bYdlw::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzZzz0bYdlw::\"\"",
+      "principal": {
+        "type": "mzzzZzz0bYdlw",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzZzz0bYdlw",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzrzzzz00000": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "mzzzZzz0bYdlw::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzZzz0bYdlw::\"\"",
+      "principal": {
+        "type": "mzzzZzz0bYdlw",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzZzz0bYdlw",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzrzzzz00000": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/45cd88e70a9eeda25ce3c6c80ad221cb2ce5517c.json b/cedar-integration-tests/corpus_tests/45cd88e70a9eeda25ce3c6c80ad221cb2ce5517c.json
index 072d460cb..97b6ace0a 100644
--- a/cedar-integration-tests/corpus_tests/45cd88e70a9eeda25ce3c6c80ad221cb2ce5517c.json
+++ b/cedar-integration-tests/corpus_tests/45cd88e70a9eeda25ce3c6c80ad221cb2ce5517c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/461756b231a1a31d21cebbab1d767706e6e1af87.json b/cedar-integration-tests/corpus_tests/461756b231a1a31d21cebbab1d767706e6e1af87.json
index 82fe5ee69..8865fb1f0 100644
--- a/cedar-integration-tests/corpus_tests/461756b231a1a31d21cebbab1d767706e6e1af87.json
+++ b/cedar-integration-tests/corpus_tests/461756b231a1a31d21cebbab1d767706e6e1af87.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Kfhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Kfhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Kfhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Kfhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Kfhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Kfhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Kfhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Kfhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/464729a46d258bcaaf394e5c69445e2c3eb2cfd7.json b/cedar-integration-tests/corpus_tests/464729a46d258bcaaf394e5c69445e2c3eb2cfd7.json
index dd739467f..2d530f0cf 100644
--- a/cedar-integration-tests/corpus_tests/464729a46d258bcaaf394e5c69445e2c3eb2cfd7.json
+++ b/cedar-integration-tests/corpus_tests/464729a46d258bcaaf394e5c69445e2c3eb2cfd7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/46ccfc10ef864cc7f8c6e7d67036c8c1781844ad.json b/cedar-integration-tests/corpus_tests/46ccfc10ef864cc7f8c6e7d67036c8c1781844ad.json
index d8e3eca89..a9c9e6a47 100644
--- a/cedar-integration-tests/corpus_tests/46ccfc10ef864cc7f8c6e7d67036c8c1781844ad.json
+++ b/cedar-integration-tests/corpus_tests/46ccfc10ef864cc7f8c6e7d67036c8c1781844ad.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "`"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/46f466ac9e298b4a1a776d92ab79d7cb0d2a8f7c.json b/cedar-integration-tests/corpus_tests/46f466ac9e298b4a1a776d92ab79d7cb0d2a8f7c.json
index 6bfb3861d..09c088bf8 100644
--- a/cedar-integration-tests/corpus_tests/46f466ac9e298b4a1a776d92ab79d7cb0d2a8f7c.json
+++ b/cedar-integration-tests/corpus_tests/46f466ac9e298b4a1a776d92ab79d7cb0d2a8f7c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/474a6da426a0a138877cfd664d06efd6966c0d7d.json b/cedar-integration-tests/corpus_tests/474a6da426a0a138877cfd664d06efd6966c0d7d.json
index 91ed9611e..5cc5cf5bd 100644
--- a/cedar-integration-tests/corpus_tests/474a6da426a0a138877cfd664d06efd6966c0d7d.json
+++ b/cedar-integration-tests/corpus_tests/474a6da426a0a138877cfd664d06efd6966c0d7d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::G::r::r::\"\"",
-      "action": "r::r::G::r::Action::\"action\"",
-      "resource": "r::r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::r::G::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::G::r::r::\"\"",
-      "action": "r::r::G::r::Action::\"action\"",
-      "resource": "r::r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::r::G::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::G::r::r::\"\"",
-      "action": "r::r::G::r::Action::\"action\"",
-      "resource": "r::r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::r::G::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::G::r::r::\"\"",
-      "action": "r::r::G::r::Action::\"action\"",
-      "resource": "r::r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::r::G::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::G::r::r::\"\"",
-      "action": "r::r::G::r::Action::\"action\"",
-      "resource": "r::r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::r::G::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::G::r::r::\"\"",
-      "action": "r::r::G::r::Action::\"action\"",
-      "resource": "r::r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::r::G::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::G::r::r::\"\"",
-      "action": "r::r::G::r::Action::\"action\"",
-      "resource": "r::r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::r::G::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::G::r::r::\"\"",
-      "action": "r::r::G::r::Action::\"action\"",
-      "resource": "r::r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::r::G::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/47735d3eab0f3053c4da1e7a75abb6d7c72281d6.json b/cedar-integration-tests/corpus_tests/47735d3eab0f3053c4da1e7a75abb6d7c72281d6.json
index 9d0394f98..6b4c09c2f 100644
--- a/cedar-integration-tests/corpus_tests/47735d3eab0f3053c4da1e7a75abb6d7c72281d6.json
+++ b/cedar-integration-tests/corpus_tests/47735d3eab0f3053c4da1e7a75abb6d7c72281d6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/47dbe8f3bf73363d3c54f85eaacb8e4cf09e4851.json b/cedar-integration-tests/corpus_tests/47dbe8f3bf73363d3c54f85eaacb8e4cf09e4851.json
index 292331299..4398c03c1 100644
--- a/cedar-integration-tests/corpus_tests/47dbe8f3bf73363d3c54f85eaacb8e4cf09e4851.json
+++ b/cedar-integration-tests/corpus_tests/47dbe8f3bf73363d3c54f85eaacb8e4cf09e4851.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::r::P::r::a::\"\"",
-      "action": "r::r::r::P::r::Action::\"0\"",
-      "resource": "r::r::r::P::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::P::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::P::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::P::r::Action",
+        "id": "0"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::r::P::r::a::\"\"",
-      "action": "r::r::r::P::r::Action::\"0\"",
-      "resource": "r::r::r::P::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::P::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::P::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::P::r::Action",
+        "id": "0"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::r::P::r::a::\"\"",
-      "action": "r::r::r::P::r::Action::\"0\"",
-      "resource": "r::r::r::P::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::P::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::P::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::P::r::Action",
+        "id": "0"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::r::P::r::a::\"\"",
-      "action": "r::r::r::P::r::Action::\"0\"",
-      "resource": "r::r::r::P::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::P::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::P::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::P::r::Action",
+        "id": "0"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::r::P::r::a::\"\"",
-      "action": "r::r::r::P::r::Action::\"0\"",
-      "resource": "r::r::r::P::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::P::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::P::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::P::r::Action",
+        "id": "0"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::r::P::r::a::\"\"",
-      "action": "r::r::r::P::r::Action::\"0\"",
-      "resource": "r::r::r::P::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::P::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::P::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::P::r::Action",
+        "id": "0"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::r::P::r::a::\"\"",
-      "action": "r::r::r::P::r::Action::\"0\"",
-      "resource": "r::r::r::P::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::P::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::P::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::P::r::Action",
+        "id": "0"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::r::P::r::a::\"\"",
-      "action": "r::r::r::P::r::Action::\"0\"",
-      "resource": "r::r::r::P::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::P::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::P::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::P::r::Action",
+        "id": "0"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/47f7c26628392440b88712bd642da9881e829fd1.json b/cedar-integration-tests/corpus_tests/47f7c26628392440b88712bd642da9881e829fd1.json
index 44b9400ab..ebb15ce6a 100644
--- a/cedar-integration-tests/corpus_tests/47f7c26628392440b88712bd642da9881e829fd1.json
+++ b/cedar-integration-tests/corpus_tests/47f7c26628392440b88712bd642da9881e829fd1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "__entity": {
@@ -25,9 +34,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "__entity": {
@@ -44,9 +62,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "__entity": {
@@ -63,9 +90,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "__entity": {
@@ -82,9 +118,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "__entity": {
@@ -101,9 +146,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "__entity": {
@@ -120,9 +174,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "__entity": {
@@ -139,9 +202,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "__entity": {
diff --git a/cedar-integration-tests/corpus_tests/48154a223eea1a1e5ae5334c1a5e784459d02001.json b/cedar-integration-tests/corpus_tests/48154a223eea1a1e5ae5334c1a5e784459d02001.json
index 3c07a1027..ab8a844f9 100644
--- a/cedar-integration-tests/corpus_tests/48154a223eea1a1e5ae5334c1a5e784459d02001.json
+++ b/cedar-integration-tests/corpus_tests/48154a223eea1a1e5ae5334c1a5e784459d02001.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "zxxjjjjjj::Gxtxxxx9x::a::\"\"",
-      "action": "zxxjjjjjj::Gxtxxxx9x::Action::\"action\"",
-      "resource": "zxxjjjjjj::Gxtxxxx9x::a::\"\"",
+      "principal": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::a",
+        "id": ""
+      },
+      "action": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::Action",
+        "id": "action"
+      },
       "context": {
         "Wxt70000000000": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "zxxjjjjjj::Gxtxxxx9x::a::\"\"",
-      "action": "zxxjjjjjj::Gxtxxxx9x::Action::\"action\"",
-      "resource": "zxxjjjjjj::Gxtxxxx9x::a::\"\"",
+      "principal": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::a",
+        "id": ""
+      },
+      "action": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::Action",
+        "id": "action"
+      },
       "context": {
         "Wxt70000000000": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "zxxjjjjjj::Gxtxxxx9x::a::\"\"",
-      "action": "zxxjjjjjj::Gxtxxxx9x::Action::\"action\"",
-      "resource": "zxxjjjjjj::Gxtxxxx9x::a::\"\"",
+      "principal": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::a",
+        "id": ""
+      },
+      "action": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::Action",
+        "id": "action"
+      },
       "context": {
         "Wxt70000000000": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "zxxjjjjjj::Gxtxxxx9x::a::\"\"",
-      "action": "zxxjjjjjj::Gxtxxxx9x::Action::\"action\"",
-      "resource": "zxxjjjjjj::Gxtxxxx9x::a::\"\"",
+      "principal": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::a",
+        "id": ""
+      },
+      "action": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::Action",
+        "id": "action"
+      },
       "context": {
         "Wxt70000000000": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "zxxjjjjjj::Gxtxxxx9x::a::\"\"",
-      "action": "zxxjjjjjj::Gxtxxxx9x::Action::\"action\"",
-      "resource": "zxxjjjjjj::Gxtxxxx9x::a::\"\"",
+      "principal": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::a",
+        "id": ""
+      },
+      "action": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::Action",
+        "id": "action"
+      },
       "context": {
         "Wxt70000000000": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "zxxjjjjjj::Gxtxxxx9x::a::\"\"",
-      "action": "zxxjjjjjj::Gxtxxxx9x::Action::\"action\"",
-      "resource": "zxxjjjjjj::Gxtxxxx9x::a::\"\"",
+      "principal": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::a",
+        "id": ""
+      },
+      "action": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::Action",
+        "id": "action"
+      },
       "context": {
         "Wxt70000000000": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "zxxjjjjjj::Gxtxxxx9x::a::\"\"",
-      "action": "zxxjjjjjj::Gxtxxxx9x::Action::\"action\"",
-      "resource": "zxxjjjjjj::Gxtxxxx9x::a::\"\"",
+      "principal": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::a",
+        "id": ""
+      },
+      "action": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::Action",
+        "id": "action"
+      },
       "context": {
         "Wxt70000000000": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "zxxjjjjjj::Gxtxxxx9x::a::\"\"",
-      "action": "zxxjjjjjj::Gxtxxxx9x::Action::\"action\"",
-      "resource": "zxxjjjjjj::Gxtxxxx9x::a::\"\"",
+      "principal": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::a",
+        "id": ""
+      },
+      "action": {
+        "type": "zxxjjjjjj::Gxtxxxx9x::Action",
+        "id": "action"
+      },
       "context": {
         "Wxt70000000000": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/48189024d3b0ea460b729fe30f9613cb1f87fe0d.json b/cedar-integration-tests/corpus_tests/48189024d3b0ea460b729fe30f9613cb1f87fe0d.json
index e5b35c0d9..ab204a41a 100644
--- a/cedar-integration-tests/corpus_tests/48189024d3b0ea460b729fe30f9613cb1f87fe0d.json
+++ b/cedar-integration-tests/corpus_tests/48189024d3b0ea460b729fe30f9613cb1f87fe0d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "N8xp37x77::a::\"\"",
-      "action": "N8xp37x77::Action::\"action\"",
-      "resource": "N8xp37x77::a::\"\"",
+      "principal": {
+        "type": "N8xp37x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "N8xp37x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "N8xp37x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "N8xp37x77::a::\"\"",
-      "action": "N8xp37x77::Action::\"action\"",
-      "resource": "N8xp37x77::a::\"\"",
+      "principal": {
+        "type": "N8xp37x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "N8xp37x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "N8xp37x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "N8xp37x77::a::\"\"",
-      "action": "N8xp37x77::Action::\"action\"",
-      "resource": "N8xp37x77::a::\"\"",
+      "principal": {
+        "type": "N8xp37x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "N8xp37x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "N8xp37x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "N8xp37x77::a::\"\"",
-      "action": "N8xp37x77::Action::\"action\"",
-      "resource": "N8xp37x77::a::\"\"",
+      "principal": {
+        "type": "N8xp37x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "N8xp37x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "N8xp37x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "N8xp37x77::a::\"\"",
-      "action": "N8xp37x77::Action::\"action\"",
-      "resource": "N8xp37x77::a::\"\"",
+      "principal": {
+        "type": "N8xp37x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "N8xp37x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "N8xp37x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "N8xp37x77::a::\"\"",
-      "action": "N8xp37x77::Action::\"action\"",
-      "resource": "N8xp37x77::a::\"\"",
+      "principal": {
+        "type": "N8xp37x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "N8xp37x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "N8xp37x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "N8xp37x77::a::\"\"",
-      "action": "N8xp37x77::Action::\"action\"",
-      "resource": "N8xp37x77::a::\"\"",
+      "principal": {
+        "type": "N8xp37x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "N8xp37x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "N8xp37x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "N8xp37x77::a::\"\"",
-      "action": "N8xp37x77::Action::\"action\"",
-      "resource": "N8xp37x77::a::\"\"",
+      "principal": {
+        "type": "N8xp37x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "N8xp37x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "N8xp37x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/494fb82ef63f92808034c17256f9be78161b84d0.json b/cedar-integration-tests/corpus_tests/494fb82ef63f92808034c17256f9be78161b84d0.json
index 323bcc542..830ede836 100644
--- a/cedar-integration-tests/corpus_tests/494fb82ef63f92808034c17256f9be78161b84d0.json
+++ b/cedar-integration-tests/corpus_tests/494fb82ef63f92808034c17256f9be78161b84d0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"jj\\0\\0\\0\\0\\u{1}L\\0\\0\\0\\0ja\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"jj\\0\\0\\0\\0\\u{1}L\\0\\0\\0\\0ja\"",
+      "principal": {
+        "type": "a",
+        "id": "jj\u0000\u0000\u0000\u0000\u0001L\u0000\u0000\u0000\u0000ja"
+      },
+      "resource": {
+        "type": "a",
+        "id": "jj\u0000\u0000\u0000\u0000\u0001L\u0000\u0000\u0000\u0000ja"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"jj\\0\\0\\0\\0\\u{1}L\\0\\0\\0\\0ja\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"jj\\0\\0\\0\\0\\u{1}L\\0\\0\\0\\0ja\"",
+      "principal": {
+        "type": "a",
+        "id": "jj\u0000\u0000\u0000\u0000\u0001L\u0000\u0000\u0000\u0000ja"
+      },
+      "resource": {
+        "type": "a",
+        "id": "jj\u0000\u0000\u0000\u0000\u0001L\u0000\u0000\u0000\u0000ja"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"jj\\0\\0\\0\\0\\u{1}L\\0\\0\\0\\0ja\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"jj\\0\\0\\0\\0\\u{1}L\\0\\0\\0\\0ja\"",
+      "principal": {
+        "type": "a",
+        "id": "jj\u0000\u0000\u0000\u0000\u0001L\u0000\u0000\u0000\u0000ja"
+      },
+      "resource": {
+        "type": "a",
+        "id": "jj\u0000\u0000\u0000\u0000\u0001L\u0000\u0000\u0000\u0000ja"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"jj\\0\\0\\0\\0\\u{1}L\\0\\0\\0\\0ja\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"jj\\0\\0\\0\\0\\u{1}L\\0\\0\\0\\0ja\"",
+      "principal": {
+        "type": "a",
+        "id": "jj\u0000\u0000\u0000\u0000\u0001L\u0000\u0000\u0000\u0000ja"
+      },
+      "resource": {
+        "type": "a",
+        "id": "jj\u0000\u0000\u0000\u0000\u0001L\u0000\u0000\u0000\u0000ja"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"jj\\0\\0\\0\\0\\u{1}L\\0\\0\\0\\0ja\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"jj\\0\\0\\0\\0\\u{1}L\\0\\0\\0\\0ja\"",
+      "principal": {
+        "type": "a",
+        "id": "jj\u0000\u0000\u0000\u0000\u0001L\u0000\u0000\u0000\u0000ja"
+      },
+      "resource": {
+        "type": "a",
+        "id": "jj\u0000\u0000\u0000\u0000\u0001L\u0000\u0000\u0000\u0000ja"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"jj\\0\\0\\0\\0\\u{1}L\\0\\0\\0\\0ja\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"jj\\0\\0\\0\\0\\u{1}L\\0\\0\\0\\0ja\"",
+      "principal": {
+        "type": "a",
+        "id": "jj\u0000\u0000\u0000\u0000\u0001L\u0000\u0000\u0000\u0000ja"
+      },
+      "resource": {
+        "type": "a",
+        "id": "jj\u0000\u0000\u0000\u0000\u0001L\u0000\u0000\u0000\u0000ja"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"jj\\0\\0\\0\\0\\u{1}L\\0\\0\\0\\0ja\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"jj\\0\\0\\0\\0\\u{1}L\\0\\0\\0\\0ja\"",
+      "principal": {
+        "type": "a",
+        "id": "jj\u0000\u0000\u0000\u0000\u0001L\u0000\u0000\u0000\u0000ja"
+      },
+      "resource": {
+        "type": "a",
+        "id": "jj\u0000\u0000\u0000\u0000\u0001L\u0000\u0000\u0000\u0000ja"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"jj\\0\\0\\0\\0\\u{1}L\\0\\0\\0\\0ja\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"jj\\0\\0\\0\\0\\u{1}L\\0\\0\\0\\0ja\"",
+      "principal": {
+        "type": "a",
+        "id": "jj\u0000\u0000\u0000\u0000\u0001L\u0000\u0000\u0000\u0000ja"
+      },
+      "resource": {
+        "type": "a",
+        "id": "jj\u0000\u0000\u0000\u0000\u0001L\u0000\u0000\u0000\u0000ja"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4960126cc1c3cb0023a576d6f726f19f667b4144.json b/cedar-integration-tests/corpus_tests/4960126cc1c3cb0023a576d6f726f19f667b4144.json
index 144671258..68c4c9f03 100644
--- a/cedar-integration-tests/corpus_tests/4960126cc1c3cb0023a576d6f726f19f667b4144.json
+++ b/cedar-integration-tests/corpus_tests/4960126cc1c3cb0023a576d6f726f19f667b4144.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/4968fad648bcffd3a08423cb89c1886b668ed9ed.json b/cedar-integration-tests/corpus_tests/4968fad648bcffd3a08423cb89c1886b668ed9ed.json
index cd614cd98..a7b73ba0e 100644
--- a/cedar-integration-tests/corpus_tests/4968fad648bcffd3a08423cb89c1886b668ed9ed.json
+++ b/cedar-integration-tests/corpus_tests/4968fad648bcffd3a08423cb89c1886b668ed9ed.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"2\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "2"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"2\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"2\"",
+      "principal": {
+        "type": "a",
+        "id": "2"
+      },
+      "resource": {
+        "type": "a",
+        "id": "2"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"2\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"2\"",
+      "principal": {
+        "type": "a",
+        "id": "2"
+      },
+      "resource": {
+        "type": "a",
+        "id": "2"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"2\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"2\"",
+      "principal": {
+        "type": "a",
+        "id": "2"
+      },
+      "resource": {
+        "type": "a",
+        "id": "2"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"2\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"2\"",
+      "principal": {
+        "type": "a",
+        "id": "2"
+      },
+      "resource": {
+        "type": "a",
+        "id": "2"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"2\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"2\"",
+      "principal": {
+        "type": "a",
+        "id": "2"
+      },
+      "resource": {
+        "type": "a",
+        "id": "2"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"2\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"2\"",
+      "principal": {
+        "type": "a",
+        "id": "2"
+      },
+      "resource": {
+        "type": "a",
+        "id": "2"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"2\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"2\"",
+      "principal": {
+        "type": "a",
+        "id": "2"
+      },
+      "resource": {
+        "type": "a",
+        "id": "2"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/496919dff0ea2935085baf1d32dfac599df26619.json b/cedar-integration-tests/corpus_tests/496919dff0ea2935085baf1d32dfac599df26619.json
index 287c98131..164839ab0 100644
--- a/cedar-integration-tests/corpus_tests/496919dff0ea2935085baf1d32dfac599df26619.json
+++ b/cedar-integration-tests/corpus_tests/496919dff0ea2935085baf1d32dfac599df26619.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/49769b289305dae08c5fd44c2e8f9806b012993b.json b/cedar-integration-tests/corpus_tests/49769b289305dae08c5fd44c2e8f9806b012993b.json
index 060f8bbb1..80c6eb548 100644
--- a/cedar-integration-tests/corpus_tests/49769b289305dae08c5fd44c2e8f9806b012993b.json
+++ b/cedar-integration-tests/corpus_tests/49769b289305dae08c5fd44c2e8f9806b012993b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/498782a089afb0b73e45ba4b1c0697f8bad28ed7.json b/cedar-integration-tests/corpus_tests/498782a089afb0b73e45ba4b1c0697f8bad28ed7.json
index 5dfaa841b..7d50489c3 100644
--- a/cedar-integration-tests/corpus_tests/498782a089afb0b73e45ba4b1c0697f8bad28ed7.json
+++ b/cedar-integration-tests/corpus_tests/498782a089afb0b73e45ba4b1c0697f8bad28ed7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"0\\u{1}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\\u{1}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "0\u0001\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0\u0001\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"0\\u{1}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\\u{1}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "0\u0001\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0\u0001\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"0\\u{1}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\\u{1}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "0\u0001\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0\u0001\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\\u{1}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "0\u0001\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"0\\u{1}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\\u{1}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "0\u0001\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0\u0001\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"0\\u{1}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\\u{1}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "0\u0001\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0\u0001\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"0\\u{1}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\\u{1}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "0\u0001\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0\u0001\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"0\\u{1}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\\u{1}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "0\u0001\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0\u0001\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/49aeadff64691c2fabe84335637947046a07af31.json b/cedar-integration-tests/corpus_tests/49aeadff64691c2fabe84335637947046a07af31.json
index a3e6b02cc..8275c3107 100644
--- a/cedar-integration-tests/corpus_tests/49aeadff64691c2fabe84335637947046a07af31.json
+++ b/cedar-integration-tests/corpus_tests/49aeadff64691c2fabe84335637947046a07af31.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "J::a::\"600\"",
-      "action": "J::Action::\"action\"",
-      "resource": "J::a::\"600\"",
+      "principal": {
+        "type": "J::a",
+        "id": "600"
+      },
+      "resource": {
+        "type": "J::a",
+        "id": "600"
+      },
+      "action": {
+        "type": "J::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "J::a::\"600\"",
-      "action": "J::Action::\"action\"",
-      "resource": "J::a::\"600\"",
+      "principal": {
+        "type": "J::a",
+        "id": "600"
+      },
+      "resource": {
+        "type": "J::a",
+        "id": "600"
+      },
+      "action": {
+        "type": "J::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "J::a::\"600\"",
-      "action": "J::Action::\"action\"",
-      "resource": "J::a::\"600\"",
+      "principal": {
+        "type": "J::a",
+        "id": "600"
+      },
+      "resource": {
+        "type": "J::a",
+        "id": "600"
+      },
+      "action": {
+        "type": "J::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "J::a::\"600\"",
-      "action": "J::Action::\"action\"",
-      "resource": "J::a::\"600\"",
+      "principal": {
+        "type": "J::a",
+        "id": "600"
+      },
+      "resource": {
+        "type": "J::a",
+        "id": "600"
+      },
+      "action": {
+        "type": "J::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "J::a::\"600\"",
-      "action": "J::Action::\"action\"",
-      "resource": "J::a::\"600\"",
+      "principal": {
+        "type": "J::a",
+        "id": "600"
+      },
+      "resource": {
+        "type": "J::a",
+        "id": "600"
+      },
+      "action": {
+        "type": "J::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "J::a::\"600\"",
-      "action": "J::Action::\"action\"",
-      "resource": "J::a::\"600\"",
+      "principal": {
+        "type": "J::a",
+        "id": "600"
+      },
+      "resource": {
+        "type": "J::a",
+        "id": "600"
+      },
+      "action": {
+        "type": "J::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "J::a::\"600\"",
-      "action": "J::Action::\"action\"",
-      "resource": "J::a::\"600\"",
+      "principal": {
+        "type": "J::a",
+        "id": "600"
+      },
+      "resource": {
+        "type": "J::a",
+        "id": "600"
+      },
+      "action": {
+        "type": "J::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "J::a::\"600\"",
-      "action": "J::Action::\"action\"",
-      "resource": "J::a::\"600\"",
+      "principal": {
+        "type": "J::a",
+        "id": "600"
+      },
+      "resource": {
+        "type": "J::a",
+        "id": "600"
+      },
+      "action": {
+        "type": "J::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/49ba0880e8c4d426ccde9f64911d1dfbaa51fe9e.json b/cedar-integration-tests/corpus_tests/49ba0880e8c4d426ccde9f64911d1dfbaa51fe9e.json
index f70a9cb1f..f8c0daf14 100644
--- a/cedar-integration-tests/corpus_tests/49ba0880e8c4d426ccde9f64911d1dfbaa51fe9e.json
+++ b/cedar-integration-tests/corpus_tests/49ba0880e8c4d426ccde9f64911d1dfbaa51fe9e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::a::\"\\0\\u{7}2\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0000\u00072"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/49f2b384a40672e51691593bab92fcb170160508.json b/cedar-integration-tests/corpus_tests/49f2b384a40672e51691593bab92fcb170160508.json
index 7c2c39e7e..b1d720b25 100644
--- a/cedar-integration-tests/corpus_tests/49f2b384a40672e51691593bab92fcb170160508.json
+++ b/cedar-integration-tests/corpus_tests/49f2b384a40672e51691593bab92fcb170160508.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "W::A::v::a::\"\"",
-      "action": "W::A::v::Action::\"action\"",
-      "resource": "W::A::v::a::\"\"",
+      "principal": {
+        "type": "W::A::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::A::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::A::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "W::A::v::a::\"\"",
-      "action": "W::A::v::Action::\"action\"",
-      "resource": "W::A::v::a::\"\"",
+      "principal": {
+        "type": "W::A::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::A::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::A::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "W::A::v::a::\"\"",
-      "action": "W::A::v::Action::\"action\"",
-      "resource": "W::A::v::a::\"\"",
+      "principal": {
+        "type": "W::A::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::A::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::A::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "W::A::v::a::\"\"",
-      "action": "W::A::v::Action::\"action\"",
-      "resource": "W::A::v::a::\"\"",
+      "principal": {
+        "type": "W::A::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::A::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::A::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "W::A::v::a::\"\"",
-      "action": "W::A::v::Action::\"action\"",
-      "resource": "W::A::v::a::\"\"",
+      "principal": {
+        "type": "W::A::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::A::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::A::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "W::A::v::a::\"\"",
-      "action": "W::A::v::Action::\"action\"",
-      "resource": "W::A::v::a::\"\"",
+      "principal": {
+        "type": "W::A::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::A::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::A::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "W::A::v::a::\"\"",
-      "action": "W::A::v::Action::\"action\"",
-      "resource": "W::A::v::a::\"\"",
+      "principal": {
+        "type": "W::A::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::A::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::A::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "W::A::v::a::\"\"",
-      "action": "W::A::v::Action::\"action\"",
-      "resource": "W::A::v::a::\"\"",
+      "principal": {
+        "type": "W::A::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::A::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::A::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/49fb64b3377b5f4f87acd0a3462b36d964b2b87a.json b/cedar-integration-tests/corpus_tests/49fb64b3377b5f4f87acd0a3462b36d964b2b87a.json
index e5f3191d0..21f55a115 100644
--- a/cedar-integration-tests/corpus_tests/49fb64b3377b5f4f87acd0a3462b36d964b2b87a.json
+++ b/cedar-integration-tests/corpus_tests/49fb64b3377b5f4f87acd0a3462b36d964b2b87a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"+\\0\\0\\0\\0\\0\\0\\0\\0da\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\0\\0\\0\\0\\0\\0\\0\\0da\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000da\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000da\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4a04c388b3a3b16748e1a87b5370cd7e4e1b21c2.json b/cedar-integration-tests/corpus_tests/4a04c388b3a3b16748e1a87b5370cd7e4e1b21c2.json
index b3705c71a..4d3f36969 100644
--- a/cedar-integration-tests/corpus_tests/4a04c388b3a3b16748e1a87b5370cd7e4e1b21c2.json
+++ b/cedar-integration-tests/corpus_tests/4a04c388b3a3b16748e1a87b5370cd7e4e1b21c2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "xl0dddddd::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xl0dddddd::\"\"",
+      "principal": {
+        "type": "xl0dddddd",
+        "id": ""
+      },
+      "resource": {
+        "type": "xl0dddddd",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "xl0dddddd::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xl0dddddd::\"\"",
+      "principal": {
+        "type": "xl0dddddd",
+        "id": ""
+      },
+      "resource": {
+        "type": "xl0dddddd",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "xl0dddddd::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xl0dddddd::\"\"",
+      "principal": {
+        "type": "xl0dddddd",
+        "id": ""
+      },
+      "resource": {
+        "type": "xl0dddddd",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "xl0dddddd::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xl0dddddd::\"\"",
+      "principal": {
+        "type": "xl0dddddd",
+        "id": ""
+      },
+      "resource": {
+        "type": "xl0dddddd",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "xl0dddddd::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xl0dddddd::\"\"",
+      "principal": {
+        "type": "xl0dddddd",
+        "id": ""
+      },
+      "resource": {
+        "type": "xl0dddddd",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "xl0dddddd::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xl0dddddd::\"\"",
+      "principal": {
+        "type": "xl0dddddd",
+        "id": ""
+      },
+      "resource": {
+        "type": "xl0dddddd",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "xl0dddddd::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xl0dddddd::\"\"",
+      "principal": {
+        "type": "xl0dddddd",
+        "id": ""
+      },
+      "resource": {
+        "type": "xl0dddddd",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "xl0dddddd::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xl0dddddd::\"\"",
+      "principal": {
+        "type": "xl0dddddd",
+        "id": ""
+      },
+      "resource": {
+        "type": "xl0dddddd",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4a1ccee551b4da9723f0bd925c0e6ba122edc2c1.json b/cedar-integration-tests/corpus_tests/4a1ccee551b4da9723f0bd925c0e6ba122edc2c1.json
index f884ed83b..89edc587b 100644
--- a/cedar-integration-tests/corpus_tests/4a1ccee551b4da9723f0bd925c0e6ba122edc2c1.json
+++ b/cedar-integration-tests/corpus_tests/4a1ccee551b4da9723f0bd925c0e6ba122edc2c1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"zzzz3\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"텅\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzz3"
+      },
+      "resource": {
+        "type": "a",
+        "id": "텅"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"zzzz3\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzz3\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzz3"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzz3"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"zzzz3\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzz3\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzz3"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzz3"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"zzzz3\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzz3\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzz3"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzz3"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"zzzz3\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzz3\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzz3"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzz3"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"zzzz3\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzz3\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzz3"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzz3"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"zzzz3\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzz3\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzz3"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzz3"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"zzzz3\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzz3\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzz3"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzz3"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4a333235e53c66d03ea15afcd6c3e07770e60d96.json b/cedar-integration-tests/corpus_tests/4a333235e53c66d03ea15afcd6c3e07770e60d96.json
index eff9cff87..bea9e1565 100644
--- a/cedar-integration-tests/corpus_tests/4a333235e53c66d03ea15afcd6c3e07770e60d96.json
+++ b/cedar-integration-tests/corpus_tests/4a333235e53c66d03ea15afcd6c3e07770e60d96.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"[$\\0\\0\\0b\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "[$\u0000\u0000\u0000b"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4a56e5dfaf0885bd803a65751e7d6e4df70b5428.json b/cedar-integration-tests/corpus_tests/4a56e5dfaf0885bd803a65751e7d6e4df70b5428.json
index d603d5679..1c2ed05a8 100644
--- a/cedar-integration-tests/corpus_tests/4a56e5dfaf0885bd803a65751e7d6e4df70b5428.json
+++ b/cedar-integration-tests/corpus_tests/4a56e5dfaf0885bd803a65751e7d6e4df70b5428.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"::\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"::\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"::\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"::\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"::\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"::\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"::\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"::\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4a5b990163e9e5713bcaaf635d3556508760cced.json b/cedar-integration-tests/corpus_tests/4a5b990163e9e5713bcaaf635d3556508760cced.json
index eab2958bc..34d178cd0 100644
--- a/cedar-integration-tests/corpus_tests/4a5b990163e9e5713bcaaf635d3556508760cced.json
+++ b/cedar-integration-tests/corpus_tests/4a5b990163e9e5713bcaaf635d3556508760cced.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "o": 49,
         "r": 0
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "o": 0,
         "r": 0
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "o": 0,
         "r": 0
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "o": 0,
         "r": 0
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "o": 0,
         "r": 0
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "o": 0,
         "r": 0
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "o": 0,
         "r": 0
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "o": 0,
         "r": 0
diff --git a/cedar-integration-tests/corpus_tests/4a8354f596e7d0e151a5ae9e566ceb2b34bf1fda.json b/cedar-integration-tests/corpus_tests/4a8354f596e7d0e151a5ae9e566ceb2b34bf1fda.json
index 12f0fb303..613dd6b45 100644
--- a/cedar-integration-tests/corpus_tests/4a8354f596e7d0e151a5ae9e566ceb2b34bf1fda.json
+++ b/cedar-integration-tests/corpus_tests/4a8354f596e7d0e151a5ae9e566ceb2b34bf1fda.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ffffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ffffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"ffffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ffffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ffffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ffffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ffffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ffffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4abc8267dfa38260a94e56997bd3d32397ddafc7.json b/cedar-integration-tests/corpus_tests/4abc8267dfa38260a94e56997bd3d32397ddafc7.json
index f53ba3b1b..b8882d581 100644
--- a/cedar-integration-tests/corpus_tests/4abc8267dfa38260a94e56997bd3d32397ddafc7.json
+++ b/cedar-integration-tests/corpus_tests/4abc8267dfa38260a94e56997bd3d32397ddafc7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "cP::v::a::\"a\"",
-      "action": "cP::v::Action::\"Z\"",
-      "resource": "cP::v::a::\"a\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": "a"
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": "a"
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "Z"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "cP::v::a::\"a\"",
-      "action": "cP::v::Action::\"Z\"",
-      "resource": "cP::v::a::\"a\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": "a"
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": "a"
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "Z"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "cP::v::a::\"a\"",
-      "action": "cP::v::Action::\"Z\"",
-      "resource": "cP::v::a::\"a\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": "a"
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": "a"
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "Z"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "cP::v::a::\"a\"",
-      "action": "cP::v::Action::\"Z\"",
-      "resource": "cP::v::a::\"a\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": "a"
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": "a"
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "Z"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "cP::v::a::\"a\"",
-      "action": "cP::v::Action::\"Z\"",
-      "resource": "cP::v::a::\"a\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": "a"
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": "a"
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "Z"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "cP::v::a::\"a\"",
-      "action": "cP::v::Action::\"Z\"",
-      "resource": "cP::v::a::\"a\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": "a"
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": "a"
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "Z"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "cP::v::a::\"a\"",
-      "action": "cP::v::Action::\"Z\"",
-      "resource": "cP::v::a::\"a\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": "a"
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": "a"
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "Z"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "cP::v::a::\"a\"",
-      "action": "cP::v::Action::\"Z\"",
-      "resource": "cP::v::a::\"a\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": "a"
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": "a"
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "Z"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4acd3e6ff1141d938a2b678f182bc560e7512938.json b/cedar-integration-tests/corpus_tests/4acd3e6ff1141d938a2b678f182bc560e7512938.json
index daf67f62c..d05c2f691 100644
--- a/cedar-integration-tests/corpus_tests/4acd3e6ff1141d938a2b678f182bc560e7512938.json
+++ b/cedar-integration-tests/corpus_tests/4acd3e6ff1141d938a2b678f182bc560e7512938.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\r\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\r\"",
+      "principal": {
+        "type": "a",
+        "id": "\r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\r\"",
+      "principal": {
+        "type": "a",
+        "id": "\r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\r\"",
+      "principal": {
+        "type": "a",
+        "id": "\r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\r\"",
+      "principal": {
+        "type": "a",
+        "id": "\r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\r\"",
+      "principal": {
+        "type": "a",
+        "id": "\r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\r\"",
+      "principal": {
+        "type": "a",
+        "id": "\r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/4ae3a45bcbd02ed275d6a4f9a1a7e3e59ad7b84f.json b/cedar-integration-tests/corpus_tests/4ae3a45bcbd02ed275d6a4f9a1a7e3e59ad7b84f.json
index e0b916c73..0da77955a 100644
--- a/cedar-integration-tests/corpus_tests/4ae3a45bcbd02ed275d6a4f9a1a7e3e59ad7b84f.json
+++ b/cedar-integration-tests/corpus_tests/4ae3a45bcbd02ed275d6a4f9a1a7e3e59ad7b84f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{1}\\0\\0Lff\\u{10}\\u{18}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\\0\\0Lff\\u{10}\\u{18}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001\u0000\u0000Lff\u0010\u0018"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001\u0000\u0000Lff\u0010\u0018"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{1}\\0\\0Lff\\u{10}\\u{18}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\\0\\0Lff\\u{10}\\u{18}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001\u0000\u0000Lff\u0010\u0018"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001\u0000\u0000Lff\u0010\u0018"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{1}\\0\\0Lff\\u{10}\\u{18}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\\0\\0Lff\\u{10}\\u{18}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001\u0000\u0000Lff\u0010\u0018"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001\u0000\u0000Lff\u0010\u0018"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{1}\\0\\0Lff\\u{10}\\u{18}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\\0\\0Lff\\u{10}\\u{18}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001\u0000\u0000Lff\u0010\u0018"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001\u0000\u0000Lff\u0010\u0018"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{1}\\0\\0Lff\\u{10}\\u{18}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\\0\\0Lff\\u{10}\\u{18}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001\u0000\u0000Lff\u0010\u0018"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001\u0000\u0000Lff\u0010\u0018"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{1}\\0\\0Lff\\u{10}\\u{18}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\\0\\0Lff\\u{10}\\u{18}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001\u0000\u0000Lff\u0010\u0018"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001\u0000\u0000Lff\u0010\u0018"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{1}\\0\\0Lff\\u{10}\\u{18}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\\0\\0Lff\\u{10}\\u{18}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001\u0000\u0000Lff\u0010\u0018"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001\u0000\u0000Lff\u0010\u0018"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{1}\\0\\0Lff\\u{10}\\u{18}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\\0\\0Lff\\u{10}\\u{18}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001\u0000\u0000Lff\u0010\u0018"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001\u0000\u0000Lff\u0010\u0018"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/4be8267d6c692d51457074bdbdabf0d766eb415c.json b/cedar-integration-tests/corpus_tests/4be8267d6c692d51457074bdbdabf0d766eb415c.json
index 3f97143d8..a52bec08a 100644
--- a/cedar-integration-tests/corpus_tests/4be8267d6c692d51457074bdbdabf0d766eb415c.json
+++ b/cedar-integration-tests/corpus_tests/4be8267d6c692d51457074bdbdabf0d766eb415c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"c\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "c"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"c\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "c"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"c\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "c"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"c\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "c"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"c\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "c"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"c\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "c"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"c\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "c"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"c\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "c"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4bf1f9af8f34ec7092c461766c881f600ffb4f71.json b/cedar-integration-tests/corpus_tests/4bf1f9af8f34ec7092c461766c881f600ffb4f71.json
index 55c1625d5..e07a19eab 100644
--- a/cedar-integration-tests/corpus_tests/4bf1f9af8f34ec7092c461766c881f600ffb4f71.json
+++ b/cedar-integration-tests/corpus_tests/4bf1f9af8f34ec7092c461766c881f600ffb4f71.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "sqp1R111o1::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sqp1R111o1::\"\"",
+      "principal": {
+        "type": "sqp1R111o1",
+        "id": ""
+      },
+      "resource": {
+        "type": "sqp1R111o1",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "sqp1R111o1::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sqp1R111o1::\"\"",
+      "principal": {
+        "type": "sqp1R111o1",
+        "id": ""
+      },
+      "resource": {
+        "type": "sqp1R111o1",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "sqp1R111o1::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sqp1R111o1::\"\"",
+      "principal": {
+        "type": "sqp1R111o1",
+        "id": ""
+      },
+      "resource": {
+        "type": "sqp1R111o1",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "sqp1R111o1::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sqp1R111o1::\"\"",
+      "principal": {
+        "type": "sqp1R111o1",
+        "id": ""
+      },
+      "resource": {
+        "type": "sqp1R111o1",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "sqp1R111o1::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sqp1R111o1::\"\"",
+      "principal": {
+        "type": "sqp1R111o1",
+        "id": ""
+      },
+      "resource": {
+        "type": "sqp1R111o1",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "sqp1R111o1::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sqp1R111o1::\"\"",
+      "principal": {
+        "type": "sqp1R111o1",
+        "id": ""
+      },
+      "resource": {
+        "type": "sqp1R111o1",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "sqp1R111o1::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sqp1R111o1::\"\"",
+      "principal": {
+        "type": "sqp1R111o1",
+        "id": ""
+      },
+      "resource": {
+        "type": "sqp1R111o1",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "sqp1R111o1::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sqp1R111o1::\"\"",
+      "principal": {
+        "type": "sqp1R111o1",
+        "id": ""
+      },
+      "resource": {
+        "type": "sqp1R111o1",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/4c0c51d692ca6265086b5acf63a8ff7f8e9da31c.json b/cedar-integration-tests/corpus_tests/4c0c51d692ca6265086b5acf63a8ff7f8e9da31c.json
index 7fe50ed9e..52cd45a7c 100644
--- a/cedar-integration-tests/corpus_tests/4c0c51d692ca6265086b5acf63a8ff7f8e9da31c.json
+++ b/cedar-integration-tests/corpus_tests/4c0c51d692ca6265086b5acf63a8ff7f8e9da31c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4c379c5194afcf24ed4dd644b8146b04ec212f78.json b/cedar-integration-tests/corpus_tests/4c379c5194afcf24ed4dd644b8146b04ec212f78.json
index 16b0c8726..2061e319a 100644
--- a/cedar-integration-tests/corpus_tests/4c379c5194afcf24ed4dd644b8146b04ec212f78.json
+++ b/cedar-integration-tests/corpus_tests/4c379c5194afcf24ed4dd644b8146b04ec212f78.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"ffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/4c6237f576091e1bee1fe087fe515a0f9299cea6.json b/cedar-integration-tests/corpus_tests/4c6237f576091e1bee1fe087fe515a0f9299cea6.json
index 9c945b30c..806d8ac29 100644
--- a/cedar-integration-tests/corpus_tests/4c6237f576091e1bee1fe087fe515a0f9299cea6.json
+++ b/cedar-integration-tests/corpus_tests/4c6237f576091e1bee1fe087fe515a0f9299cea6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/4c7f1052c7dde563dbbc0de4ec169d961f4ca5c9.json b/cedar-integration-tests/corpus_tests/4c7f1052c7dde563dbbc0de4ec169d961f4ca5c9.json
index 37ba376d3..ab4177582 100644
--- a/cedar-integration-tests/corpus_tests/4c7f1052c7dde563dbbc0de4ec169d961f4ca5c9.json
+++ b/cedar-integration-tests/corpus_tests/4c7f1052c7dde563dbbc0de4ec169d961f4ca5c9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "G::R::W10k00k0JHHHQH::u0JH::Fj::\"\"",
-      "action": "G::R::W10k00k0JHHHQH::u0JH::Action::\"\"",
-      "resource": "G::R::W10k00k0JHHHQH::u0JH::Fj::\"\"",
+      "principal": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Fj",
+        "id": ""
+      },
+      "resource": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Fj",
+        "id": ""
+      },
+      "action": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "G::R::W10k00k0JHHHQH::u0JH::Fj::\"\"",
-      "action": "G::R::W10k00k0JHHHQH::u0JH::Action::\"\"",
-      "resource": "G::R::W10k00k0JHHHQH::u0JH::Fj::\"\"",
+      "principal": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Fj",
+        "id": ""
+      },
+      "resource": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Fj",
+        "id": ""
+      },
+      "action": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "G::R::W10k00k0JHHHQH::u0JH::Fj::\"\"",
-      "action": "G::R::W10k00k0JHHHQH::u0JH::Action::\"\"",
-      "resource": "G::R::W10k00k0JHHHQH::u0JH::Fj::\"\"",
+      "principal": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Fj",
+        "id": ""
+      },
+      "resource": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Fj",
+        "id": ""
+      },
+      "action": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "G::R::W10k00k0JHHHQH::u0JH::Fj::\"\"",
-      "action": "G::R::W10k00k0JHHHQH::u0JH::Action::\"\"",
-      "resource": "G::R::W10k00k0JHHHQH::u0JH::Fj::\"\"",
+      "principal": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Fj",
+        "id": ""
+      },
+      "resource": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Fj",
+        "id": ""
+      },
+      "action": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "G::R::W10k00k0JHHHQH::u0JH::Fj::\"\"",
-      "action": "G::R::W10k00k0JHHHQH::u0JH::Action::\"\"",
-      "resource": "G::R::W10k00k0JHHHQH::u0JH::Fj::\"\"",
+      "principal": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Fj",
+        "id": ""
+      },
+      "resource": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Fj",
+        "id": ""
+      },
+      "action": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "G::R::W10k00k0JHHHQH::u0JH::Fj::\"\"",
-      "action": "G::R::W10k00k0JHHHQH::u0JH::Action::\"\"",
-      "resource": "G::R::W10k00k0JHHHQH::u0JH::Fj::\"\"",
+      "principal": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Fj",
+        "id": ""
+      },
+      "resource": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Fj",
+        "id": ""
+      },
+      "action": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "G::R::W10k00k0JHHHQH::u0JH::Fj::\"\"",
-      "action": "G::R::W10k00k0JHHHQH::u0JH::Action::\"\"",
-      "resource": "G::R::W10k00k0JHHHQH::u0JH::Fj::\"\"",
+      "principal": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Fj",
+        "id": ""
+      },
+      "resource": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Fj",
+        "id": ""
+      },
+      "action": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "G::R::W10k00k0JHHHQH::u0JH::Fj::\"\"",
-      "action": "G::R::W10k00k0JHHHQH::u0JH::Action::\"\"",
-      "resource": "G::R::W10k00k0JHHHQH::u0JH::Fj::\"\"",
+      "principal": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Fj",
+        "id": ""
+      },
+      "resource": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Fj",
+        "id": ""
+      },
+      "action": {
+        "type": "G::R::W10k00k0JHHHQH::u0JH::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4d6b9d104867ca37be3d2b673c999a1ef884e18c.json b/cedar-integration-tests/corpus_tests/4d6b9d104867ca37be3d2b673c999a1ef884e18c.json
index 9a8445f3c..05a14f443 100644
--- a/cedar-integration-tests/corpus_tests/4d6b9d104867ca37be3d2b673c999a1ef884e18c.json
+++ b/cedar-integration-tests/corpus_tests/4d6b9d104867ca37be3d2b673c999a1ef884e18c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\":\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\":\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\":\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\":\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -84,9 +147,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\":\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4d87471123d5d2fcc845ad62f0a378747d1a8a3b.json b/cedar-integration-tests/corpus_tests/4d87471123d5d2fcc845ad62f0a378747d1a8a3b.json
index 487682417..67d003d46 100644
--- a/cedar-integration-tests/corpus_tests/4d87471123d5d2fcc845ad62f0a378747d1a8a3b.json
+++ b/cedar-integration-tests/corpus_tests/4d87471123d5d2fcc845ad62f0a378747d1a8a3b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\'\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "'"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -84,9 +147,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/4d95dd953c772afec1afee2f596e2cbd1418eb14.json b/cedar-integration-tests/corpus_tests/4d95dd953c772afec1afee2f596e2cbd1418eb14.json
index 9516a399d..2f504b7f3 100644
--- a/cedar-integration-tests/corpus_tests/4d95dd953c772afec1afee2f596e2cbd1418eb14.json
+++ b/cedar-integration-tests/corpus_tests/4d95dd953c772afec1afee2f596e2cbd1418eb14.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/4da401e9849200d10391c1ccf380b48545805619.json b/cedar-integration-tests/corpus_tests/4da401e9849200d10391c1ccf380b48545805619.json
index 59d191902..459abb18e 100644
--- a/cedar-integration-tests/corpus_tests/4da401e9849200d10391c1ccf380b48545805619.json
+++ b/cedar-integration-tests/corpus_tests/4da401e9849200d10391c1ccf380b48545805619.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::n::r::J::r::r::\"\"",
-      "action": "r::n::r::J::r::Action::\"action\"",
-      "resource": "r::n::r::J::r::u::\"\"",
+      "principal": {
+        "type": "r::n::r::J::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::J::r::u",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::J::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::n::r::J::r::r::\"\"",
-      "action": "r::n::r::J::r::Action::\"action\"",
-      "resource": "r::n::r::J::r::u::\"\"",
+      "principal": {
+        "type": "r::n::r::J::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::J::r::u",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::J::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::n::r::J::r::r::\"\"",
-      "action": "r::n::r::J::r::Action::\"action\"",
-      "resource": "r::n::r::J::r::u::\"\"",
+      "principal": {
+        "type": "r::n::r::J::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::J::r::u",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::J::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::n::r::J::r::r::\"\"",
-      "action": "r::n::r::J::r::Action::\"action\"",
-      "resource": "r::n::r::J::r::u::\"\"",
+      "principal": {
+        "type": "r::n::r::J::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::J::r::u",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::J::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::n::r::J::r::r::\"\"",
-      "action": "r::n::r::J::r::Action::\"action\"",
-      "resource": "r::n::r::J::r::u::\"\"",
+      "principal": {
+        "type": "r::n::r::J::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::J::r::u",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::J::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::n::r::J::r::r::\"\"",
-      "action": "r::n::r::J::r::Action::\"action\"",
-      "resource": "r::n::r::J::r::u::\"\"",
+      "principal": {
+        "type": "r::n::r::J::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::J::r::u",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::J::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::n::r::J::r::r::\"\"",
-      "action": "r::n::r::J::r::Action::\"action\"",
-      "resource": "r::n::r::J::r::u::\"\"",
+      "principal": {
+        "type": "r::n::r::J::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::J::r::u",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::J::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::n::r::J::r::r::\"\"",
-      "action": "r::n::r::J::r::Action::\"action\"",
-      "resource": "r::n::r::J::r::u::\"\"",
+      "principal": {
+        "type": "r::n::r::J::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::J::r::u",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::J::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4dcdd9c33af63be9c8eda6aa7ce0561f03f2d2f2.json b/cedar-integration-tests/corpus_tests/4dcdd9c33af63be9c8eda6aa7ce0561f03f2d2f2.json
index 88d0824ab..72a55571e 100644
--- a/cedar-integration-tests/corpus_tests/4dcdd9c33af63be9c8eda6aa7ce0561f03f2d2f2.json
+++ b/cedar-integration-tests/corpus_tests/4dcdd9c33af63be9c8eda6aa7ce0561f03f2d2f2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\t\\0\\0j\\0\\0(\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\t\u0000\u0000j\u0000\u0000(\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4de0edce6ed72c4b835ccd121bb928855c95dce4.json b/cedar-integration-tests/corpus_tests/4de0edce6ed72c4b835ccd121bb928855c95dce4.json
index 9a7e99564..b8ac393d1 100644
--- a/cedar-integration-tests/corpus_tests/4de0edce6ed72c4b835ccd121bb928855c95dce4.json
+++ b/cedar-integration-tests/corpus_tests/4de0edce6ed72c4b835ccd121bb928855c95dce4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\"\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\"\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\"\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\"\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\"\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\"\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\"\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\"\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\"\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\"\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\"\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\"\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\"\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\"\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\"\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\"\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4de777c4c35da461f76ed7df317c337149dce7cf.json b/cedar-integration-tests/corpus_tests/4de777c4c35da461f76ed7df317c337149dce7cf.json
index 1c9627eaa..f8d19dbfa 100644
--- a/cedar-integration-tests/corpus_tests/4de777c4c35da461f76ed7df317c337149dce7cf.json
+++ b/cedar-integration-tests/corpus_tests/4de777c4c35da461f76ed7df317c337149dce7cf.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0+\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0+\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000+\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000+\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0+\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0+\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000+\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000+\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0+\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0+\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000+\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000+\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0+\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0+\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000+\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000+\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0+\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0+\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000+\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000+\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0+\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0+\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000+\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000+\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0+\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0+\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000+\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000+\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0+\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0+\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000+\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000+\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/4e03b96a72686f4c773c52b125184ff2b31fa6ec.json b/cedar-integration-tests/corpus_tests/4e03b96a72686f4c773c52b125184ff2b31fa6ec.json
index 2a4ccc9e7..ed492f755 100644
--- a/cedar-integration-tests/corpus_tests/4e03b96a72686f4c773c52b125184ff2b31fa6ec.json
+++ b/cedar-integration-tests/corpus_tests/4e03b96a72686f4c773c52b125184ff2b31fa6ec.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{15}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{15}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{15}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{15}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{15}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{15}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/4e203763a4b74f0734f201742b257a5c3ef77826.json b/cedar-integration-tests/corpus_tests/4e203763a4b74f0734f201742b257a5c3ef77826.json
index c074b3281..e77d26a54 100644
--- a/cedar-integration-tests/corpus_tests/4e203763a4b74f0734f201742b257a5c3ef77826.json
+++ b/cedar-integration-tests/corpus_tests/4e203763a4b74f0734f201742b257a5c3ef77826.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "m::a::\":::\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\":::\"",
+      "principal": {
+        "type": "m::a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "m::a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "m::a::\":::\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\":::\"",
+      "principal": {
+        "type": "m::a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "m::a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "m::a::\":::\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\":::\"",
+      "principal": {
+        "type": "m::a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "m::a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "m::a::\":::\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\":::\"",
+      "principal": {
+        "type": "m::a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "m::a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "m::a::\":::\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\":::\"",
+      "principal": {
+        "type": "m::a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "m::a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "m::a::\":::\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\":::\"",
+      "principal": {
+        "type": "m::a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "m::a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "m::a::\":::\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\":::\"",
+      "principal": {
+        "type": "m::a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "m::a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "m::a::\":::\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\":::\"",
+      "principal": {
+        "type": "m::a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "m::a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4e56e3d450ac86ca6e9725bd433e113ced63d2b6.json b/cedar-integration-tests/corpus_tests/4e56e3d450ac86ca6e9725bd433e113ced63d2b6.json
index 9a0e71466..391f3dcdb 100644
--- a/cedar-integration-tests/corpus_tests/4e56e3d450ac86ca6e9725bd433e113ced63d2b6.json
+++ b/cedar-integration-tests/corpus_tests/4e56e3d450ac86ca6e9725bd433e113ced63d2b6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "mzzzzZz::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzzZz::\"\"",
+      "principal": {
+        "type": "mzzzzZz",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzZz",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "mzzzzZz::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzzZz::\"\"",
+      "principal": {
+        "type": "mzzzzZz",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzZz",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "mzzzzZz::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzzZz::\"\"",
+      "principal": {
+        "type": "mzzzzZz",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzZz",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "mzzzzZz::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzzZz::\"\"",
+      "principal": {
+        "type": "mzzzzZz",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzZz",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "mzzzzZz::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzzZz::\"\"",
+      "principal": {
+        "type": "mzzzzZz",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzZz",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "mzzzzZz::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzzZz::\"\"",
+      "principal": {
+        "type": "mzzzzZz",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzZz",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "mzzzzZz::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzzZz::\"\"",
+      "principal": {
+        "type": "mzzzzZz",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzZz",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "mzzzzZz::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzzZz::\"\"",
+      "principal": {
+        "type": "mzzzzZz",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzZz",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/4ec8aedf11f25810b9188269b87398c065e56bc4.json b/cedar-integration-tests/corpus_tests/4ec8aedf11f25810b9188269b87398c065e56bc4.json
index d6c1a21c5..d9a2d0e40 100644
--- a/cedar-integration-tests/corpus_tests/4ec8aedf11f25810b9188269b87398c065e56bc4.json
+++ b/cedar-integration-tests/corpus_tests/4ec8aedf11f25810b9188269b87398c065e56bc4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/4ec9d64422d2c14fcfc9d543825652a3f4f6d41c.json b/cedar-integration-tests/corpus_tests/4ec9d64422d2c14fcfc9d543825652a3f4f6d41c.json
index c66a0a861..967c1f77d 100644
--- a/cedar-integration-tests/corpus_tests/4ec9d64422d2c14fcfc9d543825652a3f4f6d41c.json
+++ b/cedar-integration-tests/corpus_tests/4ec9d64422d2c14fcfc9d543825652a3f4f6d41c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4edd395d1c89ddc20bb893a2cb1736e00ecbc574.json b/cedar-integration-tests/corpus_tests/4edd395d1c89ddc20bb893a2cb1736e00ecbc574.json
index 32938e2ce..97eb705e6 100644
--- a/cedar-integration-tests/corpus_tests/4edd395d1c89ddc20bb893a2cb1736e00ecbc574.json
+++ b/cedar-integration-tests/corpus_tests/4edd395d1c89ddc20bb893a2cb1736e00ecbc574.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4f098b0f164c64387ef81d5852a0ac07fd76c394.json b/cedar-integration-tests/corpus_tests/4f098b0f164c64387ef81d5852a0ac07fd76c394.json
index 9d00bf2da..c20da3d2e 100644
--- a/cedar-integration-tests/corpus_tests/4f098b0f164c64387ef81d5852a0ac07fd76c394.json
+++ b/cedar-integration-tests/corpus_tests/4f098b0f164c64387ef81d5852a0ac07fd76c394.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0d\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000d"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "IR": false,
         "r": false
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0d\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0d\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000d"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000d"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "IR": false,
         "r": false
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0d\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0d\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000d"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000d"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "IR": false,
         "r": false
@@ -47,9 +74,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0d\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0d\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000d"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000d"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "IR": false,
         "r": false
@@ -60,9 +96,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0d\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0d\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000d"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000d"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "IR": false,
         "r": false
@@ -73,9 +118,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0d\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0d\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000d"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000d"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "IR": false,
         "r": false
@@ -86,9 +140,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0d\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0d\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000d"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000d"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "IR": false,
         "r": false
@@ -99,9 +162,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0d\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0d\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000d"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000d"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "IR": false,
         "r": false
diff --git a/cedar-integration-tests/corpus_tests/4f09ef26ee4259c97464c0d816cd0f5ee20cf269.json b/cedar-integration-tests/corpus_tests/4f09ef26ee4259c97464c0d816cd0f5ee20cf269.json
index 1dd519fb2..2d3ff510d 100644
--- a/cedar-integration-tests/corpus_tests/4f09ef26ee4259c97464c0d816cd0f5ee20cf269.json
+++ b/cedar-integration-tests/corpus_tests/4f09ef26ee4259c97464c0d816cd0f5ee20cf269.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"+\\0\\0\\0\\0\\0Lj\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000Lj"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"+\\0\\0\\0\\0\\0Lj\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\0\\0\\0\\0\\0Lj\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000Lj"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000Lj"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"+\\0\\0\\0\\0\\0Lj\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\0\\0\\0\\0\\0Lj\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000Lj"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000Lj"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"+\\0\\0\\0\\0\\0Lj\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\0\\0\\0\\0\\0Lj\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000Lj"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000Lj"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"+\\0\\0\\0\\0\\0Lj\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\0\\0\\0\\0\\0Lj\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000Lj"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000Lj"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"+\\0\\0\\0\\0\\0Lj\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\0\\0\\0\\0\\0Lj\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000Lj"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000Lj"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"+\\0\\0\\0\\0\\0Lj\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\0\\0\\0\\0\\0Lj\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000Lj"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000Lj"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"+\\0\\0\\0\\0\\0Lj\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\0\\0\\0\\0\\0Lj\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000Lj"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000Lj"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/4f7019fe747f205f1a039359193063ea1bc55915.json b/cedar-integration-tests/corpus_tests/4f7019fe747f205f1a039359193063ea1bc55915.json
index f1a410820..42b780813 100644
--- a/cedar-integration-tests/corpus_tests/4f7019fe747f205f1a039359193063ea1bc55915.json
+++ b/cedar-integration-tests/corpus_tests/4f7019fe747f205f1a039359193063ea1bc55915.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "yalupalt36x77::a::\"\"",
-      "action": "yalupalt36x77::Action::\"action\"",
-      "resource": "yalupalt36x77::a::\"\"",
+      "principal": {
+        "type": "yalupalt36x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "yalupalt36x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "yalupalt36x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "yalupalt36x77::a::\"\"",
-      "action": "yalupalt36x77::Action::\"action\"",
-      "resource": "yalupalt36x77::a::\"\"",
+      "principal": {
+        "type": "yalupalt36x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "yalupalt36x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "yalupalt36x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "yalupalt36x77::a::\"\"",
-      "action": "yalupalt36x77::Action::\"action\"",
-      "resource": "yalupalt36x77::a::\"\"",
+      "principal": {
+        "type": "yalupalt36x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "yalupalt36x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "yalupalt36x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "yalupalt36x77::a::\"\"",
-      "action": "yalupalt36x77::Action::\"action\"",
-      "resource": "yalupalt36x77::a::\"\"",
+      "principal": {
+        "type": "yalupalt36x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "yalupalt36x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "yalupalt36x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "yalupalt36x77::a::\"\"",
-      "action": "yalupalt36x77::Action::\"action\"",
-      "resource": "yalupalt36x77::a::\"\"",
+      "principal": {
+        "type": "yalupalt36x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "yalupalt36x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "yalupalt36x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "yalupalt36x77::a::\"\"",
-      "action": "yalupalt36x77::Action::\"action\"",
-      "resource": "yalupalt36x77::a::\"\"",
+      "principal": {
+        "type": "yalupalt36x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "yalupalt36x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "yalupalt36x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "yalupalt36x77::a::\"\"",
-      "action": "yalupalt36x77::Action::\"action\"",
-      "resource": "yalupalt36x77::a::\"\"",
+      "principal": {
+        "type": "yalupalt36x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "yalupalt36x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "yalupalt36x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "yalupalt36x77::a::\"\"",
-      "action": "yalupalt36x77::Action::\"action\"",
-      "resource": "yalupalt36x77::a::\"\"",
+      "principal": {
+        "type": "yalupalt36x77::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "yalupalt36x77::a",
+        "id": ""
+      },
+      "action": {
+        "type": "yalupalt36x77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4f7c9ab77e4079e780601dea7a76263027b5ab69.json b/cedar-integration-tests/corpus_tests/4f7c9ab77e4079e780601dea7a76263027b5ab69.json
index cfcd00fb6..6907248bf 100644
--- a/cedar-integration-tests/corpus_tests/4f7c9ab77e4079e780601dea7a76263027b5ab69.json
+++ b/cedar-integration-tests/corpus_tests/4f7c9ab77e4079e780601dea7a76263027b5ab69.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Kfhhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Kfhhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Kfhhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Kfhhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Kfhhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Kfhhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Kfhhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Kfhhhhhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\"\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/4fca9f77ff054ace350a45f645717d9db0dcd05d.json b/cedar-integration-tests/corpus_tests/4fca9f77ff054ace350a45f645717d9db0dcd05d.json
index 72e47083b..2389baa70 100644
--- a/cedar-integration-tests/corpus_tests/4fca9f77ff054ace350a45f645717d9db0dcd05d.json
+++ b/cedar-integration-tests/corpus_tests/4fca9f77ff054ace350a45f645717d9db0dcd05d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\":\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\":\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\":\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\":\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\":\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\":\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\":\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/4fdc4e1419abd839789e5a013473f5b24dfef7f3.json b/cedar-integration-tests/corpus_tests/4fdc4e1419abd839789e5a013473f5b24dfef7f3.json
index 3f98e1b6e..7f60b10fe 100644
--- a/cedar-integration-tests/corpus_tests/4fdc4e1419abd839789e5a013473f5b24dfef7f3.json
+++ b/cedar-integration-tests/corpus_tests/4fdc4e1419abd839789e5a013473f5b24dfef7f3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/4fec58e1256c0fcd836305b87097c80140f81ec3.json b/cedar-integration-tests/corpus_tests/4fec58e1256c0fcd836305b87097c80140f81ec3.json
index 07c10094d..67a097469 100644
--- a/cedar-integration-tests/corpus_tests/4fec58e1256c0fcd836305b87097c80140f81ec3.json
+++ b/cedar-integration-tests/corpus_tests/4fec58e1256c0fcd836305b87097c80140f81ec3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Khdkk::Akkkk000::\"\"",
-      "action": "Khdkk::Action::\"action\"",
-      "resource": "Khdkk::Akkkk000::\"\"",
+      "principal": {
+        "type": "Khdkk::Akkkk000",
+        "id": ""
+      },
+      "resource": {
+        "type": "Khdkk::Akkkk000",
+        "id": ""
+      },
+      "action": {
+        "type": "Khdkk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Khdkk::Akkkk000::\"\"",
-      "action": "Khdkk::Action::\"action\"",
-      "resource": "Khdkk::Akkkk000::\"\"",
+      "principal": {
+        "type": "Khdkk::Akkkk000",
+        "id": ""
+      },
+      "resource": {
+        "type": "Khdkk::Akkkk000",
+        "id": ""
+      },
+      "action": {
+        "type": "Khdkk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Khdkk::Akkkk000::\"\"",
-      "action": "Khdkk::Action::\"action\"",
-      "resource": "Khdkk::Akkkk000::\"\"",
+      "principal": {
+        "type": "Khdkk::Akkkk000",
+        "id": ""
+      },
+      "resource": {
+        "type": "Khdkk::Akkkk000",
+        "id": ""
+      },
+      "action": {
+        "type": "Khdkk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Khdkk::Akkkk000::\"\"",
-      "action": "Khdkk::Action::\"action\"",
-      "resource": "Khdkk::Akkkk000::\"\"",
+      "principal": {
+        "type": "Khdkk::Akkkk000",
+        "id": ""
+      },
+      "resource": {
+        "type": "Khdkk::Akkkk000",
+        "id": ""
+      },
+      "action": {
+        "type": "Khdkk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Khdkk::Akkkk000::\"\"",
-      "action": "Khdkk::Action::\"action\"",
-      "resource": "Khdkk::Akkkk000::\"\"",
+      "principal": {
+        "type": "Khdkk::Akkkk000",
+        "id": ""
+      },
+      "resource": {
+        "type": "Khdkk::Akkkk000",
+        "id": ""
+      },
+      "action": {
+        "type": "Khdkk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Khdkk::Akkkk000::\"\"",
-      "action": "Khdkk::Action::\"action\"",
-      "resource": "Khdkk::Akkkk000::\"\"",
+      "principal": {
+        "type": "Khdkk::Akkkk000",
+        "id": ""
+      },
+      "resource": {
+        "type": "Khdkk::Akkkk000",
+        "id": ""
+      },
+      "action": {
+        "type": "Khdkk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Khdkk::Akkkk000::\"\"",
-      "action": "Khdkk::Action::\"action\"",
-      "resource": "Khdkk::Akkkk000::\"\"",
+      "principal": {
+        "type": "Khdkk::Akkkk000",
+        "id": ""
+      },
+      "resource": {
+        "type": "Khdkk::Akkkk000",
+        "id": ""
+      },
+      "action": {
+        "type": "Khdkk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Khdkk::Akkkk000::\"\"",
-      "action": "Khdkk::Action::\"action\"",
-      "resource": "Khdkk::Akkkk000::\"\"",
+      "principal": {
+        "type": "Khdkk::Akkkk000",
+        "id": ""
+      },
+      "resource": {
+        "type": "Khdkk::Akkkk000",
+        "id": ""
+      },
+      "action": {
+        "type": "Khdkk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/51038eccb32802ba26926de91c3c01098fb1f5e7.json b/cedar-integration-tests/corpus_tests/51038eccb32802ba26926de91c3c01098fb1f5e7.json
index 1dabdedba..15f7a1ac7 100644
--- a/cedar-integration-tests/corpus_tests/51038eccb32802ba26926de91c3c01098fb1f5e7.json
+++ b/cedar-integration-tests/corpus_tests/51038eccb32802ba26926de91c3c01098fb1f5e7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -84,9 +147,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/510c1809882aa069966e45653f72eaa2ead38322.json b/cedar-integration-tests/corpus_tests/510c1809882aa069966e45653f72eaa2ead38322.json
index 09460cf7b..bc1ceca0e 100644
--- a/cedar-integration-tests/corpus_tests/510c1809882aa069966e45653f72eaa2ead38322.json
+++ b/cedar-integration-tests/corpus_tests/510c1809882aa069966e45653f72eaa2ead38322.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/516f7922d7f2575b6f30800f05f273038b1ada0b.json b/cedar-integration-tests/corpus_tests/516f7922d7f2575b6f30800f05f273038b1ada0b.json
index b824f27ae..dd2d0c315 100644
--- a/cedar-integration-tests/corpus_tests/516f7922d7f2575b6f30800f05f273038b1ada0b.json
+++ b/cedar-integration-tests/corpus_tests/516f7922d7f2575b6f30800f05f273038b1ada0b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\0\\0\\0\\0\\0\\0\\0\\0da\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000da\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/517d43cc4dd6ddff2167d82132c7617d46c3e05e.json b/cedar-integration-tests/corpus_tests/517d43cc4dd6ddff2167d82132c7617d46c3e05e.json
index de7bc7df8..5180e9bde 100644
--- a/cedar-integration-tests/corpus_tests/517d43cc4dd6ddff2167d82132c7617d46c3e05e.json
+++ b/cedar-integration-tests/corpus_tests/517d43cc4dd6ddff2167d82132c7617d46c3e05e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "I": false,
         "A0": false,
@@ -23,9 +32,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "I": false,
         "A0": false,
@@ -40,9 +58,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "I": false,
         "A0": false,
@@ -57,9 +84,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "I": false,
         "A0": false,
@@ -74,9 +110,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "I": false,
         "A0": false,
@@ -91,9 +136,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "I": false,
         "A0": false,
@@ -108,9 +162,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "I": false,
         "A0": false,
@@ -125,9 +188,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "I": false,
         "A0": false,
diff --git a/cedar-integration-tests/corpus_tests/51ce1fc223eb6743cb0d58410c4ccf00063b83ca.json b/cedar-integration-tests/corpus_tests/51ce1fc223eb6743cb0d58410c4ccf00063b83ca.json
index ed0059314..496729630 100644
--- a/cedar-integration-tests/corpus_tests/51ce1fc223eb6743cb0d58410c4ccf00063b83ca.json
+++ b/cedar-integration-tests/corpus_tests/51ce1fc223eb6743cb0d58410c4ccf00063b83ca.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/524afc45d7c82b68c02d19e48f6575c957849644.json b/cedar-integration-tests/corpus_tests/524afc45d7c82b68c02d19e48f6575c957849644.json
index a6916e4e5..009f2434c 100644
--- a/cedar-integration-tests/corpus_tests/524afc45d7c82b68c02d19e48f6575c957849644.json
+++ b/cedar-integration-tests/corpus_tests/524afc45d7c82b68c02d19e48f6575c957849644.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/525e966b4ded22f5b2de78026a3ffab45249c626.json b/cedar-integration-tests/corpus_tests/525e966b4ded22f5b2de78026a3ffab45249c626.json
index 7371e5b09..d03de6fdc 100644
--- a/cedar-integration-tests/corpus_tests/525e966b4ded22f5b2de78026a3ffab45249c626.json
+++ b/cedar-integration-tests/corpus_tests/525e966b4ded22f5b2de78026a3ffab45249c626.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\"",
+      "principal": {
+        "type": "a",
+        "id": "#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\"",
+      "principal": {
+        "type": "a",
+        "id": "#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\"",
+      "principal": {
+        "type": "a",
+        "id": "#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\"",
+      "principal": {
+        "type": "a",
+        "id": "#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\"",
+      "principal": {
+        "type": "a",
+        "id": "#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\"",
+      "principal": {
+        "type": "a",
+        "id": "#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/528fe2faa9613612d2f87eebe9b3a37c3d0c4726.json b/cedar-integration-tests/corpus_tests/528fe2faa9613612d2f87eebe9b3a37c3d0c4726.json
index 53a132596..05e597f19 100644
--- a/cedar-integration-tests/corpus_tests/528fe2faa9613612d2f87eebe9b3a37c3d0c4726.json
+++ b/cedar-integration-tests/corpus_tests/528fe2faa9613612d2f87eebe9b3a37c3d0c4726.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5299903b4c7a5070b089a052d2dfd8bd21bd483e.json b/cedar-integration-tests/corpus_tests/5299903b4c7a5070b089a052d2dfd8bd21bd483e.json
index 62d867c92..1d320c858 100644
--- a/cedar-integration-tests/corpus_tests/5299903b4c7a5070b089a052d2dfd8bd21bd483e.json
+++ b/cedar-integration-tests/corpus_tests/5299903b4c7a5070b089a052d2dfd8bd21bd483e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"b\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "b"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"b\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"b\"",
+      "principal": {
+        "type": "a",
+        "id": "b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"b\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"b\"",
+      "principal": {
+        "type": "a",
+        "id": "b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"b\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"b\"",
+      "principal": {
+        "type": "a",
+        "id": "b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"b\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"b\"",
+      "principal": {
+        "type": "a",
+        "id": "b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"b\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"b\"",
+      "principal": {
+        "type": "a",
+        "id": "b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/52ba08e9d979bad6e44cc399fd4ba616cb84cad3.json b/cedar-integration-tests/corpus_tests/52ba08e9d979bad6e44cc399fd4ba616cb84cad3.json
index b0e9af85d..35307fa85 100644
--- a/cedar-integration-tests/corpus_tests/52ba08e9d979bad6e44cc399fd4ba616cb84cad3.json
+++ b/cedar-integration-tests/corpus_tests/52ba08e9d979bad6e44cc399fd4ba616cb84cad3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzirzzzq0z000": "",
         "E": ""
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzirzzzq0z000": "",
         "E": ""
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzirzzzq0z000": "",
         "E": ""
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzirzzzq0z000": "",
         "E": ""
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzirzzzq0z000": "",
         "E": ""
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzirzzzq0z000": "",
         "E": ""
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzirzzzq0z000": "",
         "E": ""
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzirzzzq0z000": "",
         "E": ""
diff --git a/cedar-integration-tests/corpus_tests/52f28fbf92e2773629b6cc1e1c2cc674300784c9.json b/cedar-integration-tests/corpus_tests/52f28fbf92e2773629b6cc1e1c2cc674300784c9.json
index 2e572d10e..81bad6b2a 100644
--- a/cedar-integration-tests/corpus_tests/52f28fbf92e2773629b6cc1e1c2cc674300784c9.json
+++ b/cedar-integration-tests/corpus_tests/52f28fbf92e2773629b6cc1e1c2cc674300784c9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5320b71442cc53b16af47425ff1b2305c83daca4.json b/cedar-integration-tests/corpus_tests/5320b71442cc53b16af47425ff1b2305c83daca4.json
index 73c58a0ba..a528f299d 100644
--- a/cedar-integration-tests/corpus_tests/5320b71442cc53b16af47425ff1b2305c83daca4.json
+++ b/cedar-integration-tests/corpus_tests/5320b71442cc53b16af47425ff1b2305c83daca4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "B::a::\"::ffff\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"::ffff\"",
+      "principal": {
+        "type": "B::a",
+        "id": "::ffff"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "::ffff"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "B::a::\"::ffff\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"::ffff\"",
+      "principal": {
+        "type": "B::a",
+        "id": "::ffff"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "::ffff"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "B::a::\"::ffff\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"::ffff\"",
+      "principal": {
+        "type": "B::a",
+        "id": "::ffff"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "::ffff"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "B::a::\"::ffff\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"::ffff\"",
+      "principal": {
+        "type": "B::a",
+        "id": "::ffff"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "::ffff"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "B::a::\"::ffff\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"::ffff\"",
+      "principal": {
+        "type": "B::a",
+        "id": "::ffff"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "::ffff"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "B::a::\"::ffff\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"::ffff\"",
+      "principal": {
+        "type": "B::a",
+        "id": "::ffff"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "::ffff"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "B::a::\"::ffff\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"::ffff\"",
+      "principal": {
+        "type": "B::a",
+        "id": "::ffff"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "::ffff"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "B::a::\"::ffff\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"::ffff\"",
+      "principal": {
+        "type": "B::a",
+        "id": "::ffff"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "::ffff"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/532d64fb783c8001157622299aaf07604b074261.json b/cedar-integration-tests/corpus_tests/532d64fb783c8001157622299aaf07604b074261.json
index 8738ff229..2a6da75f5 100644
--- a/cedar-integration-tests/corpus_tests/532d64fb783c8001157622299aaf07604b074261.json
+++ b/cedar-integration-tests/corpus_tests/532d64fb783c8001157622299aaf07604b074261.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/533f97efb842328e87f25d4fd5ca3a59982fdd96.json b/cedar-integration-tests/corpus_tests/533f97efb842328e87f25d4fd5ca3a59982fdd96.json
index fb52b583d..d81b81543 100644
--- a/cedar-integration-tests/corpus_tests/533f97efb842328e87f25d4fd5ca3a59982fdd96.json
+++ b/cedar-integration-tests/corpus_tests/533f97efb842328e87f25d4fd5ca3a59982fdd96.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/53d1bdbcb06b91cc69fe942ed42126030ab76245.json b/cedar-integration-tests/corpus_tests/53d1bdbcb06b91cc69fe942ed42126030ab76245.json
index b7959e8c5..492bea411 100644
--- a/cedar-integration-tests/corpus_tests/53d1bdbcb06b91cc69fe942ed42126030ab76245.json
+++ b/cedar-integration-tests/corpus_tests/53d1bdbcb06b91cc69fe942ed42126030ab76245.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "_cp": "",
         "_kgr66A": "",
@@ -22,9 +31,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "_cp": "",
         "_kgr66A": "",
@@ -38,9 +56,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "_cp": "",
         "_kgr66A": "",
@@ -54,9 +81,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "_cp": "",
         "_kgr66A": "",
@@ -70,9 +106,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "_cp": "",
         "_kgr66A": "",
@@ -86,9 +131,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "_cp": "",
         "_kgr66A": "",
@@ -102,9 +156,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "_cp": "",
         "_kgr66A": "",
@@ -118,9 +181,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "_cp": "",
         "_kgr66A": "",
diff --git a/cedar-integration-tests/corpus_tests/53e72c4fde0d52b6941af1e722e15e03c51d13a2.json b/cedar-integration-tests/corpus_tests/53e72c4fde0d52b6941af1e722e15e03c51d13a2.json
index b56d633a4..9a10337ee 100644
--- a/cedar-integration-tests/corpus_tests/53e72c4fde0d52b6941af1e722e15e03c51d13a2.json
+++ b/cedar-integration-tests/corpus_tests/53e72c4fde0d52b6941af1e722e15e03c51d13a2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/541b68ab4077e66b57fe10c02e4930a4a5167efd.json b/cedar-integration-tests/corpus_tests/541b68ab4077e66b57fe10c02e4930a4a5167efd.json
index e0c7a7393..2b702f1ce 100644
--- a/cedar-integration-tests/corpus_tests/541b68ab4077e66b57fe10c02e4930a4a5167efd.json
+++ b/cedar-integration-tests/corpus_tests/541b68ab4077e66b57fe10c02e4930a4a5167efd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"DFFF\"",
-      "action": "Action::\"FFF\"",
-      "resource": "a::\"DFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "DFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "DFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "FFF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"DFFF\"",
-      "action": "Action::\"FFF\"",
-      "resource": "a::\"DFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "DFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "DFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "FFF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"DFFF\"",
-      "action": "Action::\"FFF\"",
-      "resource": "a::\"DFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "DFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "DFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "FFF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"DFFF\"",
-      "action": "Action::\"FFF\"",
-      "resource": "a::\"DFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "DFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "DFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "FFF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"DFFF\"",
-      "action": "Action::\"FFF\"",
-      "resource": "a::\"DFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "DFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "DFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "FFF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"DFFF\"",
-      "action": "Action::\"FFF\"",
-      "resource": "a::\"DFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "DFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "DFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "FFF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"DFFF\"",
-      "action": "Action::\"FFF\"",
-      "resource": "a::\"DFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "DFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "DFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "FFF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"DFFF\"",
-      "action": "Action::\"FFF\"",
-      "resource": "a::\"DFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "DFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "DFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "FFF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/542c42d5e27ea598981872d3dea68f2cc892fe2a.json b/cedar-integration-tests/corpus_tests/542c42d5e27ea598981872d3dea68f2cc892fe2a.json
index 6f2efc261..156a6bea0 100644
--- a/cedar-integration-tests/corpus_tests/542c42d5e27ea598981872d3dea68f2cc892fe2a.json
+++ b/cedar-integration-tests/corpus_tests/542c42d5e27ea598981872d3dea68f2cc892fe2a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/543c0a1b6e646612c265d655bc5e8c9cb5f9fddd.json b/cedar-integration-tests/corpus_tests/543c0a1b6e646612c265d655bc5e8c9cb5f9fddd.json
index 86bcfa54b..41167c2d2 100644
--- a/cedar-integration-tests/corpus_tests/543c0a1b6e646612c265d655bc5e8c9cb5f9fddd.json
+++ b/cedar-integration-tests/corpus_tests/543c0a1b6e646612c265d655bc5e8c9cb5f9fddd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5475596bc50659d884313c90631726e19cd0e04d.json b/cedar-integration-tests/corpus_tests/5475596bc50659d884313c90631726e19cd0e04d.json
index 7302360fa..8969573a8 100644
--- a/cedar-integration-tests/corpus_tests/5475596bc50659d884313c90631726e19cd0e04d.json
+++ b/cedar-integration-tests/corpus_tests/5475596bc50659d884313c90631726e19cd0e04d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{15}::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{15}::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{15}::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{15}::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{15}::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{15}::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{15}::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{15}::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/54d561c25c3da949ee5e512f2ccd85af57ba9502.json b/cedar-integration-tests/corpus_tests/54d561c25c3da949ee5e512f2ccd85af57ba9502.json
index 17b6a2062..ddc366a9c 100644
--- a/cedar-integration-tests/corpus_tests/54d561c25c3da949ee5e512f2ccd85af57ba9502.json
+++ b/cedar-integration-tests/corpus_tests/54d561c25c3da949ee5e512f2ccd85af57ba9502.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Gxxxxx100::a::\";\"",
-      "action": "Gxxxxx100::Action::\"action\"",
-      "resource": "Gxxxxx100::a::\";\"",
+      "principal": {
+        "type": "Gxxxxx100::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "Gxxxxx100::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Gxxxxx100::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Gxxxxx100::a::\";\"",
-      "action": "Gxxxxx100::Action::\"action\"",
-      "resource": "Gxxxxx100::a::\";\"",
+      "principal": {
+        "type": "Gxxxxx100::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "Gxxxxx100::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Gxxxxx100::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Gxxxxx100::a::\";\"",
-      "action": "Gxxxxx100::Action::\"action\"",
-      "resource": "Gxxxxx100::a::\";\"",
+      "principal": {
+        "type": "Gxxxxx100::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "Gxxxxx100::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Gxxxxx100::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Gxxxxx100::a::\";\"",
-      "action": "Gxxxxx100::Action::\"action\"",
-      "resource": "Gxxxxx100::a::\";\"",
+      "principal": {
+        "type": "Gxxxxx100::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "Gxxxxx100::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Gxxxxx100::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Gxxxxx100::a::\";\"",
-      "action": "Gxxxxx100::Action::\"action\"",
-      "resource": "Gxxxxx100::a::\";\"",
+      "principal": {
+        "type": "Gxxxxx100::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "Gxxxxx100::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Gxxxxx100::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Gxxxxx100::a::\";\"",
-      "action": "Gxxxxx100::Action::\"action\"",
-      "resource": "Gxxxxx100::a::\";\"",
+      "principal": {
+        "type": "Gxxxxx100::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "Gxxxxx100::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Gxxxxx100::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Gxxxxx100::a::\";\"",
-      "action": "Gxxxxx100::Action::\"action\"",
-      "resource": "Gxxxxx100::a::\";\"",
+      "principal": {
+        "type": "Gxxxxx100::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "Gxxxxx100::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Gxxxxx100::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Gxxxxx100::a::\";\"",
-      "action": "Gxxxxx100::Action::\"action\"",
-      "resource": "Gxxxxx100::a::\";\"",
+      "principal": {
+        "type": "Gxxxxx100::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "Gxxxxx100::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Gxxxxx100::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/54dc49893ab1147dc7febeda5d35646d75f9279a.json b/cedar-integration-tests/corpus_tests/54dc49893ab1147dc7febeda5d35646d75f9279a.json
index 66b2340ba..4cfbbdae4 100644
--- a/cedar-integration-tests/corpus_tests/54dc49893ab1147dc7febeda5d35646d75f9279a.json
+++ b/cedar-integration-tests/corpus_tests/54dc49893ab1147dc7febeda5d35646d75f9279a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/54e5dc2f0578b39656e5ae8ca26c01e0d05c9ad7.json b/cedar-integration-tests/corpus_tests/54e5dc2f0578b39656e5ae8ca26c01e0d05c9ad7.json
index 40ff2e7d8..e9f3928c6 100644
--- a/cedar-integration-tests/corpus_tests/54e5dc2f0578b39656e5ae8ca26c01e0d05c9ad7.json
+++ b/cedar-integration-tests/corpus_tests/54e5dc2f0578b39656e5ae8ca26c01e0d05c9ad7.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/55448823844281a98febe12f7427961cd1dab4ba.json b/cedar-integration-tests/corpus_tests/55448823844281a98febe12f7427961cd1dab4ba.json
index e8073962f..6d4a5b7da 100644
--- a/cedar-integration-tests/corpus_tests/55448823844281a98febe12f7427961cd1dab4ba.json
+++ b/cedar-integration-tests/corpus_tests/55448823844281a98febe12f7427961cd1dab4ba.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"d\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "d"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/55bc710e6e16941d5fb9a7ea274bb847b6ea1492.json b/cedar-integration-tests/corpus_tests/55bc710e6e16941d5fb9a7ea274bb847b6ea1492.json
index 036b96567..8e9b0df77 100644
--- a/cedar-integration-tests/corpus_tests/55bc710e6e16941d5fb9a7ea274bb847b6ea1492.json
+++ b/cedar-integration-tests/corpus_tests/55bc710e6e16941d5fb9a7ea274bb847b6ea1492.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"=\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"=\"",
+      "principal": {
+        "type": "a",
+        "id": "="
+      },
+      "resource": {
+        "type": "a",
+        "id": "="
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"=\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"=\"",
+      "principal": {
+        "type": "a",
+        "id": "="
+      },
+      "resource": {
+        "type": "a",
+        "id": "="
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"=\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"=\"",
+      "principal": {
+        "type": "a",
+        "id": "="
+      },
+      "resource": {
+        "type": "a",
+        "id": "="
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"=\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"=\"",
+      "principal": {
+        "type": "a",
+        "id": "="
+      },
+      "resource": {
+        "type": "a",
+        "id": "="
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"=\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"=\"",
+      "principal": {
+        "type": "a",
+        "id": "="
+      },
+      "resource": {
+        "type": "a",
+        "id": "="
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/55bf306cab4c32bfcccb9fe72bb92e6e637dba01.json b/cedar-integration-tests/corpus_tests/55bf306cab4c32bfcccb9fe72bb92e6e637dba01.json
index aa9d4eaa4..7d69c67cc 100644
--- a/cedar-integration-tests/corpus_tests/55bf306cab4c32bfcccb9fe72bb92e6e637dba01.json
+++ b/cedar-integration-tests/corpus_tests/55bf306cab4c32bfcccb9fe72bb92e6e637dba01.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/55d14b8867ce5ed85dd8f30e97a54cd834e77627.json b/cedar-integration-tests/corpus_tests/55d14b8867ce5ed85dd8f30e97a54cd834e77627.json
index 42789f084..81b9a1e0e 100644
--- a/cedar-integration-tests/corpus_tests/55d14b8867ce5ed85dd8f30e97a54cd834e77627.json
+++ b/cedar-integration-tests/corpus_tests/55d14b8867ce5ed85dd8f30e97a54cd834e77627.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/55dec050f175508c8f798ba60af64e2b1e4242f8.json b/cedar-integration-tests/corpus_tests/55dec050f175508c8f798ba60af64e2b1e4242f8.json
index 34e60d228..57760bfed 100644
--- a/cedar-integration-tests/corpus_tests/55dec050f175508c8f798ba60af64e2b1e4242f8.json
+++ b/cedar-integration-tests/corpus_tests/55dec050f175508c8f798ba60af64e2b1e4242f8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"#\\0\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"#\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "#\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"#\\0\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"#\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "#\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"#\\0\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"#\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "#\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"#\\0\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"#\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "#\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"#\\0\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"#\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "#\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"#\\0\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"#\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "#\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"#\\0\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"#\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "#\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/560674e150b4ad2d396a2e517a4675286ab4e8d7.json b/cedar-integration-tests/corpus_tests/560674e150b4ad2d396a2e517a4675286ab4e8d7.json
index bea15d23e..f2cde0ae5 100644
--- a/cedar-integration-tests/corpus_tests/560674e150b4ad2d396a2e517a4675286ab4e8d7.json
+++ b/cedar-integration-tests/corpus_tests/560674e150b4ad2d396a2e517a4675286ab4e8d7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "F::\"::::::\\u{7f}\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"::::::\\u{7f}\"",
+      "principal": {
+        "type": "F",
+        "id": "::::::"
+      },
+      "resource": {
+        "type": "F",
+        "id": "::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "F::\"::::::\\u{7f}\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"::::::\\u{7f}\"",
+      "principal": {
+        "type": "F",
+        "id": "::::::"
+      },
+      "resource": {
+        "type": "F",
+        "id": "::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "F::\"::::::\\u{7f}\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"::::::\\u{7f}\"",
+      "principal": {
+        "type": "F",
+        "id": "::::::"
+      },
+      "resource": {
+        "type": "F",
+        "id": "::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "F::\"::::::\\u{7f}\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"::::::\\u{7f}\"",
+      "principal": {
+        "type": "F",
+        "id": "::::::"
+      },
+      "resource": {
+        "type": "F",
+        "id": "::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "F::\"::::::\\u{7f}\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"::::::\\u{7f}\"",
+      "principal": {
+        "type": "F",
+        "id": "::::::"
+      },
+      "resource": {
+        "type": "F",
+        "id": "::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "F::\"::::::\\u{7f}\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"::::::\\u{7f}\"",
+      "principal": {
+        "type": "F",
+        "id": "::::::"
+      },
+      "resource": {
+        "type": "F",
+        "id": "::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "F::\"::::::\\u{7f}\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"::::::\\u{7f}\"",
+      "principal": {
+        "type": "F",
+        "id": "::::::"
+      },
+      "resource": {
+        "type": "F",
+        "id": "::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "F::\"::::::\\u{7f}\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"::::::\\u{7f}\"",
+      "principal": {
+        "type": "F",
+        "id": "::::::"
+      },
+      "resource": {
+        "type": "F",
+        "id": "::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5606d8fe3357406fbb4463cdcd30b605640519e6.json b/cedar-integration-tests/corpus_tests/5606d8fe3357406fbb4463cdcd30b605640519e6.json
index 5bd803052..b6978fcc5 100644
--- a/cedar-integration-tests/corpus_tests/5606d8fe3357406fbb4463cdcd30b605640519e6.json
+++ b/cedar-integration-tests/corpus_tests/5606d8fe3357406fbb4463cdcd30b605640519e6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/563582cd5ea55ce28d1f6d2e6a096baac5cf10ab.json b/cedar-integration-tests/corpus_tests/563582cd5ea55ce28d1f6d2e6a096baac5cf10ab.json
index 3dc9f2979..6129fe55b 100644
--- a/cedar-integration-tests/corpus_tests/563582cd5ea55ce28d1f6d2e6a096baac5cf10ab.json
+++ b/cedar-integration-tests/corpus_tests/563582cd5ea55ce28d1f6d2e6a096baac5cf10ab.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/56446144b3a9f536491ff2bf056a614ae755fa00.json b/cedar-integration-tests/corpus_tests/56446144b3a9f536491ff2bf056a614ae755fa00.json
index e90411399..b91625c4a 100644
--- a/cedar-integration-tests/corpus_tests/56446144b3a9f536491ff2bf056a614ae755fa00.json
+++ b/cedar-integration-tests/corpus_tests/56446144b3a9f536491ff2bf056a614ae755fa00.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/564c7b55a6b59d2d4cdffbc67edae64efe5ac1f7.json b/cedar-integration-tests/corpus_tests/564c7b55a6b59d2d4cdffbc67edae64efe5ac1f7.json
index 275fb436c..26d16a273 100644
--- a/cedar-integration-tests/corpus_tests/564c7b55a6b59d2d4cdffbc67edae64efe5ac1f7.json
+++ b/cedar-integration-tests/corpus_tests/564c7b55a6b59d2d4cdffbc67edae64efe5ac1f7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/56892e379439f016b9cedf9327e585608a5f57ab.json b/cedar-integration-tests/corpus_tests/56892e379439f016b9cedf9327e585608a5f57ab.json
index a19016eb0..da12b88ef 100644
--- a/cedar-integration-tests/corpus_tests/56892e379439f016b9cedf9327e585608a5f57ab.json
+++ b/cedar-integration-tests/corpus_tests/56892e379439f016b9cedf9327e585608a5f57ab.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0x/\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000x/\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/56aaf321d34a8330373a5a4c21c140bd6e330cd2.json b/cedar-integration-tests/corpus_tests/56aaf321d34a8330373a5a4c21c140bd6e330cd2.json
index d5b1bec26..8188aac02 100644
--- a/cedar-integration-tests/corpus_tests/56aaf321d34a8330373a5a4c21c140bd6e330cd2.json
+++ b/cedar-integration-tests/corpus_tests/56aaf321d34a8330373a5a4c21c140bd6e330cd2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/56b0c020f8c3792ec28f53bcd0a918c961106bdf.json b/cedar-integration-tests/corpus_tests/56b0c020f8c3792ec28f53bcd0a918c961106bdf.json
index 1db2db0a0..0fc8d016a 100644
--- a/cedar-integration-tests/corpus_tests/56b0c020f8c3792ec28f53bcd0a918c961106bdf.json
+++ b/cedar-integration-tests/corpus_tests/56b0c020f8c3792ec28f53bcd0a918c961106bdf.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Kfhhhhh::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"....\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Kfhhhhh::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"....\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Kfhhhhh::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"....\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Kfhhhhh::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"....\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Kfhhhhh::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"....\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Kfhhhhh::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"....\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Kfhhhhh::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"....\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Kfhhhhh::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"....\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/56d4d9311bcdf16e69d505374f59e457440a8aa2.json b/cedar-integration-tests/corpus_tests/56d4d9311bcdf16e69d505374f59e457440a8aa2.json
index f090e436d..d38216a57 100644
--- a/cedar-integration-tests/corpus_tests/56d4d9311bcdf16e69d505374f59e457440a8aa2.json
+++ b/cedar-integration-tests/corpus_tests/56d4d9311bcdf16e69d505374f59e457440a8aa2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/56f0369e64a8aea495d82b7cf5fe68532611c57f.json b/cedar-integration-tests/corpus_tests/56f0369e64a8aea495d82b7cf5fe68532611c57f.json
index 8ec571bfb..99e9c0098 100644
--- a/cedar-integration-tests/corpus_tests/56f0369e64a8aea495d82b7cf5fe68532611c57f.json
+++ b/cedar-integration-tests/corpus_tests/56f0369e64a8aea495d82b7cf5fe68532611c57f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Gxxxxxjju::a::\"=\"",
-      "action": "Gxxxxxjju::Action::\"action\"",
-      "resource": "Gxxxxxjju::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxjju::a",
+        "id": "="
+      },
+      "resource": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxjju::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Gxxxxxjju::a::\"\"",
-      "action": "Gxxxxxjju::Action::\"action\"",
-      "resource": "Gxxxxxjju::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxjju::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Gxxxxxjju::a::\"\"",
-      "action": "Gxxxxxjju::Action::\"action\"",
-      "resource": "Gxxxxxjju::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxjju::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Gxxxxxjju::a::\"\"",
-      "action": "Gxxxxxjju::Action::\"action\"",
-      "resource": "Gxxxxxjju::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxjju::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Gxxxxxjju::a::\"\"",
-      "action": "Gxxxxxjju::Action::\"action\"",
-      "resource": "Gxxxxxjju::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxjju::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Gxxxxxjju::a::\"\"",
-      "action": "Gxxxxxjju::Action::\"action\"",
-      "resource": "Gxxxxxjju::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxjju::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Gxxxxxjju::a::\"\"",
-      "action": "Gxxxxxjju::Action::\"action\"",
-      "resource": "Gxxxxxjju::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxjju::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Gxxxxxjju::a::\"\"",
-      "action": "Gxxxxxjju::Action::\"action\"",
-      "resource": "Gxxxxxjju::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxjju::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5746644b95d1d90914158aae1f95a3df07def303.json b/cedar-integration-tests/corpus_tests/5746644b95d1d90914158aae1f95a3df07def303.json
index 9c4497f9b..d86291a7f 100644
--- a/cedar-integration-tests/corpus_tests/5746644b95d1d90914158aae1f95a3df07def303.json
+++ b/cedar-integration-tests/corpus_tests/5746644b95d1d90914158aae1f95a3df07def303.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
diff --git a/cedar-integration-tests/corpus_tests/575d96f86187dc6fb7ca8b3896f225b66318b7c7.json b/cedar-integration-tests/corpus_tests/575d96f86187dc6fb7ca8b3896f225b66318b7c7.json
index 20f28c8ae..42c742e46 100644
--- a/cedar-integration-tests/corpus_tests/575d96f86187dc6fb7ca8b3896f225b66318b7c7.json
+++ b/cedar-integration-tests/corpus_tests/575d96f86187dc6fb7ca8b3896f225b66318b7c7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/57b7cfe0e1f8f9067164d7fb9f13e8b5da276ba5.json b/cedar-integration-tests/corpus_tests/57b7cfe0e1f8f9067164d7fb9f13e8b5da276ba5.json
index 9f3f5de54..d738081c0 100644
--- a/cedar-integration-tests/corpus_tests/57b7cfe0e1f8f9067164d7fb9f13e8b5da276ba5.json
+++ b/cedar-integration-tests/corpus_tests/57b7cfe0e1f8f9067164d7fb9f13e8b5da276ba5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/5814e165b69dd35205c7ccf223a4e8c9bfc7b8ab.json b/cedar-integration-tests/corpus_tests/5814e165b69dd35205c7ccf223a4e8c9bfc7b8ab.json
index 5920dea39..9de193ce7 100644
--- a/cedar-integration-tests/corpus_tests/5814e165b69dd35205c7ccf223a4e8c9bfc7b8ab.json
+++ b/cedar-integration-tests/corpus_tests/5814e165b69dd35205c7ccf223a4e8c9bfc7b8ab.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "R7B::\".........sun/sec\"",
-      "action": "Action::\"action\"",
-      "resource": "R7B::\".........sun/sec\"",
+      "principal": {
+        "type": "R7B",
+        "id": ".........sun/sec"
+      },
+      "resource": {
+        "type": "R7B",
+        "id": ".........sun/sec"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "R7B::\".........sun/sec\"",
-      "action": "Action::\"action\"",
-      "resource": "R7B::\".........sun/sec\"",
+      "principal": {
+        "type": "R7B",
+        "id": ".........sun/sec"
+      },
+      "resource": {
+        "type": "R7B",
+        "id": ".........sun/sec"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "R7B::\".........sun/sec\"",
-      "action": "Action::\"action\"",
-      "resource": "R7B::\".........sun/sec\"",
+      "principal": {
+        "type": "R7B",
+        "id": ".........sun/sec"
+      },
+      "resource": {
+        "type": "R7B",
+        "id": ".........sun/sec"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "R7B::\".........sun/sec\"",
-      "action": "Action::\"action\"",
-      "resource": "R7B::\".........sun/sec\"",
+      "principal": {
+        "type": "R7B",
+        "id": ".........sun/sec"
+      },
+      "resource": {
+        "type": "R7B",
+        "id": ".........sun/sec"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "R7B::\".........sun/sec\"",
-      "action": "Action::\"action\"",
-      "resource": "R7B::\".........sun/sec\"",
+      "principal": {
+        "type": "R7B",
+        "id": ".........sun/sec"
+      },
+      "resource": {
+        "type": "R7B",
+        "id": ".........sun/sec"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "R7B::\".........sun/sec\"",
-      "action": "Action::\"action\"",
-      "resource": "R7B::\".........sun/sec\"",
+      "principal": {
+        "type": "R7B",
+        "id": ".........sun/sec"
+      },
+      "resource": {
+        "type": "R7B",
+        "id": ".........sun/sec"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "R7B::\".........sun/sec\"",
-      "action": "Action::\"action\"",
-      "resource": "R7B::\".........sun/sec\"",
+      "principal": {
+        "type": "R7B",
+        "id": ".........sun/sec"
+      },
+      "resource": {
+        "type": "R7B",
+        "id": ".........sun/sec"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "R7B::\".........sun/sec\"",
-      "action": "Action::\"action\"",
-      "resource": "R7B::\".........sun/sec\"",
+      "principal": {
+        "type": "R7B",
+        "id": ".........sun/sec"
+      },
+      "resource": {
+        "type": "R7B",
+        "id": ".........sun/sec"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/585652a4c05f9b6d0b92999377d7a635f409b73a.json b/cedar-integration-tests/corpus_tests/585652a4c05f9b6d0b92999377d7a635f409b73a.json
index 24427cc1b..477be8336 100644
--- a/cedar-integration-tests/corpus_tests/585652a4c05f9b6d0b92999377d7a635f409b73a.json
+++ b/cedar-integration-tests/corpus_tests/585652a4c05f9b6d0b92999377d7a635f409b73a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"!\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "!"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/587a433cf9916b10d67701bc8d26db33fcd7e178.json b/cedar-integration-tests/corpus_tests/587a433cf9916b10d67701bc8d26db33fcd7e178.json
index a9eabea2f..b457d5c4f 100644
--- a/cedar-integration-tests/corpus_tests/587a433cf9916b10d67701bc8d26db33fcd7e178.json
+++ b/cedar-integration-tests/corpus_tests/587a433cf9916b10d67701bc8d26db33fcd7e178.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/588a7f8910cea29398561f2d32e50317cdd7cfb5.json b/cedar-integration-tests/corpus_tests/588a7f8910cea29398561f2d32e50317cdd7cfb5.json
index 5c0df07b2..6e08a8c92 100644
--- a/cedar-integration-tests/corpus_tests/588a7f8910cea29398561f2d32e50317cdd7cfb5.json
+++ b/cedar-integration-tests/corpus_tests/588a7f8910cea29398561f2d32e50317cdd7cfb5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/58b82c6ccae3727eadd2c0c94efa9ee0726687f7.json b/cedar-integration-tests/corpus_tests/58b82c6ccae3727eadd2c0c94efa9ee0726687f7.json
index aa00a470a..aa3b10093 100644
--- a/cedar-integration-tests/corpus_tests/58b82c6ccae3727eadd2c0c94efa9ee0726687f7.json
+++ b/cedar-integration-tests/corpus_tests/58b82c6ccae3727eadd2c0c94efa9ee0726687f7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F0000000": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F0000000": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F0000000": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F0000000": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F0000000": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F0000000": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F0000000": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F0000000": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/58bbf2c87350d4a6416a4329908fcbb247f1b331.json b/cedar-integration-tests/corpus_tests/58bbf2c87350d4a6416a4329908fcbb247f1b331.json
index fcccb073e..eafbcb668 100644
--- a/cedar-integration-tests/corpus_tests/58bbf2c87350d4a6416a4329908fcbb247f1b331.json
+++ b/cedar-integration-tests/corpus_tests/58bbf2c87350d4a6416a4329908fcbb247f1b331.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{5}\\u{15}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}\\u{15}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005\u0015\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005\u0015\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{5}\\u{15}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005\u0015\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{5}\\u{15}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005\u0015\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/58dfe227a7493baf3168cb5e148ea5c85de96139.json b/cedar-integration-tests/corpus_tests/58dfe227a7493baf3168cb5e148ea5c85de96139.json
index 38143ce09..ee012d6a6 100644
--- a/cedar-integration-tests/corpus_tests/58dfe227a7493baf3168cb5e148ea5c85de96139.json
+++ b/cedar-integration-tests/corpus_tests/58dfe227a7493baf3168cb5e148ea5c85de96139.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "\u0000\u0000::::::"
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/5913ef210c552e84809af769a1f426379fe1090c.json b/cedar-integration-tests/corpus_tests/5913ef210c552e84809af769a1f426379fe1090c.json
index 271a3e2d6..4135d07c8 100644
--- a/cedar-integration-tests/corpus_tests/5913ef210c552e84809af769a1f426379fe1090c.json
+++ b/cedar-integration-tests/corpus_tests/5913ef210c552e84809af769a1f426379fe1090c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"acTi\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "acTi"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"acTi\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "acTi"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"acTi\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "acTi"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/59199c03f45c37423e486ab414eb6eb5288ef00b.json b/cedar-integration-tests/corpus_tests/59199c03f45c37423e486ab414eb6eb5288ef00b.json
index 70b98f49e..9f35380ff 100644
--- a/cedar-integration-tests/corpus_tests/59199c03f45c37423e486ab414eb6eb5288ef00b.json
+++ b/cedar-integration-tests/corpus_tests/59199c03f45c37423e486ab414eb6eb5288ef00b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Fwwwww::a::\"ff\\u{c}\\u{c}\\u{c}\\u{c}\"",
-      "action": "Fwwwww::Action::\"action\"",
-      "resource": "Fwwwww::a::\"ff\\u{c}\\u{c}\\u{c}\\u{c}\"",
+      "principal": {
+        "type": "Fwwwww::a",
+        "id": "ff\f\f\f\f"
+      },
+      "resource": {
+        "type": "Fwwwww::a",
+        "id": "ff\f\f\f\f"
+      },
+      "action": {
+        "type": "Fwwwww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Fwwwww::a::\"ff\\u{c}\\u{c}\\u{c}\\u{c}\"",
-      "action": "Fwwwww::Action::\"action\"",
-      "resource": "Fwwwww::a::\"ff\\u{c}\\u{c}\\u{c}\\u{c}\"",
+      "principal": {
+        "type": "Fwwwww::a",
+        "id": "ff\f\f\f\f"
+      },
+      "resource": {
+        "type": "Fwwwww::a",
+        "id": "ff\f\f\f\f"
+      },
+      "action": {
+        "type": "Fwwwww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Fwwwww::a::\"ff\\u{c}\\u{c}\\u{c}\\u{c}\"",
-      "action": "Fwwwww::Action::\"action\"",
-      "resource": "Fwwwww::a::\"ff\\u{c}\\u{c}\\u{c}\\u{c}\"",
+      "principal": {
+        "type": "Fwwwww::a",
+        "id": "ff\f\f\f\f"
+      },
+      "resource": {
+        "type": "Fwwwww::a",
+        "id": "ff\f\f\f\f"
+      },
+      "action": {
+        "type": "Fwwwww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Fwwwww::a::\"ff\\u{c}\\u{c}\\u{c}\\u{c}\"",
-      "action": "Fwwwww::Action::\"action\"",
-      "resource": "Fwwwww::a::\"ff\\u{c}\\u{c}\\u{c}\\u{c}\"",
+      "principal": {
+        "type": "Fwwwww::a",
+        "id": "ff\f\f\f\f"
+      },
+      "resource": {
+        "type": "Fwwwww::a",
+        "id": "ff\f\f\f\f"
+      },
+      "action": {
+        "type": "Fwwwww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Fwwwww::a::\"ff\\u{c}\\u{c}\\u{c}\\u{c}\"",
-      "action": "Fwwwww::Action::\"action\"",
-      "resource": "Fwwwww::a::\"ff\\u{c}\\u{c}\\u{c}\\u{c}\"",
+      "principal": {
+        "type": "Fwwwww::a",
+        "id": "ff\f\f\f\f"
+      },
+      "resource": {
+        "type": "Fwwwww::a",
+        "id": "ff\f\f\f\f"
+      },
+      "action": {
+        "type": "Fwwwww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Fwwwww::a::\"ff\\u{c}\\u{c}\\u{c}\\u{c}\"",
-      "action": "Fwwwww::Action::\"action\"",
-      "resource": "Fwwwww::a::\"ff\\u{c}\\u{c}\\u{c}\\u{c}\"",
+      "principal": {
+        "type": "Fwwwww::a",
+        "id": "ff\f\f\f\f"
+      },
+      "resource": {
+        "type": "Fwwwww::a",
+        "id": "ff\f\f\f\f"
+      },
+      "action": {
+        "type": "Fwwwww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Fwwwww::a::\"ff\\u{c}\\u{c}\\u{c}\\u{c}\"",
-      "action": "Fwwwww::Action::\"action\"",
-      "resource": "Fwwwww::a::\"ff\\u{c}\\u{c}\\u{c}\\u{c}\"",
+      "principal": {
+        "type": "Fwwwww::a",
+        "id": "ff\f\f\f\f"
+      },
+      "resource": {
+        "type": "Fwwwww::a",
+        "id": "ff\f\f\f\f"
+      },
+      "action": {
+        "type": "Fwwwww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Fwwwww::a::\"ff\\u{c}\\u{c}\\u{c}\\u{c}\"",
-      "action": "Fwwwww::Action::\"action\"",
-      "resource": "Fwwwww::a::\"ff\\u{c}\\u{c}\\u{c}\\u{c}\"",
+      "principal": {
+        "type": "Fwwwww::a",
+        "id": "ff\f\f\f\f"
+      },
+      "resource": {
+        "type": "Fwwwww::a",
+        "id": "ff\f\f\f\f"
+      },
+      "action": {
+        "type": "Fwwwww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/592cda16bc312a956945e93d2cbdc8024f09afd4.json b/cedar-integration-tests/corpus_tests/592cda16bc312a956945e93d2cbdc8024f09afd4.json
index 3bedce368..6f72bf801 100644
--- a/cedar-integration-tests/corpus_tests/592cda16bc312a956945e93d2cbdc8024f09afd4.json
+++ b/cedar-integration-tests/corpus_tests/592cda16bc312a956945e93d2cbdc8024f09afd4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/5957f6406f64415729cbdfb64df1aed9e55091aa.json b/cedar-integration-tests/corpus_tests/5957f6406f64415729cbdfb64df1aed9e55091aa.json
index e8397ca45..100481018 100644
--- a/cedar-integration-tests/corpus_tests/5957f6406f64415729cbdfb64df1aed9e55091aa.json
+++ b/cedar-integration-tests/corpus_tests/5957f6406f64415729cbdfb64df1aed9e55091aa.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"(0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": "(0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"(0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": "(0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"(0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": "(0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"(0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": "(0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"(0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": "(0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"(0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": "(0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"(0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": "(0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/595d053969ab751cfa9df38e096805ffcafb1e2d.json b/cedar-integration-tests/corpus_tests/595d053969ab751cfa9df38e096805ffcafb1e2d.json
index 0bed18bdc..dc66985cd 100644
--- a/cedar-integration-tests/corpus_tests/595d053969ab751cfa9df38e096805ffcafb1e2d.json
+++ b/cedar-integration-tests/corpus_tests/595d053969ab751cfa9df38e096805ffcafb1e2d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "KAxx0xn::a::\"\"",
-      "action": "KAxx0xn::Action::\"\\tzzz~z2zzz\"",
-      "resource": "KAxx0xn::a::\"\"",
+      "principal": {
+        "type": "KAxx0xn::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "KAxx0xn::a",
+        "id": ""
+      },
+      "action": {
+        "type": "KAxx0xn::Action",
+        "id": "\tzzz~z2zzz"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "KAxx0xn::a::\"\"",
-      "action": "KAxx0xn::Action::\"\\tzzz~z2zzz\"",
-      "resource": "KAxx0xn::a::\"\"",
+      "principal": {
+        "type": "KAxx0xn::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "KAxx0xn::a",
+        "id": ""
+      },
+      "action": {
+        "type": "KAxx0xn::Action",
+        "id": "\tzzz~z2zzz"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "KAxx0xn::a::\"\"",
-      "action": "KAxx0xn::Action::\"\\tzzz~z2zzz\"",
-      "resource": "KAxx0xn::a::\"\"",
+      "principal": {
+        "type": "KAxx0xn::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "KAxx0xn::a",
+        "id": ""
+      },
+      "action": {
+        "type": "KAxx0xn::Action",
+        "id": "\tzzz~z2zzz"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "KAxx0xn::a::\"\"",
-      "action": "KAxx0xn::Action::\"\\tzzz~z2zzz\"",
-      "resource": "KAxx0xn::a::\"\"",
+      "principal": {
+        "type": "KAxx0xn::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "KAxx0xn::a",
+        "id": ""
+      },
+      "action": {
+        "type": "KAxx0xn::Action",
+        "id": "\tzzz~z2zzz"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "KAxx0xn::a::\"\"",
-      "action": "KAxx0xn::Action::\"\\tzzz~z2zzz\"",
-      "resource": "KAxx0xn::a::\"\"",
+      "principal": {
+        "type": "KAxx0xn::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "KAxx0xn::a",
+        "id": ""
+      },
+      "action": {
+        "type": "KAxx0xn::Action",
+        "id": "\tzzz~z2zzz"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "KAxx0xn::a::\"\"",
-      "action": "KAxx0xn::Action::\"\\tzzz~z2zzz\"",
-      "resource": "KAxx0xn::a::\"\"",
+      "principal": {
+        "type": "KAxx0xn::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "KAxx0xn::a",
+        "id": ""
+      },
+      "action": {
+        "type": "KAxx0xn::Action",
+        "id": "\tzzz~z2zzz"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "KAxx0xn::a::\"\"",
-      "action": "KAxx0xn::Action::\"\\tzzz~z2zzz\"",
-      "resource": "KAxx0xn::a::\"\"",
+      "principal": {
+        "type": "KAxx0xn::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "KAxx0xn::a",
+        "id": ""
+      },
+      "action": {
+        "type": "KAxx0xn::Action",
+        "id": "\tzzz~z2zzz"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "KAxx0xn::a::\"\"",
-      "action": "KAxx0xn::Action::\"\\tzzz~z2zzz\"",
-      "resource": "KAxx0xn::a::\"\"",
+      "principal": {
+        "type": "KAxx0xn::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "KAxx0xn::a",
+        "id": ""
+      },
+      "action": {
+        "type": "KAxx0xn::Action",
+        "id": "\tzzz~z2zzz"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/59747d78d2a6fbaf05198b9519d2004fc922ecee.json b/cedar-integration-tests/corpus_tests/59747d78d2a6fbaf05198b9519d2004fc922ecee.json
index 173b343bd..c0bf382e8 100644
--- a/cedar-integration-tests/corpus_tests/59747d78d2a6fbaf05198b9519d2004fc922ecee.json
+++ b/cedar-integration-tests/corpus_tests/59747d78d2a6fbaf05198b9519d2004fc922ecee.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/59b40ee189078376c726568c27559ab1dd4439c2.json b/cedar-integration-tests/corpus_tests/59b40ee189078376c726568c27559ab1dd4439c2.json
index e4790526e..7e7c41181 100644
--- a/cedar-integration-tests/corpus_tests/59b40ee189078376c726568c27559ab1dd4439c2.json
+++ b/cedar-integration-tests/corpus_tests/59b40ee189078376c726568c27559ab1dd4439c2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"1\\06609-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\\06609-\"",
+      "principal": {
+        "type": "a",
+        "id": "1\u00006609-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1\u00006609-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"1\\06609-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\\06609-\"",
+      "principal": {
+        "type": "a",
+        "id": "1\u00006609-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1\u00006609-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"1\\06609-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\\06609-\"",
+      "principal": {
+        "type": "a",
+        "id": "1\u00006609-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1\u00006609-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"1\\06609-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\\06609-\"",
+      "principal": {
+        "type": "a",
+        "id": "1\u00006609-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1\u00006609-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"1\\06609-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\\06609-\"",
+      "principal": {
+        "type": "a",
+        "id": "1\u00006609-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1\u00006609-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"1\\06609-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\\06609-\"",
+      "principal": {
+        "type": "a",
+        "id": "1\u00006609-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1\u00006609-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"1\\06609-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\\06609-\"",
+      "principal": {
+        "type": "a",
+        "id": "1\u00006609-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1\u00006609-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"1\\06609-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\\06609-\"",
+      "principal": {
+        "type": "a",
+        "id": "1\u00006609-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1\u00006609-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/59c2e62a63ec7159ac56cccc6f6ea6a218cff77b.json b/cedar-integration-tests/corpus_tests/59c2e62a63ec7159ac56cccc6f6ea6a218cff77b.json
index bd75b539f..104073565 100644
--- a/cedar-integration-tests/corpus_tests/59c2e62a63ec7159ac56cccc6f6ea6a218cff77b.json
+++ b/cedar-integration-tests/corpus_tests/59c2e62a63ec7159ac56cccc6f6ea6a218cff77b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "R::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "RH::\"\"",
+      "principal": {
+        "type": "R",
+        "id": ""
+      },
+      "resource": {
+        "type": "RH",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "R::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "RH::\"\"",
+      "principal": {
+        "type": "R",
+        "id": ""
+      },
+      "resource": {
+        "type": "RH",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "R::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "RH::\"\"",
+      "principal": {
+        "type": "R",
+        "id": ""
+      },
+      "resource": {
+        "type": "RH",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "R::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "RH::\"\"",
+      "principal": {
+        "type": "R",
+        "id": ""
+      },
+      "resource": {
+        "type": "RH",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "R::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "RH::\"\"",
+      "principal": {
+        "type": "R",
+        "id": ""
+      },
+      "resource": {
+        "type": "RH",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "R::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "RH::\"\"",
+      "principal": {
+        "type": "R",
+        "id": ""
+      },
+      "resource": {
+        "type": "RH",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "R::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "RH::\"\"",
+      "principal": {
+        "type": "R",
+        "id": ""
+      },
+      "resource": {
+        "type": "RH",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "R::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "RH::\"\"",
+      "principal": {
+        "type": "R",
+        "id": ""
+      },
+      "resource": {
+        "type": "RH",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/59d4496d037a943c75c566696badf47230b3f99a.json b/cedar-integration-tests/corpus_tests/59d4496d037a943c75c566696badf47230b3f99a.json
index 94a94edee..fcab82e87 100644
--- a/cedar-integration-tests/corpus_tests/59d4496d037a943c75c566696badf47230b3f99a.json
+++ b/cedar-integration-tests/corpus_tests/59d4496d037a943c75c566696badf47230b3f99a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::Fwwgww::r::FwgwwM_w::r::a::\"\"",
-      "action": "r::Fwwgww::r::FwgwwM_w::r::Action::\"action\"",
-      "resource": "r::Fwwgww::r::FwgwwM_w::r::a::\"\"",
+      "principal": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::Action",
+        "id": "action"
+      },
       "context": {
         "c38G0000000": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::Fwwgww::r::FwgwwM_w::r::a::\"\"",
-      "action": "r::Fwwgww::r::FwgwwM_w::r::Action::\"action\"",
-      "resource": "r::Fwwgww::r::FwgwwM_w::r::a::\"\"",
+      "principal": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::Action",
+        "id": "action"
+      },
       "context": {
         "c38G0000000": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::Fwwgww::r::FwgwwM_w::r::a::\"\"",
-      "action": "r::Fwwgww::r::FwgwwM_w::r::Action::\"action\"",
-      "resource": "r::Fwwgww::r::FwgwwM_w::r::a::\"\"",
+      "principal": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::Action",
+        "id": "action"
+      },
       "context": {
         "c38G0000000": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::Fwwgww::r::FwgwwM_w::r::a::\"\"",
-      "action": "r::Fwwgww::r::FwgwwM_w::r::Action::\"action\"",
-      "resource": "r::Fwwgww::r::FwgwwM_w::r::a::\"\"",
+      "principal": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::Action",
+        "id": "action"
+      },
       "context": {
         "c38G0000000": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::Fwwgww::r::FwgwwM_w::r::a::\"\"",
-      "action": "r::Fwwgww::r::FwgwwM_w::r::Action::\"action\"",
-      "resource": "r::Fwwgww::r::FwgwwM_w::r::a::\"\"",
+      "principal": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::Action",
+        "id": "action"
+      },
       "context": {
         "c38G0000000": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::Fwwgww::r::FwgwwM_w::r::a::\"\"",
-      "action": "r::Fwwgww::r::FwgwwM_w::r::Action::\"action\"",
-      "resource": "r::Fwwgww::r::FwgwwM_w::r::a::\"\"",
+      "principal": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::Action",
+        "id": "action"
+      },
       "context": {
         "c38G0000000": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::Fwwgww::r::FwgwwM_w::r::a::\"\"",
-      "action": "r::Fwwgww::r::FwgwwM_w::r::Action::\"action\"",
-      "resource": "r::Fwwgww::r::FwgwwM_w::r::a::\"\"",
+      "principal": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::Action",
+        "id": "action"
+      },
       "context": {
         "c38G0000000": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::Fwwgww::r::FwgwwM_w::r::a::\"\"",
-      "action": "r::Fwwgww::r::FwgwwM_w::r::Action::\"action\"",
-      "resource": "r::Fwwgww::r::FwgwwM_w::r::a::\"\"",
+      "principal": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Fwwgww::r::FwgwwM_w::r::Action",
+        "id": "action"
+      },
       "context": {
         "c38G0000000": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/5a21934d3b7aac23efbac0239b70091420e324d0.json b/cedar-integration-tests/corpus_tests/5a21934d3b7aac23efbac0239b70091420e324d0.json
index 746306915..9388829fa 100644
--- a/cedar-integration-tests/corpus_tests/5a21934d3b7aac23efbac0239b70091420e324d0.json
+++ b/cedar-integration-tests/corpus_tests/5a21934d3b7aac23efbac0239b70091420e324d0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "AYrdlcwl::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "AYrdlcwl::\":\"",
+      "principal": {
+        "type": "AYrdlcwl",
+        "id": ""
+      },
+      "resource": {
+        "type": "AYrdlcwl",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "AYrdlcwl::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "AYrdlcwl::\":\"",
+      "principal": {
+        "type": "AYrdlcwl",
+        "id": ":"
+      },
+      "resource": {
+        "type": "AYrdlcwl",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "AYrdlcwl::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "AYrdlcwl::\":\"",
+      "principal": {
+        "type": "AYrdlcwl",
+        "id": ":"
+      },
+      "resource": {
+        "type": "AYrdlcwl",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "AYrdlcwl::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "AYrdlcwl::\":\"",
+      "principal": {
+        "type": "AYrdlcwl",
+        "id": ":"
+      },
+      "resource": {
+        "type": "AYrdlcwl",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "AYrdlcwl::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "AYrdlcwl::\":\"",
+      "principal": {
+        "type": "AYrdlcwl",
+        "id": ":"
+      },
+      "resource": {
+        "type": "AYrdlcwl",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "AYrdlcwl::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "AYrdlcwl::\":\"",
+      "principal": {
+        "type": "AYrdlcwl",
+        "id": ":"
+      },
+      "resource": {
+        "type": "AYrdlcwl",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "AYrdlcwl::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "AYrdlcwl::\":\"",
+      "principal": {
+        "type": "AYrdlcwl",
+        "id": ":"
+      },
+      "resource": {
+        "type": "AYrdlcwl",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "AYrdlcwl::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "AYrdlcwl::\":\"",
+      "principal": {
+        "type": "AYrdlcwl",
+        "id": ":"
+      },
+      "resource": {
+        "type": "AYrdlcwl",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5a241e36a01f47a8b6a069a0bac82efe0b926571.json b/cedar-integration-tests/corpus_tests/5a241e36a01f47a8b6a069a0bac82efe0b926571.json
index a68ff0900..127d26524 100644
--- a/cedar-integration-tests/corpus_tests/5a241e36a01f47a8b6a069a0bac82efe0b926571.json
+++ b/cedar-integration-tests/corpus_tests/5a241e36a01f47a8b6a069a0bac82efe0b926571.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5a2dc81292f0d8dbcf7f8150459c4d62dd9a7841.json b/cedar-integration-tests/corpus_tests/5a2dc81292f0d8dbcf7f8150459c4d62dd9a7841.json
index 469148449..10dd885e2 100644
--- a/cedar-integration-tests/corpus_tests/5a2dc81292f0d8dbcf7f8150459c4d62dd9a7841.json
+++ b/cedar-integration-tests/corpus_tests/5a2dc81292f0d8dbcf7f8150459c4d62dd9a7841.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "q::a::\"\\0\"",
-      "action": "q::Action::\"action\"",
-      "resource": "q::a::\"\\0\"",
+      "principal": {
+        "type": "q::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "q::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "q::a::\"\\0\"",
-      "action": "q::Action::\"action\"",
-      "resource": "q::a::\"\\0\"",
+      "principal": {
+        "type": "q::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "q::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "q::a::\"\\0\"",
-      "action": "q::Action::\"action\"",
-      "resource": "q::a::\"\\0\"",
+      "principal": {
+        "type": "q::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "q::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "q::a::\"\\0\"",
-      "action": "q::Action::\"action\"",
-      "resource": "q::a::\"\\0\"",
+      "principal": {
+        "type": "q::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "q::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "q::a::\"\\0\"",
-      "action": "q::Action::\"action\"",
-      "resource": "q::a::\"\\0\"",
+      "principal": {
+        "type": "q::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "q::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "q::a::\"\\0\"",
-      "action": "q::Action::\"action\"",
-      "resource": "q::a::\"\\0\"",
+      "principal": {
+        "type": "q::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "q::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "q::a::\"\\0\"",
-      "action": "q::Action::\"action\"",
-      "resource": "q::a::\"\\0\"",
+      "principal": {
+        "type": "q::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "q::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "q::a::\"\\0\"",
-      "action": "q::Action::\"action\"",
-      "resource": "q::a::\"\\0\"",
+      "principal": {
+        "type": "q::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "q::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/5a5458bd79d848abfeaaf047832375983b281840.json b/cedar-integration-tests/corpus_tests/5a5458bd79d848abfeaaf047832375983b281840.json
index 2bde67216..754ae636d 100644
--- a/cedar-integration-tests/corpus_tests/5a5458bd79d848abfeaaf047832375983b281840.json
+++ b/cedar-integration-tests/corpus_tests/5a5458bd79d848abfeaaf047832375983b281840.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5a6109ea615dc3004acbb62b10c847905ae6b4e3.json b/cedar-integration-tests/corpus_tests/5a6109ea615dc3004acbb62b10c847905ae6b4e3.json
index e9814c03d..72c17b812 100644
--- a/cedar-integration-tests/corpus_tests/5a6109ea615dc3004acbb62b10c847905ae6b4e3.json
+++ b/cedar-integration-tests/corpus_tests/5a6109ea615dc3004acbb62b10c847905ae6b4e3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5a923b61d2d547463f4acc82290a4546c43a1f62.json b/cedar-integration-tests/corpus_tests/5a923b61d2d547463f4acc82290a4546c43a1f62.json
index 19d31a08c..8c0347418 100644
--- a/cedar-integration-tests/corpus_tests/5a923b61d2d547463f4acc82290a4546c43a1f62.json
+++ b/cedar-integration-tests/corpus_tests/5a923b61d2d547463f4acc82290a4546c43a1f62.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/5ad5af43be1829c480ff5a68e7e014a5dc1668b8.json b/cedar-integration-tests/corpus_tests/5ad5af43be1829c480ff5a68e7e014a5dc1668b8.json
index 96be4c69d..1e81d677d 100644
--- a/cedar-integration-tests/corpus_tests/5ad5af43be1829c480ff5a68e7e014a5dc1668b8.json
+++ b/cedar-integration-tests/corpus_tests/5ad5af43be1829c480ff5a68e7e014a5dc1668b8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"+ier\\\\\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "+ier\\\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/5adb971dbb6de269470eb3f39f016ee6c86e3a3d.json b/cedar-integration-tests/corpus_tests/5adb971dbb6de269470eb3f39f016ee6c86e3a3d.json
index 00435392a..489edf3d8 100644
--- a/cedar-integration-tests/corpus_tests/5adb971dbb6de269470eb3f39f016ee6c86e3a3d.json
+++ b/cedar-integration-tests/corpus_tests/5adb971dbb6de269470eb3f39f016ee6c86e3a3d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/5b40ceb430b87a6433ab7e2ea69ee5b51243d21f.json b/cedar-integration-tests/corpus_tests/5b40ceb430b87a6433ab7e2ea69ee5b51243d21f.json
index e098ae92a..a59665f69 100644
--- a/cedar-integration-tests/corpus_tests/5b40ceb430b87a6433ab7e2ea69ee5b51243d21f.json
+++ b/cedar-integration-tests/corpus_tests/5b40ceb430b87a6433ab7e2ea69ee5b51243d21f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/5b426cc601268dd506e394ef2ab467a302267409.json b/cedar-integration-tests/corpus_tests/5b426cc601268dd506e394ef2ab467a302267409.json
index b70542f1b..6f541d96f 100644
--- a/cedar-integration-tests/corpus_tests/5b426cc601268dd506e394ef2ab467a302267409.json
+++ b/cedar-integration-tests/corpus_tests/5b426cc601268dd506e394ef2ab467a302267409.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/5b4a30d31760d8352c69bd9de176eff0f3e102c4.json b/cedar-integration-tests/corpus_tests/5b4a30d31760d8352c69bd9de176eff0f3e102c4.json
index 893625d81..5ba970d94 100644
--- a/cedar-integration-tests/corpus_tests/5b4a30d31760d8352c69bd9de176eff0f3e102c4.json
+++ b/cedar-integration-tests/corpus_tests/5b4a30d31760d8352c69bd9de176eff0f3e102c4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5b53a9d55eee49d43010321b95a98f3f9a30e2db.json b/cedar-integration-tests/corpus_tests/5b53a9d55eee49d43010321b95a98f3f9a30e2db.json
index 9a1c6421b..49eb63529 100644
--- a/cedar-integration-tests/corpus_tests/5b53a9d55eee49d43010321b95a98f3f9a30e2db.json
+++ b/cedar-integration-tests/corpus_tests/5b53a9d55eee49d43010321b95a98f3f9a30e2db.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0010\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0010\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{10}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0010\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0010\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{10}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0010\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0010\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{10}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0010\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0010\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{10}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0010\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0010\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{10}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0010\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0010\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{10}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0010\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0010\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/5b9577df7eb687cac8e595257a72cd5d1fd670f1.json b/cedar-integration-tests/corpus_tests/5b9577df7eb687cac8e595257a72cd5d1fd670f1.json
index 480c42a4a..410f3236b 100644
--- a/cedar-integration-tests/corpus_tests/5b9577df7eb687cac8e595257a72cd5d1fd670f1.json
+++ b/cedar-integration-tests/corpus_tests/5b9577df7eb687cac8e595257a72cd5d1fd670f1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/5bd0c468b9d2c31ce3ad1f639ce3f2324b3aaf1e.json b/cedar-integration-tests/corpus_tests/5bd0c468b9d2c31ce3ad1f639ce3f2324b3aaf1e.json
index de08786a2..706fcf342 100644
--- a/cedar-integration-tests/corpus_tests/5bd0c468b9d2c31ce3ad1f639ce3f2324b3aaf1e.json
+++ b/cedar-integration-tests/corpus_tests/5bd0c468b9d2c31ce3ad1f639ce3f2324b3aaf1e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5c1097484e8cf6f246daa0d48fd046328f5cfb41.json b/cedar-integration-tests/corpus_tests/5c1097484e8cf6f246daa0d48fd046328f5cfb41.json
index 7e7558c11..f52a25652 100644
--- a/cedar-integration-tests/corpus_tests/5c1097484e8cf6f246daa0d48fd046328f5cfb41.json
+++ b/cedar-integration-tests/corpus_tests/5c1097484e8cf6f246daa0d48fd046328f5cfb41.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0]\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000]\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0]\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000]\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0]\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000]\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0]\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0]\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000]\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000]\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0]\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0]\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000]\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000]\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0]\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0]\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000]\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000]\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0]\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0]\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000]\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000]\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0]\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0]\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000]\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000]\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5c15f0c7b573e2a15e5581185cd6874f01d9da7f.json b/cedar-integration-tests/corpus_tests/5c15f0c7b573e2a15e5581185cd6874f01d9da7f.json
index a0f561126..2dc31755e 100644
--- a/cedar-integration-tests/corpus_tests/5c15f0c7b573e2a15e5581185cd6874f01d9da7f.json
+++ b/cedar-integration-tests/corpus_tests/5c15f0c7b573e2a15e5581185cd6874f01d9da7f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "O::\"F\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"F\"",
+      "principal": {
+        "type": "O",
+        "id": "F"
+      },
+      "resource": {
+        "type": "O",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "O::\"F\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"F\"",
+      "principal": {
+        "type": "O",
+        "id": "F"
+      },
+      "resource": {
+        "type": "O",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "O::\"F\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"F\"",
+      "principal": {
+        "type": "O",
+        "id": "F"
+      },
+      "resource": {
+        "type": "O",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "O::\"F\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"F\"",
+      "principal": {
+        "type": "O",
+        "id": "F"
+      },
+      "resource": {
+        "type": "O",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "O::\"F\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"F\"",
+      "principal": {
+        "type": "O",
+        "id": "F"
+      },
+      "resource": {
+        "type": "O",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "O::\"F\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"F\"",
+      "principal": {
+        "type": "O",
+        "id": "F"
+      },
+      "resource": {
+        "type": "O",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "O::\"F\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"F\"",
+      "principal": {
+        "type": "O",
+        "id": "F"
+      },
+      "resource": {
+        "type": "O",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "O::\"F\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"F\"",
+      "principal": {
+        "type": "O",
+        "id": "F"
+      },
+      "resource": {
+        "type": "O",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5c2e65275c8bebc22d36a958acbb1651fa208b11.json b/cedar-integration-tests/corpus_tests/5c2e65275c8bebc22d36a958acbb1651fa208b11.json
index c5e14790c..a158f7b4f 100644
--- a/cedar-integration-tests/corpus_tests/5c2e65275c8bebc22d36a958acbb1651fa208b11.json
+++ b/cedar-integration-tests/corpus_tests/5c2e65275c8bebc22d36a958acbb1651fa208b11.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/5ca000e7f1540ba4c90f6a110288612212e12707.json b/cedar-integration-tests/corpus_tests/5ca000e7f1540ba4c90f6a110288612212e12707.json
index 2e24eb1ba..d354e147b 100644
--- a/cedar-integration-tests/corpus_tests/5ca000e7f1540ba4c90f6a110288612212e12707.json
+++ b/cedar-integration-tests/corpus_tests/5ca000e7f1540ba4c90f6a110288612212e12707.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/5caded9418e07bbbbee532c7a270313a941c12c3.json b/cedar-integration-tests/corpus_tests/5caded9418e07bbbbee532c7a270313a941c12c3.json
index 8dd772fff..0bfecbd0d 100644
--- a/cedar-integration-tests/corpus_tests/5caded9418e07bbbbee532c7a270313a941c12c3.json
+++ b/cedar-integration-tests/corpus_tests/5caded9418e07bbbbee532c7a270313a941c12c3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::m::r::a::\"\"",
-      "action": "r::m::r::Action::\"action\"",
-      "resource": "r::m::r::a::\"\"",
+      "principal": {
+        "type": "r::m::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::m::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::m::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::m::r::a::\"\\u{7f}\\u{1}\"",
-      "action": "r::m::r::Action::\"action\"",
-      "resource": "r::m::r::a::\"\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "r::m::r::a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "r::m::r::a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "r::m::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::m::r::a::\"\\u{7f}\\u{1}\"",
-      "action": "r::m::r::Action::\"action\"",
-      "resource": "r::m::r::a::\"\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "r::m::r::a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "r::m::r::a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "r::m::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::m::r::a::\"\\u{7f}\\u{1}\"",
-      "action": "r::m::r::Action::\"action\"",
-      "resource": "r::m::r::a::\"\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "r::m::r::a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "r::m::r::a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "r::m::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::m::r::a::\"\\u{7f}\\u{1}\"",
-      "action": "r::m::r::Action::\"action\"",
-      "resource": "r::m::r::a::\"\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "r::m::r::a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "r::m::r::a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "r::m::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::m::r::a::\"\\u{7f}\\u{1}\"",
-      "action": "r::m::r::Action::\"action\"",
-      "resource": "r::m::r::a::\"\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "r::m::r::a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "r::m::r::a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "r::m::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::m::r::a::\"\\u{7f}\\u{1}\"",
-      "action": "r::m::r::Action::\"action\"",
-      "resource": "r::m::r::a::\"\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "r::m::r::a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "r::m::r::a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "r::m::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::m::r::a::\"\\u{7f}\\u{1}\"",
-      "action": "r::m::r::Action::\"action\"",
-      "resource": "r::m::r::a::\"\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "r::m::r::a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "r::m::r::a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "r::m::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/5d14d9f3cd916cbfb24b2847d264e5d26ea36026.json b/cedar-integration-tests/corpus_tests/5d14d9f3cd916cbfb24b2847d264e5d26ea36026.json
index 2837a0564..83f6fd227 100644
--- a/cedar-integration-tests/corpus_tests/5d14d9f3cd916cbfb24b2847d264e5d26ea36026.json
+++ b/cedar-integration-tests/corpus_tests/5d14d9f3cd916cbfb24b2847d264e5d26ea36026.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/5da8c2597f35cff88479a9c34c7ee20f6afc3525.json b/cedar-integration-tests/corpus_tests/5da8c2597f35cff88479a9c34c7ee20f6afc3525.json
index a3e633e19..a0de3f44d 100644
--- a/cedar-integration-tests/corpus_tests/5da8c2597f35cff88479a9c34c7ee20f6afc3525.json
+++ b/cedar-integration-tests/corpus_tests/5da8c2597f35cff88479a9c34c7ee20f6afc3525.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "B::\"\"",
-      "action": "Action::\"\\u{1b}\\u{1b}\"",
-      "resource": "B::\"\"",
+      "principal": {
+        "type": "B",
+        "id": ""
+      },
+      "resource": {
+        "type": "B",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u001b\u001b"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "B::\"\"",
-      "action": "Action::\"\\u{1b}\\u{1b}\"",
-      "resource": "B::\"\"",
+      "principal": {
+        "type": "B",
+        "id": ""
+      },
+      "resource": {
+        "type": "B",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u001b\u001b"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "B::\"\"",
-      "action": "Action::\"\\u{1b}\\u{1b}\"",
-      "resource": "B::\"\"",
+      "principal": {
+        "type": "B",
+        "id": ""
+      },
+      "resource": {
+        "type": "B",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u001b\u001b"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "B::\"\"",
-      "action": "Action::\"\\u{1b}\\u{1b}\"",
-      "resource": "B::\"\"",
+      "principal": {
+        "type": "B",
+        "id": ""
+      },
+      "resource": {
+        "type": "B",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u001b\u001b"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "B::\"\"",
-      "action": "Action::\"\\u{1b}\\u{1b}\"",
-      "resource": "B::\"\"",
+      "principal": {
+        "type": "B",
+        "id": ""
+      },
+      "resource": {
+        "type": "B",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u001b\u001b"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "B::\"\"",
-      "action": "Action::\"\\u{1b}\\u{1b}\"",
-      "resource": "B::\"\"",
+      "principal": {
+        "type": "B",
+        "id": ""
+      },
+      "resource": {
+        "type": "B",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u001b\u001b"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "B::\"\"",
-      "action": "Action::\"\\u{1b}\\u{1b}\"",
-      "resource": "B::\"\"",
+      "principal": {
+        "type": "B",
+        "id": ""
+      },
+      "resource": {
+        "type": "B",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u001b\u001b"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "B::\"\"",
-      "action": "Action::\"\\u{1b}\\u{1b}\"",
-      "resource": "B::\"\"",
+      "principal": {
+        "type": "B",
+        "id": ""
+      },
+      "resource": {
+        "type": "B",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u001b\u001b"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5dfc5d05bfd5474dd95c05d07eeabf0cef876388.json b/cedar-integration-tests/corpus_tests/5dfc5d05bfd5474dd95c05d07eeabf0cef876388.json
index b2d14a0d9..b0f951a28 100644
--- a/cedar-integration-tests/corpus_tests/5dfc5d05bfd5474dd95c05d07eeabf0cef876388.json
+++ b/cedar-integration-tests/corpus_tests/5dfc5d05bfd5474dd95c05d07eeabf0cef876388.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A000::vdkY0jjjjE::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::vdkY0jjjjE::\"\"",
+      "principal": {
+        "type": "A000::vdkY0jjjjE",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::vdkY0jjjjE",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A000::vdkY0jjjjE::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::vdkY0jjjjE::\"\"",
+      "principal": {
+        "type": "A000::vdkY0jjjjE",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::vdkY0jjjjE",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A000::vdkY0jjjjE::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::vdkY0jjjjE::\"\"",
+      "principal": {
+        "type": "A000::vdkY0jjjjE",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::vdkY0jjjjE",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A000::vdkY0jjjjE::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::vdkY0jjjjE::\"\"",
+      "principal": {
+        "type": "A000::vdkY0jjjjE",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::vdkY0jjjjE",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A000::vdkY0jjjjE::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::vdkY0jjjjE::\"\"",
+      "principal": {
+        "type": "A000::vdkY0jjjjE",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::vdkY0jjjjE",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A000::vdkY0jjjjE::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::vdkY0jjjjE::\"\"",
+      "principal": {
+        "type": "A000::vdkY0jjjjE",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::vdkY0jjjjE",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A000::vdkY0jjjjE::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::vdkY0jjjjE::\"\"",
+      "principal": {
+        "type": "A000::vdkY0jjjjE",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::vdkY0jjjjE",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A000::vdkY0jjjjE::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::vdkY0jjjjE::\"\"",
+      "principal": {
+        "type": "A000::vdkY0jjjjE",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::vdkY0jjjjE",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5e484c7407a82c3fd17fb71f7bc50b4d4c94cd4b.json b/cedar-integration-tests/corpus_tests/5e484c7407a82c3fd17fb71f7bc50b4d4c94cd4b.json
index 1d3851bc2..cb4362a4c 100644
--- a/cedar-integration-tests/corpus_tests/5e484c7407a82c3fd17fb71f7bc50b4d4c94cd4b.json
+++ b/cedar-integration-tests/corpus_tests/5e484c7407a82c3fd17fb71f7bc50b4d4c94cd4b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\u{6}\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0006\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/5e5c448e178db343b9ac195ae32a98c65ab61592.json b/cedar-integration-tests/corpus_tests/5e5c448e178db343b9ac195ae32a98c65ab61592.json
index 75903e333..97ed158fd 100644
--- a/cedar-integration-tests/corpus_tests/5e5c448e178db343b9ac195ae32a98c65ab61592.json
+++ b/cedar-integration-tests/corpus_tests/5e5c448e178db343b9ac195ae32a98c65ab61592.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "cP::v::Qx::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::v::\"\"",
+      "principal": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::v",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "cP::v::Qx::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::v::\"\"",
+      "principal": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::v",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "cP::v::Qx::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::v::\"\"",
+      "principal": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::v",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "cP::v::Qx::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::v::\"\"",
+      "principal": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::v",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "cP::v::Qx::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::v::\"\"",
+      "principal": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::v",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "cP::v::Qx::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::v::\"\"",
+      "principal": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::v",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "cP::v::Qx::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::v::\"\"",
+      "principal": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::v",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "cP::v::Qx::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::v::\"\"",
+      "principal": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::v",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5e75403e4dd3959be0326292d1070386da5a1e37.json b/cedar-integration-tests/corpus_tests/5e75403e4dd3959be0326292d1070386da5a1e37.json
index 9ff6967a5..c36a2363d 100644
--- a/cedar-integration-tests/corpus_tests/5e75403e4dd3959be0326292d1070386da5a1e37.json
+++ b/cedar-integration-tests/corpus_tests/5e75403e4dd3959be0326292d1070386da5a1e37.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}s\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}s\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}s\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}s\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}s\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}s\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}s\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}s\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/5eba5818ceaeccd6d026f5ea287d848e1d47e04d.json b/cedar-integration-tests/corpus_tests/5eba5818ceaeccd6d026f5ea287d848e1d47e04d.json
index c80f4b949..1c490df73 100644
--- a/cedar-integration-tests/corpus_tests/5eba5818ceaeccd6d026f5ea287d848e1d47e04d.json
+++ b/cedar-integration-tests/corpus_tests/5eba5818ceaeccd6d026f5ea287d848e1d47e04d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5ed0e1028ef9da7356fec30491cd6aa4dd670ac7.json b/cedar-integration-tests/corpus_tests/5ed0e1028ef9da7356fec30491cd6aa4dd670ac7.json
index 08d98ba5f..ea51a7baa 100644
--- a/cedar-integration-tests/corpus_tests/5ed0e1028ef9da7356fec30491cd6aa4dd670ac7.json
+++ b/cedar-integration-tests/corpus_tests/5ed0e1028ef9da7356fec30491cd6aa4dd670ac7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"rr\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"rr\"",
+      "principal": {
+        "type": "a",
+        "id": "rr"
+      },
+      "resource": {
+        "type": "a",
+        "id": "rr"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"rr\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"rr\"",
+      "principal": {
+        "type": "a",
+        "id": "rr"
+      },
+      "resource": {
+        "type": "a",
+        "id": "rr"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"rrr\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"rrr\"",
+      "principal": {
+        "type": "a",
+        "id": "rrr"
+      },
+      "resource": {
+        "type": "a",
+        "id": "rrr"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"rrr\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"rrr\"",
+      "principal": {
+        "type": "a",
+        "id": "rrr"
+      },
+      "resource": {
+        "type": "a",
+        "id": "rrr"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"rrr\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"rrr\"",
+      "principal": {
+        "type": "a",
+        "id": "rrr"
+      },
+      "resource": {
+        "type": "a",
+        "id": "rrr"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"rrr\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"rrr\"",
+      "principal": {
+        "type": "a",
+        "id": "rrr"
+      },
+      "resource": {
+        "type": "a",
+        "id": "rrr"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"rrr\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"rrr\"",
+      "principal": {
+        "type": "a",
+        "id": "rrr"
+      },
+      "resource": {
+        "type": "a",
+        "id": "rrr"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"rrr\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"rrr\"",
+      "principal": {
+        "type": "a",
+        "id": "rrr"
+      },
+      "resource": {
+        "type": "a",
+        "id": "rrr"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5ee1f9276f5872c28f3003f06fe42996c9977589.json b/cedar-integration-tests/corpus_tests/5ee1f9276f5872c28f3003f06fe42996c9977589.json
index 0abb5996f..3b1319b97 100644
--- a/cedar-integration-tests/corpus_tests/5ee1f9276f5872c28f3003f06fe42996c9977589.json
+++ b/cedar-integration-tests/corpus_tests/5ee1f9276f5872c28f3003f06fe42996c9977589.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/5ee70d8b04c1d3e79596b827b8e74a3313c202af.json b/cedar-integration-tests/corpus_tests/5ee70d8b04c1d3e79596b827b8e74a3313c202af.json
index 0c8cbc3c3..f8f11b709 100644
--- a/cedar-integration-tests/corpus_tests/5ee70d8b04c1d3e79596b827b8e74a3313c202af.json
+++ b/cedar-integration-tests/corpus_tests/5ee70d8b04c1d3e79596b827b8e74a3313c202af.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "U::Gxxxx0033::a::\";\\0\\0\\0\\0\\0\"",
-      "action": "U::Gxxxx0033::Action::\"action\"",
-      "resource": "U::Gxxxx0033::a::\";\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "U::Gxxxx0033::a",
+        "id": ";\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "U::Gxxxx0033::a",
+        "id": ";\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "U::Gxxxx0033::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "U::Gxxxx0033::a::\";\\0\\0\\0\\0\\0\"",
-      "action": "U::Gxxxx0033::Action::\"action\"",
-      "resource": "U::Gxxxx0033::a::\";\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "U::Gxxxx0033::a",
+        "id": ";\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "U::Gxxxx0033::a",
+        "id": ";\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "U::Gxxxx0033::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "U::Gxxxx0033::a::\";\\0\\0\\0\\0\\0\"",
-      "action": "U::Gxxxx0033::Action::\"action\"",
-      "resource": "U::Gxxxx0033::a::\";\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "U::Gxxxx0033::a",
+        "id": ";\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "U::Gxxxx0033::a",
+        "id": ";\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "U::Gxxxx0033::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "U::Gxxxx0033::a::\";\\0\\0\\0\\0\\0\"",
-      "action": "U::Gxxxx0033::Action::\"action\"",
-      "resource": "U::Gxxxx0033::a::\";\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "U::Gxxxx0033::a",
+        "id": ";\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "U::Gxxxx0033::a",
+        "id": ";\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "U::Gxxxx0033::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "U::Gxxxx0033::a::\";\\0\\0\\0\\0\\0\"",
-      "action": "U::Gxxxx0033::Action::\"action\"",
-      "resource": "U::Gxxxx0033::a::\";\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "U::Gxxxx0033::a",
+        "id": ";\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "U::Gxxxx0033::a",
+        "id": ";\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "U::Gxxxx0033::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "U::Gxxxx0033::a::\";\\0\\0\\0\\0\\0\"",
-      "action": "U::Gxxxx0033::Action::\"action\"",
-      "resource": "U::Gxxxx0033::a::\";\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "U::Gxxxx0033::a",
+        "id": ";\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "U::Gxxxx0033::a",
+        "id": ";\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "U::Gxxxx0033::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "U::Gxxxx0033::a::\";\\0\\0\\0\\0\\0\"",
-      "action": "U::Gxxxx0033::Action::\"action\"",
-      "resource": "U::Gxxxx0033::a::\";\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "U::Gxxxx0033::a",
+        "id": ";\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "U::Gxxxx0033::a",
+        "id": ";\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "U::Gxxxx0033::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "U::Gxxxx0033::a::\";\\0\\0\\0\\0\\0\"",
-      "action": "U::Gxxxx0033::Action::\"action\"",
-      "resource": "U::Gxxxx0033::a::\";\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "U::Gxxxx0033::a",
+        "id": ";\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "U::Gxxxx0033::a",
+        "id": ";\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "U::Gxxxx0033::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5f10c65b3670d29e1044f6220de6d98f0b57d8c6.json b/cedar-integration-tests/corpus_tests/5f10c65b3670d29e1044f6220de6d98f0b57d8c6.json
index 695b925f0..a0104bc00 100644
--- a/cedar-integration-tests/corpus_tests/5f10c65b3670d29e1044f6220de6d98f0b57d8c6.json
+++ b/cedar-integration-tests/corpus_tests/5f10c65b3670d29e1044f6220de6d98f0b57d8c6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\t\\0\\0j\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\t\u0000\u0000j\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5f45352ad43448eb478955c2ba900de91d184435.json b/cedar-integration-tests/corpus_tests/5f45352ad43448eb478955c2ba900de91d184435.json
index 6077053d1..0a2f5c789 100644
--- a/cedar-integration-tests/corpus_tests/5f45352ad43448eb478955c2ba900de91d184435.json
+++ b/cedar-integration-tests/corpus_tests/5f45352ad43448eb478955c2ba900de91d184435.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::\":::8>\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\":::8>\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::\":::8>\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\":::8>\"",
+      "principal": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "resource": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::\":::8>\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\":::8>\"",
+      "principal": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "resource": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::\":::8>\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\":::8>\"",
+      "principal": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "resource": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::\":::8>\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\":::8>\"",
+      "principal": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "resource": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::\":::8>\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\":::8>\"",
+      "principal": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "resource": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::\":::8>\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\":::8>\"",
+      "principal": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "resource": {
+        "type": "A",
+        "id": ":::8>"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5f4af38d0d8fb6b81c5accc280487456140799ef.json b/cedar-integration-tests/corpus_tests/5f4af38d0d8fb6b81c5accc280487456140799ef.json
index 8d8f80cf4..3f8a15c6c 100644
--- a/cedar-integration-tests/corpus_tests/5f4af38d0d8fb6b81c5accc280487456140799ef.json
+++ b/cedar-integration-tests/corpus_tests/5f4af38d0d8fb6b81c5accc280487456140799ef.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"(\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "("
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"(\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "("
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"(\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "("
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"(\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "("
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"(\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "("
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"(\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "("
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"(\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "("
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"(\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "("
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5f6aa37dca1d195c21ff22ba1d1b37fffc70a8e1.json b/cedar-integration-tests/corpus_tests/5f6aa37dca1d195c21ff22ba1d1b37fffc70a8e1.json
index 293aac97a..5dd7feae8 100644
--- a/cedar-integration-tests/corpus_tests/5f6aa37dca1d195c21ff22ba1d1b37fffc70a8e1.json
+++ b/cedar-integration-tests/corpus_tests/5f6aa37dca1d195c21ff22ba1d1b37fffc70a8e1.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"em\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "em"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"em\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "em"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"em\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "em"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"em\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "em"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"em\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "em"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"em\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "em"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"em\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "em"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"em\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "em"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/5f6f43e48c3d29e6d4a95ada9734f3086e67fe80.json b/cedar-integration-tests/corpus_tests/5f6f43e48c3d29e6d4a95ada9734f3086e67fe80.json
index 24b932241..cc9152002 100644
--- a/cedar-integration-tests/corpus_tests/5f6f43e48c3d29e6d4a95ada9734f3086e67fe80.json
+++ b/cedar-integration-tests/corpus_tests/5f6f43e48c3d29e6d4a95ada9734f3086e67fe80.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/5f8c11c34b2bf708ee41de0b188ec771a8605a46.json b/cedar-integration-tests/corpus_tests/5f8c11c34b2bf708ee41de0b188ec771a8605a46.json
index 7bb78228f..8b231d96c 100644
--- a/cedar-integration-tests/corpus_tests/5f8c11c34b2bf708ee41de0b188ec771a8605a46.json
+++ b/cedar-integration-tests/corpus_tests/5f8c11c34b2bf708ee41de0b188ec771a8605a46.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "W::v::A::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::A::\"\"",
+      "principal": {
+        "type": "W::v::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::A",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "W::v::A::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::A::\"\"",
+      "principal": {
+        "type": "W::v::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::A",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "W::v::A::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::A::\"\"",
+      "principal": {
+        "type": "W::v::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::A",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "W::v::A::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::A::\"\"",
+      "principal": {
+        "type": "W::v::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::A",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "W::v::A::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::A::\"\"",
+      "principal": {
+        "type": "W::v::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::A",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "W::v::A::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::A::\"\"",
+      "principal": {
+        "type": "W::v::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::A",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "W::v::A::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::A::\"\"",
+      "principal": {
+        "type": "W::v::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::A",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "W::v::A::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::A::\"\"",
+      "principal": {
+        "type": "W::v::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::A",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/5fd8bf1ea231406e6a57dfbf898c91e5887b9e2a.json b/cedar-integration-tests/corpus_tests/5fd8bf1ea231406e6a57dfbf898c91e5887b9e2a.json
index 9abbe9547..2991dcbf3 100644
--- a/cedar-integration-tests/corpus_tests/5fd8bf1ea231406e6a57dfbf898c91e5887b9e2a.json
+++ b/cedar-integration-tests/corpus_tests/5fd8bf1ea231406e6a57dfbf898c91e5887b9e2a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/60260717214e25c1178d39b89fa235fb5444312b.json b/cedar-integration-tests/corpus_tests/60260717214e25c1178d39b89fa235fb5444312b.json
index 8d5b1214a..8a33eb60f 100644
--- a/cedar-integration-tests/corpus_tests/60260717214e25c1178d39b89fa235fb5444312b.json
+++ b/cedar-integration-tests/corpus_tests/60260717214e25c1178d39b89fa235fb5444312b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0r3\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0r3\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000r3\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000r3\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0r3\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000r3\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0r3\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0r3\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000r3\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000r3\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0r3\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0r3\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000r3\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000r3\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0r3\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0r3\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000r3\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000r3\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0r3\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0r3\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000r3\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000r3\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0r3\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0r3\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000r3\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000r3\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/604a41216284beed5afa69f4b724c92d17b36812.json b/cedar-integration-tests/corpus_tests/604a41216284beed5afa69f4b724c92d17b36812.json
index d0244654d..6cad27705 100644
--- a/cedar-integration-tests/corpus_tests/604a41216284beed5afa69f4b724c92d17b36812.json
+++ b/cedar-integration-tests/corpus_tests/604a41216284beed5afa69f4b724c92d17b36812.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/604c9e765d3ed119989ee5e35171b99c1291b67d.json b/cedar-integration-tests/corpus_tests/604c9e765d3ed119989ee5e35171b99c1291b67d.json
index bdbaf7544..61b6094d2 100644
--- a/cedar-integration-tests/corpus_tests/604c9e765d3ed119989ee5e35171b99c1291b67d.json
+++ b/cedar-integration-tests/corpus_tests/604c9e765d3ed119989ee5e35171b99c1291b67d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"306\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "306"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/6054dabdf25d37e442d77c727145271fb9edeae3.json b/cedar-integration-tests/corpus_tests/6054dabdf25d37e442d77c727145271fb9edeae3.json
index 1603d14a5..436c5a06f 100644
--- a/cedar-integration-tests/corpus_tests/6054dabdf25d37e442d77c727145271fb9edeae3.json
+++ b/cedar-integration-tests/corpus_tests/6054dabdf25d37e442d77c727145271fb9edeae3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/60651d7140cea972984d740f037e2ff585b033f7.json b/cedar-integration-tests/corpus_tests/60651d7140cea972984d740f037e2ff585b033f7.json
index 293db2ee2..213afd05d 100644
--- a/cedar-integration-tests/corpus_tests/60651d7140cea972984d740f037e2ff585b033f7.json
+++ b/cedar-integration-tests/corpus_tests/60651d7140cea972984d740f037e2ff585b033f7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/60824929f43da456cf0bf9901cc6756667bb4741.json b/cedar-integration-tests/corpus_tests/60824929f43da456cf0bf9901cc6756667bb4741.json
index 97473fdbf..657a574ff 100644
--- a/cedar-integration-tests/corpus_tests/60824929f43da456cf0bf9901cc6756667bb4741.json
+++ b/cedar-integration-tests/corpus_tests/60824929f43da456cf0bf9901cc6756667bb4741.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "FwEwwwww::\"::\"",
-      "action": "Action::\"ű::::::::\"",
-      "resource": "FwEwwwww::\"::\"",
+      "principal": {
+        "type": "FwEwwwww",
+        "id": "::"
+      },
+      "resource": {
+        "type": "FwEwwwww",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "ű::::::::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "FwEwwwww::\"::\"",
-      "action": "Action::\"ű::::::::\"",
-      "resource": "FwEwwwww::\"::\"",
+      "principal": {
+        "type": "FwEwwwww",
+        "id": "::"
+      },
+      "resource": {
+        "type": "FwEwwwww",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "ű::::::::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "FwEwwwww::\"::\"",
-      "action": "Action::\"ű::::::::\"",
-      "resource": "FwEwwwww::\"::\"",
+      "principal": {
+        "type": "FwEwwwww",
+        "id": "::"
+      },
+      "resource": {
+        "type": "FwEwwwww",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "ű::::::::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "FwEwwwww::\"::\"",
-      "action": "Action::\"ű::::::::\"",
-      "resource": "FwEwwwww::\"::\"",
+      "principal": {
+        "type": "FwEwwwww",
+        "id": "::"
+      },
+      "resource": {
+        "type": "FwEwwwww",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "ű::::::::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "FwEwwwww::\"::\"",
-      "action": "Action::\"ű::::::::\"",
-      "resource": "FwEwwwww::\"::\"",
+      "principal": {
+        "type": "FwEwwwww",
+        "id": "::"
+      },
+      "resource": {
+        "type": "FwEwwwww",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "ű::::::::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "FwEwwwww::\"::\"",
-      "action": "Action::\"ű::::::::\"",
-      "resource": "FwEwwwww::\"::\"",
+      "principal": {
+        "type": "FwEwwwww",
+        "id": "::"
+      },
+      "resource": {
+        "type": "FwEwwwww",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "ű::::::::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "FwEwwwww::\"::\"",
-      "action": "Action::\"ű::::::::\"",
-      "resource": "FwEwwwww::\"::\"",
+      "principal": {
+        "type": "FwEwwwww",
+        "id": "::"
+      },
+      "resource": {
+        "type": "FwEwwwww",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "ű::::::::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "FwEwwwww::\"::\"",
-      "action": "Action::\"ű::::::::\"",
-      "resource": "FwEwwwww::\"::\"",
+      "principal": {
+        "type": "FwEwwwww",
+        "id": "::"
+      },
+      "resource": {
+        "type": "FwEwwwww",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "ű::::::::"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/608d5552565e6c5dd6d1263ae298a28d7ac6b76d.json b/cedar-integration-tests/corpus_tests/608d5552565e6c5dd6d1263ae298a28d7ac6b76d.json
index 9dbc94840..1658bbd91 100644
--- a/cedar-integration-tests/corpus_tests/608d5552565e6c5dd6d1263ae298a28d7ac6b76d.json
+++ b/cedar-integration-tests/corpus_tests/608d5552565e6c5dd6d1263ae298a28d7ac6b76d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast,er\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast,er\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast,er"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast,er"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast,er\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast,er\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast,er"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast,er"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast,er\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast,er\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast,er"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast,er"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast,er\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast,er\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast,er"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast,er"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast,er\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast,er\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast,er"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast,er"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast,er\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast,er\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast,er"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast,er"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast,er\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast,er\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast,er"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast,er"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast,er\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com/fast,er\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast,er"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com/fast,er"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/60f642cbd99199661c5583bc2127e40283315a2d.json b/cedar-integration-tests/corpus_tests/60f642cbd99199661c5583bc2127e40283315a2d.json
index f5f3275eb..9451beae3 100644
--- a/cedar-integration-tests/corpus_tests/60f642cbd99199661c5583bc2127e40283315a2d.json
+++ b/cedar-integration-tests/corpus_tests/60f642cbd99199661c5583bc2127e40283315a2d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"0000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0000\"",
+      "principal": {
+        "type": "a",
+        "id": "0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0000\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"0000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0000\"",
+      "principal": {
+        "type": "a",
+        "id": "0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"0000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0000\"",
+      "principal": {
+        "type": "a",
+        "id": "0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"0000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0000\"",
+      "principal": {
+        "type": "a",
+        "id": "0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"0000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0000\"",
+      "principal": {
+        "type": "a",
+        "id": "0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"0000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0000\"",
+      "principal": {
+        "type": "a",
+        "id": "0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"0000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0000\"",
+      "principal": {
+        "type": "a",
+        "id": "0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/6102eb6b6bec792e748119b6fc853aba1ec23c48.json b/cedar-integration-tests/corpus_tests/6102eb6b6bec792e748119b6fc853aba1ec23c48.json
index 25b14ab2f..552979f7d 100644
--- a/cedar-integration-tests/corpus_tests/6102eb6b6bec792e748119b6fc853aba1ec23c48.json
+++ b/cedar-integration-tests/corpus_tests/6102eb6b6bec792e748119b6fc853aba1ec23c48.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\00\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\00\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"91p\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\00\"",
+      "principal": {
+        "type": "a",
+        "id": "91p"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\00\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\00\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\00\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\00\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\00\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/611d9858f9152c7d5f1b16acbda599b1126ec1da.json b/cedar-integration-tests/corpus_tests/611d9858f9152c7d5f1b16acbda599b1126ec1da.json
index 0c08f14af..7c7f568c3 100644
--- a/cedar-integration-tests/corpus_tests/611d9858f9152c7d5f1b16acbda599b1126ec1da.json
+++ b/cedar-integration-tests/corpus_tests/611d9858f9152c7d5f1b16acbda599b1126ec1da.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "m::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\"\"",
+      "principal": {
+        "type": "m",
+        "id": ""
+      },
+      "resource": {
+        "type": "m",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "m::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\"\"",
+      "principal": {
+        "type": "m",
+        "id": ""
+      },
+      "resource": {
+        "type": "m",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "m::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\"\"",
+      "principal": {
+        "type": "m",
+        "id": ""
+      },
+      "resource": {
+        "type": "m",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "m::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\"\"",
+      "principal": {
+        "type": "m",
+        "id": ""
+      },
+      "resource": {
+        "type": "m",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "m::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\"\"",
+      "principal": {
+        "type": "m",
+        "id": ""
+      },
+      "resource": {
+        "type": "m",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "m::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\"\"",
+      "principal": {
+        "type": "m",
+        "id": ""
+      },
+      "resource": {
+        "type": "m",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "m::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\"\"",
+      "principal": {
+        "type": "m",
+        "id": ""
+      },
+      "resource": {
+        "type": "m",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "m::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\"\"",
+      "principal": {
+        "type": "m",
+        "id": ""
+      },
+      "resource": {
+        "type": "m",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/615078741a0cd4895a3191daa6841627e1e0f875.json b/cedar-integration-tests/corpus_tests/615078741a0cd4895a3191daa6841627e1e0f875.json
index e0c374ca5..f40fb4cf6 100644
--- a/cedar-integration-tests/corpus_tests/615078741a0cd4895a3191daa6841627e1e0f875.json
+++ b/cedar-integration-tests/corpus_tests/615078741a0cd4895a3191daa6841627e1e0f875.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::B33333332::a::\"\"",
-      "action": "A::B33333332::Action::\"\"",
-      "resource": "A::B33333332::a::\"\"",
+      "principal": {
+        "type": "A::B33333332::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::B33333332::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::B33333332::Action",
+        "id": ""
+      },
       "context": {
         "A": "",
         "WjxGj302x": ""
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::B33333332::a::\"\"",
-      "action": "A::B33333332::Action::\"\"",
-      "resource": "A::B33333332::a::\"\"",
+      "principal": {
+        "type": "A::B33333332::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::B33333332::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::B33333332::Action",
+        "id": ""
+      },
       "context": {
         "A": "",
         "WjxGj302x": ""
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::B33333332::a::\"\"",
-      "action": "A::B33333332::Action::\"\"",
-      "resource": "A::B33333332::a::\"\"",
+      "principal": {
+        "type": "A::B33333332::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::B33333332::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::B33333332::Action",
+        "id": ""
+      },
       "context": {
         "A": "",
         "WjxGj302x": ""
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::B33333332::a::\"\"",
-      "action": "A::B33333332::Action::\"\"",
-      "resource": "A::B33333332::a::\"\"",
+      "principal": {
+        "type": "A::B33333332::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::B33333332::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::B33333332::Action",
+        "id": ""
+      },
       "context": {
         "A": "",
         "WjxGj302x": ""
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::B33333332::a::\"\"",
-      "action": "A::B33333332::Action::\"\"",
-      "resource": "A::B33333332::a::\"\"",
+      "principal": {
+        "type": "A::B33333332::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::B33333332::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::B33333332::Action",
+        "id": ""
+      },
       "context": {
         "A": "",
         "WjxGj302x": ""
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::B33333332::a::\"\"",
-      "action": "A::B33333332::Action::\"\"",
-      "resource": "A::B33333332::a::\"\"",
+      "principal": {
+        "type": "A::B33333332::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::B33333332::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::B33333332::Action",
+        "id": ""
+      },
       "context": {
         "A": "",
         "WjxGj302x": ""
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::B33333332::a::\"\"",
-      "action": "A::B33333332::Action::\"\"",
-      "resource": "A::B33333332::a::\"\"",
+      "principal": {
+        "type": "A::B33333332::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::B33333332::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::B33333332::Action",
+        "id": ""
+      },
       "context": {
         "A": "",
         "WjxGj302x": ""
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::B33333332::a::\"\"",
-      "action": "A::B33333332::Action::\"\"",
-      "resource": "A::B33333332::a::\"\"",
+      "principal": {
+        "type": "A::B33333332::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::B33333332::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::B33333332::Action",
+        "id": ""
+      },
       "context": {
         "A": "",
         "WjxGj302x": ""
diff --git a/cedar-integration-tests/corpus_tests/615239be881909941babb336171be8d781444b20.json b/cedar-integration-tests/corpus_tests/615239be881909941babb336171be8d781444b20.json
index a418741cb..b38b3a4a6 100644
--- a/cedar-integration-tests/corpus_tests/615239be881909941babb336171be8d781444b20.json
+++ b/cedar-integration-tests/corpus_tests/615239be881909941babb336171be8d781444b20.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0&>>>\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0&>>>\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000&>>>"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000&>>>"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0&>>>\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0&>>>\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000&>>>"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000&>>>"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0&>>>\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000&>>>"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0&>>>\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0&>>>\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000&>>>"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000&>>>"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0&>>>\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0&>>>\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000&>>>"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000&>>>"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0&>>>\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0&>>>\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000&>>>"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000&>>>"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0&>>>\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0&>>>\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000&>>>"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000&>>>"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0&>>>\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0&>>>\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000&>>>"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000&>>>"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/615247402d75283f835fbfa50d8f2fd08b230a18.json b/cedar-integration-tests/corpus_tests/615247402d75283f835fbfa50d8f2fd08b230a18.json
index 437c88374..4a079d254 100644
--- a/cedar-integration-tests/corpus_tests/615247402d75283f835fbfa50d8f2fd08b230a18.json
+++ b/cedar-integration-tests/corpus_tests/615247402d75283f835fbfa50d8f2fd08b230a18.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "nRRw": ""
       },
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "nRRw": ""
       },
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "nRRw": ""
       },
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "nRRw": ""
       },
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "nRRw": ""
       },
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "nRRw": ""
       },
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "nRRw": ""
       },
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "nRRw": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/6186214b2bed06031da258d01afa620957fc8f3f.json b/cedar-integration-tests/corpus_tests/6186214b2bed06031da258d01afa620957fc8f3f.json
index 9efe21aab..a5ac4cfaa 100644
--- a/cedar-integration-tests/corpus_tests/6186214b2bed06031da258d01afa620957fc8f3f.json
+++ b/cedar-integration-tests/corpus_tests/6186214b2bed06031da258d01afa620957fc8f3f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Gxt833777::vxxnjjjjjj::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::vxxnjjjjjj::\"\"",
+      "principal": {
+        "type": "Gxt833777::vxxnjjjjjj",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::vxxnjjjjjj",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {
         "K00000000": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Gxt833777::vxxnjjjjjj::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::vxxnjjjjjj::\"\"",
+      "principal": {
+        "type": "Gxt833777::vxxnjjjjjj",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::vxxnjjjjjj",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {
         "K00000000": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Gxt833777::vxxnjjjjjj::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::vxxnjjjjjj::\"\"",
+      "principal": {
+        "type": "Gxt833777::vxxnjjjjjj",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::vxxnjjjjjj",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {
         "K00000000": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Gxt833777::vxxnjjjjjj::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::vxxnjjjjjj::\"\"",
+      "principal": {
+        "type": "Gxt833777::vxxnjjjjjj",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::vxxnjjjjjj",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {
         "K00000000": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Gxt833777::vxxnjjjjjj::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::vxxnjjjjjj::\"\"",
+      "principal": {
+        "type": "Gxt833777::vxxnjjjjjj",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::vxxnjjjjjj",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {
         "K00000000": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Gxt833777::vxxnjjjjjj::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::vxxnjjjjjj::\"\"",
+      "principal": {
+        "type": "Gxt833777::vxxnjjjjjj",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::vxxnjjjjjj",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {
         "K00000000": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Gxt833777::vxxnjjjjjj::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::vxxnjjjjjj::\"\"",
+      "principal": {
+        "type": "Gxt833777::vxxnjjjjjj",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::vxxnjjjjjj",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {
         "K00000000": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Gxt833777::vxxnjjjjjj::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::vxxnjjjjjj::\"\"",
+      "principal": {
+        "type": "Gxt833777::vxxnjjjjjj",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::vxxnjjjjjj",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {
         "K00000000": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/6195b927cbadeb03eb8cbe5df983957b08b8eaae.json b/cedar-integration-tests/corpus_tests/6195b927cbadeb03eb8cbe5df983957b08b8eaae.json
index 3efb4d609..7cad8e1ba 100644
--- a/cedar-integration-tests/corpus_tests/6195b927cbadeb03eb8cbe5df983957b08b8eaae.json
+++ b/cedar-integration-tests/corpus_tests/6195b927cbadeb03eb8cbe5df983957b08b8eaae.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "zow0ssssss::a::\"70\"",
-      "action": "zow0ssssss::Action::\"action\"",
-      "resource": "zow0ssssss::a::\"70\"",
+      "principal": {
+        "type": "zow0ssssss::a",
+        "id": "70"
+      },
+      "resource": {
+        "type": "zow0ssssss::a",
+        "id": "70"
+      },
+      "action": {
+        "type": "zow0ssssss::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "zow0ssssss::a::\"70\"",
-      "action": "zow0ssssss::Action::\"action\"",
-      "resource": "zow0ssssss::a::\"70\"",
+      "principal": {
+        "type": "zow0ssssss::a",
+        "id": "70"
+      },
+      "resource": {
+        "type": "zow0ssssss::a",
+        "id": "70"
+      },
+      "action": {
+        "type": "zow0ssssss::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "zow0ssssss::a::\"70\"",
-      "action": "zow0ssssss::Action::\"action\"",
-      "resource": "zow0ssssss::a::\"70\"",
+      "principal": {
+        "type": "zow0ssssss::a",
+        "id": "70"
+      },
+      "resource": {
+        "type": "zow0ssssss::a",
+        "id": "70"
+      },
+      "action": {
+        "type": "zow0ssssss::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "zow0ssssss::a::\"70\"",
-      "action": "zow0ssssss::Action::\"action\"",
-      "resource": "zow0ssssss::a::\"70\"",
+      "principal": {
+        "type": "zow0ssssss::a",
+        "id": "70"
+      },
+      "resource": {
+        "type": "zow0ssssss::a",
+        "id": "70"
+      },
+      "action": {
+        "type": "zow0ssssss::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "zow0ssssss::a::\"70\"",
-      "action": "zow0ssssss::Action::\"action\"",
-      "resource": "zow0ssssss::a::\"70\"",
+      "principal": {
+        "type": "zow0ssssss::a",
+        "id": "70"
+      },
+      "resource": {
+        "type": "zow0ssssss::a",
+        "id": "70"
+      },
+      "action": {
+        "type": "zow0ssssss::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "zow0ssssss::a::\"70\"",
-      "action": "zow0ssssss::Action::\"action\"",
-      "resource": "zow0ssssss::a::\"70\"",
+      "principal": {
+        "type": "zow0ssssss::a",
+        "id": "70"
+      },
+      "resource": {
+        "type": "zow0ssssss::a",
+        "id": "70"
+      },
+      "action": {
+        "type": "zow0ssssss::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "zow0ssssss::a::\"70\"",
-      "action": "zow0ssssss::Action::\"action\"",
-      "resource": "zow0ssssss::a::\"70\"",
+      "principal": {
+        "type": "zow0ssssss::a",
+        "id": "70"
+      },
+      "resource": {
+        "type": "zow0ssssss::a",
+        "id": "70"
+      },
+      "action": {
+        "type": "zow0ssssss::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "zow0ssssss::a::\"70\"",
-      "action": "zow0ssssss::Action::\"action\"",
-      "resource": "zow0ssssss::a::\"70\"",
+      "principal": {
+        "type": "zow0ssssss::a",
+        "id": "70"
+      },
+      "resource": {
+        "type": "zow0ssssss::a",
+        "id": "70"
+      },
+      "action": {
+        "type": "zow0ssssss::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/61a7966ca468f51a54bd8c76ef50d030f1586aeb.json b/cedar-integration-tests/corpus_tests/61a7966ca468f51a54bd8c76ef50d030f1586aeb.json
index 1887e0e1b..9cf7cc038 100644
--- a/cedar-integration-tests/corpus_tests/61a7966ca468f51a54bd8c76ef50d030f1586aeb.json
+++ b/cedar-integration-tests/corpus_tests/61a7966ca468f51a54bd8c76ef50d030f1586aeb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"):\"",
-      "resource": "A0::Fwww::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "):"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"):\"",
-      "resource": "A0::Fwww::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "):"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"):\"",
-      "resource": "A0::Fwww::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "):"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"):\"",
-      "resource": "A0::Fwww::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "):"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"):\"",
-      "resource": "A0::Fwww::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "):"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"):\"",
-      "resource": "A0::Fwww::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "):"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"):\"",
-      "resource": "A0::Fwww::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "):"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"):\"",
-      "resource": "A0::Fwww::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "):"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/61da7807095991392a5f67e06f9a894bcee81fbc.json b/cedar-integration-tests/corpus_tests/61da7807095991392a5f67e06f9a894bcee81fbc.json
index 0e3acbd0a..1b134271d 100644
--- a/cedar-integration-tests/corpus_tests/61da7807095991392a5f67e06f9a894bcee81fbc.json
+++ b/cedar-integration-tests/corpus_tests/61da7807095991392a5f67e06f9a894bcee81fbc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/620f1df31b84511fd971e742e30ca6a7154d3fce.json b/cedar-integration-tests/corpus_tests/620f1df31b84511fd971e742e30ca6a7154d3fce.json
index 750aad66a..a85caccf5 100644
--- a/cedar-integration-tests/corpus_tests/620f1df31b84511fd971e742e30ca6a7154d3fce.json
+++ b/cedar-integration-tests/corpus_tests/620f1df31b84511fd971e742e30ca6a7154d3fce.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\n\\u{6}\\n\\u{6}\\u{c5148}\\u{5}\\u{6}@\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\n\\u{6}\\u{c5148}\\u{5}\\u{6}@\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\n\u0006󅅈\u0005\u0006@\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\n\u0006󅅈\u0005\u0006@\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\n\\u{6}\\n\\u{6}\\u{c5148}\\u{5}\\u{6}@\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\n\\u{6}\\u{c5148}\\u{5}\\u{6}@\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\n\u0006󅅈\u0005\u0006@\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\n\u0006󅅈\u0005\u0006@\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\n\\u{6}\\n\\u{6}\\u{c5148}\\u{5}\\u{6}@\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\n\\u{6}\\u{c5148}\\u{5}\\u{6}@\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\n\u0006󅅈\u0005\u0006@\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\n\u0006󅅈\u0005\u0006@\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\n\\u{6}\\n\\u{6}\\u{c5148}\\u{5}\\u{6}@\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\n\\u{6}\\u{c5148}\\u{5}\\u{6}@\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\n\u0006󅅈\u0005\u0006@\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\n\u0006󅅈\u0005\u0006@\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\n\\u{6}\\n\\u{6}\\u{c5148}\\u{5}\\u{6}@\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\n\\u{6}\\u{c5148}\\u{5}\\u{6}@\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\n\u0006󅅈\u0005\u0006@\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\n\u0006󅅈\u0005\u0006@\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\n\\u{6}\\n\\u{6}\\u{c5148}\\u{5}\\u{6}@\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\n\\u{6}\\u{c5148}\\u{5}\\u{6}@\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\n\u0006󅅈\u0005\u0006@\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\n\u0006󅅈\u0005\u0006@\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\n\\u{6}\\n\\u{6}\\u{c5148}\\u{5}\\u{6}@\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\n\\u{6}\\u{c5148}\\u{5}\\u{6}@\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\n\u0006󅅈\u0005\u0006@\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\n\u0006󅅈\u0005\u0006@\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\n\\u{6}\\n\\u{6}\\u{c5148}\\u{5}\\u{6}@\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\n\\u{6}\\u{c5148}\\u{5}\\u{6}@\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\n\u0006󅅈\u0005\u0006@\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\n\u0006󅅈\u0005\u0006@\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/62216c7d61a110e80e1bae89f57424161302dd67.json b/cedar-integration-tests/corpus_tests/62216c7d61a110e80e1bae89f57424161302dd67.json
index 3e92c2742..3c32d8d2e 100644
--- a/cedar-integration-tests/corpus_tests/62216c7d61a110e80e1bae89f57424161302dd67.json
+++ b/cedar-integration-tests/corpus_tests/62216c7d61a110e80e1bae89f57424161302dd67.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{16}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0016"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{16}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{16}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0016"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0016"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{16}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{16}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0016"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0016"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{16}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{16}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0016"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0016"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{16}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{16}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0016"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0016"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{16}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{16}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0016"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0016"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{16}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{16}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0016"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0016"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{16}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{16}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0016"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0016"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/62363d0ed447657187a9c69d3024f7c85f457c4c.json b/cedar-integration-tests/corpus_tests/62363d0ed447657187a9c69d3024f7c85f457c4c.json
index 3acbb4ae8..8f9eb7403 100644
--- a/cedar-integration-tests/corpus_tests/62363d0ed447657187a9c69d3024f7c85f457c4c.json
+++ b/cedar-integration-tests/corpus_tests/62363d0ed447657187a9c69d3024f7c85f457c4c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/624156ac4fff56421b32744f2ac8b14b89cf642b.json b/cedar-integration-tests/corpus_tests/624156ac4fff56421b32744f2ac8b14b89cf642b.json
index 30833f891..fe9c1f088 100644
--- a/cedar-integration-tests/corpus_tests/624156ac4fff56421b32744f2ac8b14b89cf642b.json
+++ b/cedar-integration-tests/corpus_tests/624156ac4fff56421b32744f2ac8b14b89cf642b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"&0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&0\"",
+      "principal": {
+        "type": "a",
+        "id": "&0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"&0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&0\"",
+      "principal": {
+        "type": "a",
+        "id": "&0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"&0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&0\"",
+      "principal": {
+        "type": "a",
+        "id": "&0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"&0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&0\"",
+      "principal": {
+        "type": "a",
+        "id": "&0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"&0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&0\"",
+      "principal": {
+        "type": "a",
+        "id": "&0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"&0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&0\"",
+      "principal": {
+        "type": "a",
+        "id": "&0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"&0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&0\"",
+      "principal": {
+        "type": "a",
+        "id": "&0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"&0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&0\"",
+      "principal": {
+        "type": "a",
+        "id": "&0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/6289324e3c80fbd138d1b75acff1aa1c53ef4e2e.json b/cedar-integration-tests/corpus_tests/6289324e3c80fbd138d1b75acff1aa1c53ef4e2e.json
index af4b04f4a..3ace33c04 100644
--- a/cedar-integration-tests/corpus_tests/6289324e3c80fbd138d1b75acff1aa1c53ef4e2e.json
+++ b/cedar-integration-tests/corpus_tests/6289324e3c80fbd138d1b75acff1aa1c53ef4e2e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/62a27ea3bb60c5035c9c9fc113460f30f16d972f.json b/cedar-integration-tests/corpus_tests/62a27ea3bb60c5035c9c9fc113460f30f16d972f.json
index d288e36cd..138498be5 100644
--- a/cedar-integration-tests/corpus_tests/62a27ea3bb60c5035c9c9fc113460f30f16d972f.json
+++ b/cedar-integration-tests/corpus_tests/62a27ea3bb60c5035c9c9fc113460f30f16d972f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/62bbb2345cdf1b18279c69b7433b8098bdad9806.json b/cedar-integration-tests/corpus_tests/62bbb2345cdf1b18279c69b7433b8098bdad9806.json
index c1e40e43e..cbaed9856 100644
--- a/cedar-integration-tests/corpus_tests/62bbb2345cdf1b18279c69b7433b8098bdad9806.json
+++ b/cedar-integration-tests/corpus_tests/62bbb2345cdf1b18279c69b7433b8098bdad9806.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/62d2b41f48e2b3cd6878b7bf0e984fc90b9004db.json b/cedar-integration-tests/corpus_tests/62d2b41f48e2b3cd6878b7bf0e984fc90b9004db.json
index 37ecf9387..95d392eec 100644
--- a/cedar-integration-tests/corpus_tests/62d2b41f48e2b3cd6878b7bf0e984fc90b9004db.json
+++ b/cedar-integration-tests/corpus_tests/62d2b41f48e2b3cd6878b7bf0e984fc90b9004db.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/633dda22e80e12625b773d7dde59e1dc894c53f0.json b/cedar-integration-tests/corpus_tests/633dda22e80e12625b773d7dde59e1dc894c53f0.json
index 84e3c59ec..48e248051 100644
--- a/cedar-integration-tests/corpus_tests/633dda22e80e12625b773d7dde59e1dc894c53f0.json
+++ b/cedar-integration-tests/corpus_tests/633dda22e80e12625b773d7dde59e1dc894c53f0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"#\\0\\0A\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\\0\\0A\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "#\u0000\u0000A\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#\u0000\u0000A\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bhh02": []
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"#\\0\\0A\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\\0\\0A\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "#\u0000\u0000A\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#\u0000\u0000A\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bhh02": []
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"#\\0\\0A\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\\0\\0A\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "#\u0000\u0000A\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#\u0000\u0000A\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bhh02": []
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"#\\0\\0A\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\\0\\0A\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "#\u0000\u0000A\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#\u0000\u0000A\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bhh02": []
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"#\\0\\0A\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\\0\\0A\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "#\u0000\u0000A\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#\u0000\u0000A\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bhh02": []
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"#\\0\\0A\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\\0\\0A\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "#\u0000\u0000A\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#\u0000\u0000A\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bhh02": []
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"#\\0\\0A\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\\0\\0A\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "#\u0000\u0000A\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#\u0000\u0000A\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bhh02": []
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"#\\0\\0A\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\\0\\0A\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "#\u0000\u0000A\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#\u0000\u0000A\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bhh02": []
       },
diff --git a/cedar-integration-tests/corpus_tests/635b08739251410fd0264acae27eea2ca8bce572.json b/cedar-integration-tests/corpus_tests/635b08739251410fd0264acae27eea2ca8bce572.json
index 9e522f8b7..854c72510 100644
--- a/cedar-integration-tests/corpus_tests/635b08739251410fd0264acae27eea2ca8bce572.json
+++ b/cedar-integration-tests/corpus_tests/635b08739251410fd0264acae27eea2ca8bce572.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}o\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}NPT\\u{c}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}o\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}NPT\\u{c}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002o\u0002\u0002\u0002\u0002\u0002\u0002NPT\f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002o\u0002\u0002\u0002\u0002\u0002\u0002NPT\f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}o\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}NPT\\u{c}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}o\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}NPT\\u{c}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002o\u0002\u0002\u0002\u0002\u0002\u0002NPT\f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002o\u0002\u0002\u0002\u0002\u0002\u0002NPT\f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}o\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}NPT\\u{c}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}o\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}NPT\\u{c}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002o\u0002\u0002\u0002\u0002\u0002\u0002NPT\f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002o\u0002\u0002\u0002\u0002\u0002\u0002NPT\f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}o\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}NPT\\u{c}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}o\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}NPT\\u{c}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002o\u0002\u0002\u0002\u0002\u0002\u0002NPT\f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002o\u0002\u0002\u0002\u0002\u0002\u0002NPT\f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}o\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}NPT\\u{c}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}o\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}NPT\\u{c}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002o\u0002\u0002\u0002\u0002\u0002\u0002NPT\f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002o\u0002\u0002\u0002\u0002\u0002\u0002NPT\f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}o\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}NPT\\u{c}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}o\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}NPT\\u{c}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002o\u0002\u0002\u0002\u0002\u0002\u0002NPT\f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002o\u0002\u0002\u0002\u0002\u0002\u0002NPT\f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}o\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}NPT\\u{c}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}o\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}NPT\\u{c}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002o\u0002\u0002\u0002\u0002\u0002\u0002NPT\f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002o\u0002\u0002\u0002\u0002\u0002\u0002NPT\f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/637c6f895c90347181745b2e86fbfea9f9c9f3e9.json b/cedar-integration-tests/corpus_tests/637c6f895c90347181745b2e86fbfea9f9c9f3e9.json
index 5a44bc758..f2741f6f2 100644
--- a/cedar-integration-tests/corpus_tests/637c6f895c90347181745b2e86fbfea9f9c9f3e9.json
+++ b/cedar-integration-tests/corpus_tests/637c6f895c90347181745b2e86fbfea9f9c9f3e9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/638c0271cd069748ed419e5ab693efec6f5f4a01.json b/cedar-integration-tests/corpus_tests/638c0271cd069748ed419e5ab693efec6f5f4a01.json
index 0d2d6bc23..66e6e6f9d 100644
--- a/cedar-integration-tests/corpus_tests/638c0271cd069748ed419e5ab693efec6f5f4a01.json
+++ b/cedar-integration-tests/corpus_tests/638c0271cd069748ed419e5ab693efec6f5f4a01.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -84,9 +147,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/63d9cea9895d1ff489f18e5f608ec604f7359e02.json b/cedar-integration-tests/corpus_tests/63d9cea9895d1ff489f18e5f608ec604f7359e02.json
index 6d38be608..a41dfbcd1 100644
--- a/cedar-integration-tests/corpus_tests/63d9cea9895d1ff489f18e5f608ec604f7359e02.json
+++ b/cedar-integration-tests/corpus_tests/63d9cea9895d1ff489f18e5f608ec604f7359e02.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "m::a::\"\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\"\"",
+      "principal": {
+        "type": "m::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "m::a",
+        "id": ""
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "m::a::\"\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\"\"",
+      "principal": {
+        "type": "m::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "m::a",
+        "id": ""
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "m::a::\"\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\"\"",
+      "principal": {
+        "type": "m::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "m::a",
+        "id": ""
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "m::a::\"\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\"\"",
+      "principal": {
+        "type": "m::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "m::a",
+        "id": ""
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "m::a::\"\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\"\"",
+      "principal": {
+        "type": "m::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "m::a",
+        "id": ""
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "m::a::\"\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\"\"",
+      "principal": {
+        "type": "m::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "m::a",
+        "id": ""
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "m::a::\"\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\"\"",
+      "principal": {
+        "type": "m::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "m::a",
+        "id": ""
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "m::a::\"\"",
-      "action": "m::Action::\"action\"",
-      "resource": "m::a::\"\"",
+      "principal": {
+        "type": "m::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "m::a",
+        "id": ""
+      },
+      "action": {
+        "type": "m::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/645b79a523b93798bfeb96edc79a3f81a28f28c3.json b/cedar-integration-tests/corpus_tests/645b79a523b93798bfeb96edc79a3f81a28f28c3.json
index 1d22c4c5b..6255dfc78 100644
--- a/cedar-integration-tests/corpus_tests/645b79a523b93798bfeb96edc79a3f81a28f28c3.json
+++ b/cedar-integration-tests/corpus_tests/645b79a523b93798bfeb96edc79a3f81a28f28c3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Ro1JJJJ::\"\\0\\0\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "Ro1JJJJ::\"\\0\\0\\0R\"",
+      "principal": {
+        "type": "Ro1JJJJ",
+        "id": "\u0000\u0000\u0000R"
+      },
+      "resource": {
+        "type": "Ro1JJJJ",
+        "id": "\u0000\u0000\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Ro1JJJJ::\"\\0\\0\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "Ro1JJJJ::\"\\0\\0\\0R\"",
+      "principal": {
+        "type": "Ro1JJJJ",
+        "id": "\u0000\u0000\u0000R"
+      },
+      "resource": {
+        "type": "Ro1JJJJ",
+        "id": "\u0000\u0000\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Ro1JJJJ::\"\\0\\0\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "Ro1JJJJ::\"\\0\\0\\0R\"",
+      "principal": {
+        "type": "Ro1JJJJ",
+        "id": "\u0000\u0000\u0000R"
+      },
+      "resource": {
+        "type": "Ro1JJJJ",
+        "id": "\u0000\u0000\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Ro1JJJJ::\"\\0\\0\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "Ro1JJJJ::\"\\0\\0\\0R\"",
+      "principal": {
+        "type": "Ro1JJJJ",
+        "id": "\u0000\u0000\u0000R"
+      },
+      "resource": {
+        "type": "Ro1JJJJ",
+        "id": "\u0000\u0000\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Ro1JJJJ::\"\\0\\0\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "Ro1JJJJ::\"\\0\\0\\0R\"",
+      "principal": {
+        "type": "Ro1JJJJ",
+        "id": "\u0000\u0000\u0000R"
+      },
+      "resource": {
+        "type": "Ro1JJJJ",
+        "id": "\u0000\u0000\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Ro1JJJJ::\"\\0\\0\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "Ro1JJJJ::\"\\0\\0\\0R\"",
+      "principal": {
+        "type": "Ro1JJJJ",
+        "id": "\u0000\u0000\u0000R"
+      },
+      "resource": {
+        "type": "Ro1JJJJ",
+        "id": "\u0000\u0000\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Ro1JJJJ::\"\\0\\0\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "Ro1JJJJ::\"\\0\\0\\0R\"",
+      "principal": {
+        "type": "Ro1JJJJ",
+        "id": "\u0000\u0000\u0000R"
+      },
+      "resource": {
+        "type": "Ro1JJJJ",
+        "id": "\u0000\u0000\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Ro1JJJJ::\"\\0\\0\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "Ro1JJJJ::\"\\0\\0\\0R\"",
+      "principal": {
+        "type": "Ro1JJJJ",
+        "id": "\u0000\u0000\u0000R"
+      },
+      "resource": {
+        "type": "Ro1JJJJ",
+        "id": "\u0000\u0000\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/64b6091559a40a09a53f633f18677ce292b71fcc.json b/cedar-integration-tests/corpus_tests/64b6091559a40a09a53f633f18677ce292b71fcc.json
index 3cc3a8dbb..c3d5c5f11 100644
--- a/cedar-integration-tests/corpus_tests/64b6091559a40a09a53f633f18677ce292b71fcc.json
+++ b/cedar-integration-tests/corpus_tests/64b6091559a40a09a53f633f18677ce292b71fcc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/64ce02bf4082650dccc079322f436d4b6331fe88.json b/cedar-integration-tests/corpus_tests/64ce02bf4082650dccc079322f436d4b6331fe88.json
index 4f6041325..a14160c7b 100644
--- a/cedar-integration-tests/corpus_tests/64ce02bf4082650dccc079322f436d4b6331fe88.json
+++ b/cedar-integration-tests/corpus_tests/64ce02bf4082650dccc079322f436d4b6331fe88.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r0::l::\"::\"",
-      "action": "r0::Action::\"action\"",
-      "resource": "r0::FyUw::\"\"",
+      "principal": {
+        "type": "r0::l",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r0::FyUw",
+        "id": ""
+      },
+      "action": {
+        "type": "r0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r0::l::\"::\"",
-      "action": "r0::Action::\"action\"",
-      "resource": "r0::FyUw::\"\"",
+      "principal": {
+        "type": "r0::l",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r0::FyUw",
+        "id": ""
+      },
+      "action": {
+        "type": "r0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r0::l::\"::\"",
-      "action": "r0::Action::\"action\"",
-      "resource": "r0::FyUw::\"\"",
+      "principal": {
+        "type": "r0::l",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r0::FyUw",
+        "id": ""
+      },
+      "action": {
+        "type": "r0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r0::l::\"::\"",
-      "action": "r0::Action::\"action\"",
-      "resource": "r0::FyUw::\"\"",
+      "principal": {
+        "type": "r0::l",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r0::FyUw",
+        "id": ""
+      },
+      "action": {
+        "type": "r0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r0::l::\"::\"",
-      "action": "r0::Action::\"action\"",
-      "resource": "r0::FyUw::\"\"",
+      "principal": {
+        "type": "r0::l",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r0::FyUw",
+        "id": ""
+      },
+      "action": {
+        "type": "r0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r0::l::\"::\"",
-      "action": "r0::Action::\"action\"",
-      "resource": "r0::FyUw::\"\"",
+      "principal": {
+        "type": "r0::l",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r0::FyUw",
+        "id": ""
+      },
+      "action": {
+        "type": "r0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r0::l::\"::\"",
-      "action": "r0::Action::\"action\"",
-      "resource": "r0::FyUw::\"\"",
+      "principal": {
+        "type": "r0::l",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r0::FyUw",
+        "id": ""
+      },
+      "action": {
+        "type": "r0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r0::l::\"::\"",
-      "action": "r0::Action::\"action\"",
-      "resource": "r0::FyUw::\"\"",
+      "principal": {
+        "type": "r0::l",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r0::FyUw",
+        "id": ""
+      },
+      "action": {
+        "type": "r0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/64e70607451f1279c40d6731740912bcc8b7db42.json b/cedar-integration-tests/corpus_tests/64e70607451f1279c40d6731740912bcc8b7db42.json
index 711553c4a..4da0acdc9 100644
--- a/cedar-integration-tests/corpus_tests/64e70607451f1279c40d6731740912bcc8b7db42.json
+++ b/cedar-integration-tests/corpus_tests/64e70607451f1279c40d6731740912bcc8b7db42.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/652a5bef11cc63fab1662853de28b7c1a3e9c1b1.json b/cedar-integration-tests/corpus_tests/652a5bef11cc63fab1662853de28b7c1a3e9c1b1.json
index df056d8e5..174cdf948 100644
--- a/cedar-integration-tests/corpus_tests/652a5bef11cc63fab1662853de28b7c1a3e9c1b1.json
+++ b/cedar-integration-tests/corpus_tests/652a5bef11cc63fab1662853de28b7c1a3e9c1b1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"`\\0\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"`\\0\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\\0\\0\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"`\\0\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\\0\\0\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"`\\0\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\\0\\0\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"`\\0\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\\0\\0\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"`\\0\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\\0\\0\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"`\\0\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\\0\\0\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/6532c90795c1e85512ed437b8a4f447421eb6684.json b/cedar-integration-tests/corpus_tests/6532c90795c1e85512ed437b8a4f447421eb6684.json
index 40908fd1b..57ac9c04e 100644
--- a/cedar-integration-tests/corpus_tests/6532c90795c1e85512ed437b8a4f447421eb6684.json
+++ b/cedar-integration-tests/corpus_tests/6532c90795c1e85512ed437b8a4f447421eb6684.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "F3333::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F3333::\"\"",
+      "principal": {
+        "type": "F3333",
+        "id": ""
+      },
+      "resource": {
+        "type": "F3333",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fowwwwww": false
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "F3333::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F3333::\"\"",
+      "principal": {
+        "type": "F3333",
+        "id": ""
+      },
+      "resource": {
+        "type": "F3333",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fowwwwww": false
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "F3333::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F3333::\"\"",
+      "principal": {
+        "type": "F3333",
+        "id": ""
+      },
+      "resource": {
+        "type": "F3333",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fowwwwww": false
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "F3333::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F3333::\"\"",
+      "principal": {
+        "type": "F3333",
+        "id": ""
+      },
+      "resource": {
+        "type": "F3333",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fowwwwww": false
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "F3333::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F3333::\"\"",
+      "principal": {
+        "type": "F3333",
+        "id": ""
+      },
+      "resource": {
+        "type": "F3333",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fowwwwww": false
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "F3333::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F3333::\"\"",
+      "principal": {
+        "type": "F3333",
+        "id": ""
+      },
+      "resource": {
+        "type": "F3333",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fowwwwww": false
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "F3333::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F3333::\"\"",
+      "principal": {
+        "type": "F3333",
+        "id": ""
+      },
+      "resource": {
+        "type": "F3333",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fowwwwww": false
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "F3333::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F3333::\"\"",
+      "principal": {
+        "type": "F3333",
+        "id": ""
+      },
+      "resource": {
+        "type": "F3333",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fowwwwww": false
       },
diff --git a/cedar-integration-tests/corpus_tests/65790b525026bfd4dfe73b0657fa6c0347dd74a1.json b/cedar-integration-tests/corpus_tests/65790b525026bfd4dfe73b0657fa6c0347dd74a1.json
index 01d507b16..4b32d7a06 100644
--- a/cedar-integration-tests/corpus_tests/65790b525026bfd4dfe73b0657fa6c0347dd74a1.json
+++ b/cedar-integration-tests/corpus_tests/65790b525026bfd4dfe73b0657fa6c0347dd74a1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"f:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f:\"",
+      "principal": {
+        "type": "a",
+        "id": "f:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"f:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f:\"",
+      "principal": {
+        "type": "a",
+        "id": "f:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"f:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f:\"",
+      "principal": {
+        "type": "a",
+        "id": "f:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"f:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f:\"",
+      "principal": {
+        "type": "a",
+        "id": "f:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"f:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f:\"",
+      "principal": {
+        "type": "a",
+        "id": "f:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"f:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f:\"",
+      "principal": {
+        "type": "a",
+        "id": "f:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"f:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f:\"",
+      "principal": {
+        "type": "a",
+        "id": "f:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"f:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f:\"",
+      "principal": {
+        "type": "a",
+        "id": "f:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/65a41a239147613edda56c85a5fe6c8f6cfb2aa1.json b/cedar-integration-tests/corpus_tests/65a41a239147613edda56c85a5fe6c8f6cfb2aa1.json
index 8b42562bc..e504df834 100644
--- a/cedar-integration-tests/corpus_tests/65a41a239147613edda56c85a5fe6c8f6cfb2aa1.json
+++ b/cedar-integration-tests/corpus_tests/65a41a239147613edda56c85a5fe6c8f6cfb2aa1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/65c5f63b53b6783dbf4d4bb4e97b8a95b4c2b7ac.json b/cedar-integration-tests/corpus_tests/65c5f63b53b6783dbf4d4bb4e97b8a95b4c2b7ac.json
index 8d3f83894..aabd11721 100644
--- a/cedar-integration-tests/corpus_tests/65c5f63b53b6783dbf4d4bb4e97b8a95b4c2b7ac.json
+++ b/cedar-integration-tests/corpus_tests/65c5f63b53b6783dbf4d4bb4e97b8a95b4c2b7ac.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Ruwa1u::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Ruwa1u::\"\"",
+      "principal": {
+        "type": "Ruwa1u",
+        "id": ""
+      },
+      "resource": {
+        "type": "Ruwa1u",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Ruwa1u::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Ruwa1u::\"\"",
+      "principal": {
+        "type": "Ruwa1u",
+        "id": ""
+      },
+      "resource": {
+        "type": "Ruwa1u",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Ruwa1u::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Ruwa1u::\"\"",
+      "principal": {
+        "type": "Ruwa1u",
+        "id": ""
+      },
+      "resource": {
+        "type": "Ruwa1u",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Ruwa1u::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Ruwa1u::\"\"",
+      "principal": {
+        "type": "Ruwa1u",
+        "id": ""
+      },
+      "resource": {
+        "type": "Ruwa1u",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Ruwa1u::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Ruwa1u::\"\"",
+      "principal": {
+        "type": "Ruwa1u",
+        "id": ""
+      },
+      "resource": {
+        "type": "Ruwa1u",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Ruwa1u::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Ruwa1u::\"\"",
+      "principal": {
+        "type": "Ruwa1u",
+        "id": ""
+      },
+      "resource": {
+        "type": "Ruwa1u",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Ruwa1u::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Ruwa1u::\"\"",
+      "principal": {
+        "type": "Ruwa1u",
+        "id": ""
+      },
+      "resource": {
+        "type": "Ruwa1u",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Ruwa1u::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Ruwa1u::\"\"",
+      "principal": {
+        "type": "Ruwa1u",
+        "id": ""
+      },
+      "resource": {
+        "type": "Ruwa1u",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/65d7ad80c51c5bfa56e22a5c11073a26fa23143d.json b/cedar-integration-tests/corpus_tests/65d7ad80c51c5bfa56e22a5c11073a26fa23143d.json
index bbb649b96..a85a5ce54 100644
--- a/cedar-integration-tests/corpus_tests/65d7ad80c51c5bfa56e22a5c11073a26fa23143d.json
+++ b/cedar-integration-tests/corpus_tests/65d7ad80c51c5bfa56e22a5c11073a26fa23143d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": "0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/65e3e332f40c74f23abfd8baf2bc17fc80417214.json b/cedar-integration-tests/corpus_tests/65e3e332f40c74f23abfd8baf2bc17fc80417214.json
index f76643343..f766154f5 100644
--- a/cedar-integration-tests/corpus_tests/65e3e332f40c74f23abfd8baf2bc17fc80417214.json
+++ b/cedar-integration-tests/corpus_tests/65e3e332f40c74f23abfd8baf2bc17fc80417214.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/6689189acee4bd4b0369b67ee964a96291c4cb50.json b/cedar-integration-tests/corpus_tests/6689189acee4bd4b0369b67ee964a96291c4cb50.json
index 0fcb6a4b5..85fb6585b 100644
--- a/cedar-integration-tests/corpus_tests/6689189acee4bd4b0369b67ee964a96291c4cb50.json
+++ b/cedar-integration-tests/corpus_tests/6689189acee4bd4b0369b67ee964a96291c4cb50.json
@@ -7,8 +7,14 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "A000::Action::\"dafny/Fun\"",
-      "resource": "A000::a::\"\"",
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "dafny/Fun"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +25,14 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "A000::Action::\"dafny/Fun\"",
-      "resource": "A000::a::\"\"",
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "dafny/Fun"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +43,14 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "A000::Action::\"dafny/Fun\"",
-      "resource": "A000::a::\"\"",
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "dafny/Fun"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +61,14 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "A000::Action::\"dafny/Fun\"",
-      "resource": "A000::a::\"\"",
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "dafny/Fun"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +79,14 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "A000::Action::\"dafny/Fun\"",
-      "resource": "A000::a::\"\"",
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "dafny/Fun"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +97,14 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "A000::Action::\"dafny/Fun\"",
-      "resource": "A000::a::\"\"",
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "dafny/Fun"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +115,14 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "A000::Action::\"dafny/Fun\"",
-      "resource": "A000::a::\"\"",
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "dafny/Fun"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +133,14 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "A000::Action::\"dafny/Fun\"",
-      "resource": "A000::a::\"\"",
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "dafny/Fun"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/66a64b3581d4f1bb3143a0cc6ebf6919af364cd2.json b/cedar-integration-tests/corpus_tests/66a64b3581d4f1bb3143a0cc6ebf6919af364cd2.json
index 0376d8c3d..46e1addb6 100644
--- a/cedar-integration-tests/corpus_tests/66a64b3581d4f1bb3143a0cc6ebf6919af364cd2.json
+++ b/cedar-integration-tests/corpus_tests/66a64b3581d4f1bb3143a0cc6ebf6919af364cd2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/66b636dafde83ef3857d84000e2a3b8d93970194.json b/cedar-integration-tests/corpus_tests/66b636dafde83ef3857d84000e2a3b8d93970194.json
index 38db05f3f..eb55464f1 100644
--- a/cedar-integration-tests/corpus_tests/66b636dafde83ef3857d84000e2a3b8d93970194.json
+++ b/cedar-integration-tests/corpus_tests/66b636dafde83ef3857d84000e2a3b8d93970194.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"O\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "O"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"O\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\"",
+      "principal": {
+        "type": "a",
+        "id": "O"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"O\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "O"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"O\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\"",
+      "principal": {
+        "type": "a",
+        "id": "O"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"O\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\"",
+      "principal": {
+        "type": "a",
+        "id": "O"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"O\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\"",
+      "principal": {
+        "type": "a",
+        "id": "O"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"O\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\"",
+      "principal": {
+        "type": "a",
+        "id": "O"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"O\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"O\"",
+      "principal": {
+        "type": "a",
+        "id": "O"
+      },
+      "resource": {
+        "type": "a",
+        "id": "O"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/671e345c95570901c70a5fb2f4f16af13dcc9e65.json b/cedar-integration-tests/corpus_tests/671e345c95570901c70a5fb2f4f16af13dcc9e65.json
index 3df279b3a..8588d2bbc 100644
--- a/cedar-integration-tests/corpus_tests/671e345c95570901c70a5fb2f4f16af13dcc9e65.json
+++ b/cedar-integration-tests/corpus_tests/671e345c95570901c70a5fb2f4f16af13dcc9e65.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"f\\0fff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0fff\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0000fff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"f\\0fff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0fff\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0000fff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"f\\0fff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0fff\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0000fff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"f\\0fff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0fff\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0000fff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0fff\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"f\\0fff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0fff\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0000fff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"f\\0fff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0fff\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0000fff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/676f584a311fec91ca2593d2a8c50cd4c37c6523.json b/cedar-integration-tests/corpus_tests/676f584a311fec91ca2593d2a8c50cd4c37c6523.json
index 3f2e23401..9840d9729 100644
--- a/cedar-integration-tests/corpus_tests/676f584a311fec91ca2593d2a8c50cd4c37c6523.json
+++ b/cedar-integration-tests/corpus_tests/676f584a311fec91ca2593d2a8c50cd4c37c6523.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "__entity": {
@@ -37,9 +46,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "__entity": {
@@ -68,9 +86,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "__entity": {
@@ -99,9 +126,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "__entity": {
@@ -130,9 +166,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "__entity": {
@@ -161,9 +206,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "__entity": {
@@ -192,9 +246,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "__entity": {
@@ -223,9 +286,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "__entity": {
diff --git a/cedar-integration-tests/corpus_tests/676f9f38dc6c2d2e17c7b8055a0f46d9f05bab57.json b/cedar-integration-tests/corpus_tests/676f9f38dc6c2d2e17c7b8055a0f46d9f05bab57.json
index caa610951..334925cbf 100644
--- a/cedar-integration-tests/corpus_tests/676f9f38dc6c2d2e17c7b8055a0f46d9f05bab57.json
+++ b/cedar-integration-tests/corpus_tests/676f9f38dc6c2d2e17c7b8055a0f46d9f05bab57.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/67770a3933efa0dfd70a0ac4138cece8ba937255.json b/cedar-integration-tests/corpus_tests/67770a3933efa0dfd70a0ac4138cece8ba937255.json
index b6d25d86e..14961a8fe 100644
--- a/cedar-integration-tests/corpus_tests/67770a3933efa0dfd70a0ac4138cece8ba937255.json
+++ b/cedar-integration-tests/corpus_tests/67770a3933efa0dfd70a0ac4138cece8ba937255.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/67f911ff65c57a6917f690361350668b20fb0919.json b/cedar-integration-tests/corpus_tests/67f911ff65c57a6917f690361350668b20fb0919.json
index 577bab21e..ff15e86a7 100644
--- a/cedar-integration-tests/corpus_tests/67f911ff65c57a6917f690361350668b20fb0919.json
+++ b/cedar-integration-tests/corpus_tests/67f911ff65c57a6917f690361350668b20fb0919.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Kfhhhhhh::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\".\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Kfhhhhhh::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\".\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Kfhhhhhh::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\".\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Kfhhhhhh::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\".\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Kfhhhhhh::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\".\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Kfhhhhhh::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\".\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Kfhhhhhh::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\".\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Kfhhhhhh::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\".\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/6801c1e1487af296bb372cbe1ef80a62f0d03740.json b/cedar-integration-tests/corpus_tests/6801c1e1487af296bb372cbe1ef80a62f0d03740.json
index e04d742ac..c948a4e7b 100644
--- a/cedar-integration-tests/corpus_tests/6801c1e1487af296bb372cbe1ef80a62f0d03740.json
+++ b/cedar-integration-tests/corpus_tests/6801c1e1487af296bb372cbe1ef80a62f0d03740.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A0000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A0000::\"\"",
+      "principal": {
+        "type": "A0000",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A0000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A0000::\"\"",
+      "principal": {
+        "type": "A0000",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A0000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A0000::\"\"",
+      "principal": {
+        "type": "A0000",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A0000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A0000::\"\"",
+      "principal": {
+        "type": "A0000",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A0000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A0000::\"\"",
+      "principal": {
+        "type": "A0000",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A0000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A0000::\"\"",
+      "principal": {
+        "type": "A0000",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A0000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A0000::\"\"",
+      "principal": {
+        "type": "A0000",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A0000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A0000::\"\"",
+      "principal": {
+        "type": "A0000",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/68318f2eefc7de93d2490f6452c804087a99b619.json b/cedar-integration-tests/corpus_tests/68318f2eefc7de93d2490f6452c804087a99b619.json
index c7ba0c51f..f2e66468e 100644
--- a/cedar-integration-tests/corpus_tests/68318f2eefc7de93d2490f6452c804087a99b619.json
+++ b/cedar-integration-tests/corpus_tests/68318f2eefc7de93d2490f6452c804087a99b619.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/6834806f09362aae1d6fcbbd2d46b6e318274d19.json b/cedar-integration-tests/corpus_tests/6834806f09362aae1d6fcbbd2d46b6e318274d19.json
index b5ee2c038..d5cd43e71 100644
--- a/cedar-integration-tests/corpus_tests/6834806f09362aae1d6fcbbd2d46b6e318274d19.json
+++ b/cedar-integration-tests/corpus_tests/6834806f09362aae1d6fcbbd2d46b6e318274d19.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r33333k33300::r::a::\"::t:::\"",
-      "action": "r33333k33300::r::Action::\"action\"",
-      "resource": "r33333k33300::r::a::\"::t:::\"",
+      "principal": {
+        "type": "r33333k33300::r::a",
+        "id": "::t:::"
+      },
+      "resource": {
+        "type": "r33333k33300::r::a",
+        "id": "::t:::"
+      },
+      "action": {
+        "type": "r33333k33300::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r33333k33300::r::a::\"::t:::\"",
-      "action": "r33333k33300::r::Action::\"action\"",
-      "resource": "r33333k33300::r::a::\"::t:::\"",
+      "principal": {
+        "type": "r33333k33300::r::a",
+        "id": "::t:::"
+      },
+      "resource": {
+        "type": "r33333k33300::r::a",
+        "id": "::t:::"
+      },
+      "action": {
+        "type": "r33333k33300::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r33333k33300::r::a::\"::t:::\"",
-      "action": "r33333k33300::r::Action::\"action\"",
-      "resource": "r33333k33300::r::a::\"::t:::\"",
+      "principal": {
+        "type": "r33333k33300::r::a",
+        "id": "::t:::"
+      },
+      "resource": {
+        "type": "r33333k33300::r::a",
+        "id": "::t:::"
+      },
+      "action": {
+        "type": "r33333k33300::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r33333k33300::r::a::\"::t:::\"",
-      "action": "r33333k33300::r::Action::\"action\"",
-      "resource": "r33333k33300::r::a::\"::t:::\"",
+      "principal": {
+        "type": "r33333k33300::r::a",
+        "id": "::t:::"
+      },
+      "resource": {
+        "type": "r33333k33300::r::a",
+        "id": "::t:::"
+      },
+      "action": {
+        "type": "r33333k33300::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r33333k33300::r::a::\"::t:::\"",
-      "action": "r33333k33300::r::Action::\"action\"",
-      "resource": "r33333k33300::r::a::\"::t:::\"",
+      "principal": {
+        "type": "r33333k33300::r::a",
+        "id": "::t:::"
+      },
+      "resource": {
+        "type": "r33333k33300::r::a",
+        "id": "::t:::"
+      },
+      "action": {
+        "type": "r33333k33300::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r33333k33300::r::a::\"::t:::\"",
-      "action": "r33333k33300::r::Action::\"action\"",
-      "resource": "r33333k33300::r::a::\"::t:::\"",
+      "principal": {
+        "type": "r33333k33300::r::a",
+        "id": "::t:::"
+      },
+      "resource": {
+        "type": "r33333k33300::r::a",
+        "id": "::t:::"
+      },
+      "action": {
+        "type": "r33333k33300::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r33333k33300::r::a::\"::t:::\"",
-      "action": "r33333k33300::r::Action::\"action\"",
-      "resource": "r33333k33300::r::a::\"::t:::\"",
+      "principal": {
+        "type": "r33333k33300::r::a",
+        "id": "::t:::"
+      },
+      "resource": {
+        "type": "r33333k33300::r::a",
+        "id": "::t:::"
+      },
+      "action": {
+        "type": "r33333k33300::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r33333k33300::r::a::\"::t:::\"",
-      "action": "r33333k33300::r::Action::\"action\"",
-      "resource": "r33333k33300::r::a::\"::t:::\"",
+      "principal": {
+        "type": "r33333k33300::r::a",
+        "id": "::t:::"
+      },
+      "resource": {
+        "type": "r33333k33300::r::a",
+        "id": "::t:::"
+      },
+      "action": {
+        "type": "r33333k33300::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/68364054ff4608130dfc03ad0646f329205daa8d.json b/cedar-integration-tests/corpus_tests/68364054ff4608130dfc03ad0646f329205daa8d.json
index b23de8477..183f3d2e7 100644
--- a/cedar-integration-tests/corpus_tests/68364054ff4608130dfc03ad0646f329205daa8d.json
+++ b/cedar-integration-tests/corpus_tests/68364054ff4608130dfc03ad0646f329205daa8d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/684c3304577b5101215d70be7e3b2decfb3073cb.json b/cedar-integration-tests/corpus_tests/684c3304577b5101215d70be7e3b2decfb3073cb.json
index c13f6dabf..d4c809e2d 100644
--- a/cedar-integration-tests/corpus_tests/684c3304577b5101215d70be7e3b2decfb3073cb.json
+++ b/cedar-integration-tests/corpus_tests/684c3304577b5101215d70be7e3b2decfb3073cb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "sWqsl2kcqaWMlq000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqsl2kcqaWMlq000::\"\"",
+      "principal": {
+        "type": "sWqsl2kcqaWMlq000",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqsl2kcqaWMlq000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "sWqsl2kcqaWMlq000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqsl2kcqaWMlq000::\"\"",
+      "principal": {
+        "type": "sWqsl2kcqaWMlq000",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqsl2kcqaWMlq000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "sWqsl2kcqaWMlq000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqsl2kcqaWMlq000::\"\"",
+      "principal": {
+        "type": "sWqsl2kcqaWMlq000",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqsl2kcqaWMlq000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "sWqsl2kcqaWMlq000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqsl2kcqaWMlq000::\"\"",
+      "principal": {
+        "type": "sWqsl2kcqaWMlq000",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqsl2kcqaWMlq000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "sWqsl2kcqaWMlq000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqsl2kcqaWMlq000::\"\"",
+      "principal": {
+        "type": "sWqsl2kcqaWMlq000",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqsl2kcqaWMlq000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "sWqsl2kcqaWMlq000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqsl2kcqaWMlq000::\"\"",
+      "principal": {
+        "type": "sWqsl2kcqaWMlq000",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqsl2kcqaWMlq000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "sWqsl2kcqaWMlq000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqsl2kcqaWMlq000::\"\"",
+      "principal": {
+        "type": "sWqsl2kcqaWMlq000",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqsl2kcqaWMlq000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "sWqsl2kcqaWMlq000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqsl2kcqaWMlq000::\"\"",
+      "principal": {
+        "type": "sWqsl2kcqaWMlq000",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqsl2kcqaWMlq000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/684f7f301b4fa13998d7837e8b5e770050b2ab5f.json b/cedar-integration-tests/corpus_tests/684f7f301b4fa13998d7837e8b5e770050b2ab5f.json
index 7555b119a..46635c81c 100644
--- a/cedar-integration-tests/corpus_tests/684f7f301b4fa13998d7837e8b5e770050b2ab5f.json
+++ b/cedar-integration-tests/corpus_tests/684f7f301b4fa13998d7837e8b5e770050b2ab5f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\"",
+      "principal": {
+        "type": "a",
+        "id": "#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\"",
+      "principal": {
+        "type": "a",
+        "id": "#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\"",
+      "principal": {
+        "type": "a",
+        "id": "#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\"",
+      "principal": {
+        "type": "a",
+        "id": "#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\"",
+      "principal": {
+        "type": "a",
+        "id": "#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"#\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#\"",
+      "principal": {
+        "type": "a",
+        "id": "#"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/689dc32722e37c0a57f23149549981d951f5ea29.json b/cedar-integration-tests/corpus_tests/689dc32722e37c0a57f23149549981d951f5ea29.json
index e409e082e..01045be17 100644
--- a/cedar-integration-tests/corpus_tests/689dc32722e37c0a57f23149549981d951f5ea29.json
+++ b/cedar-integration-tests/corpus_tests/689dc32722e37c0a57f23149549981d951f5ea29.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "m::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\":::\"",
+      "principal": {
+        "type": "m",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "m",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "m::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\":::\"",
+      "principal": {
+        "type": "m",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "m",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "m::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\":::\"",
+      "principal": {
+        "type": "m",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "m",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "m::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\":::\"",
+      "principal": {
+        "type": "m",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "m",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "m::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\":::\"",
+      "principal": {
+        "type": "m",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "m",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "m::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\":::\"",
+      "principal": {
+        "type": "m",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "m",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "m::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\":::\"",
+      "principal": {
+        "type": "m",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "m",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "m::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\":::\"",
+      "principal": {
+        "type": "m",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "m",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/68cb208b8f03e544f493056524148799476874dc.json b/cedar-integration-tests/corpus_tests/68cb208b8f03e544f493056524148799476874dc.json
index 7315f28cd..2354c31db 100644
--- a/cedar-integration-tests/corpus_tests/68cb208b8f03e544f493056524148799476874dc.json
+++ b/cedar-integration-tests/corpus_tests/68cb208b8f03e544f493056524148799476874dc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/68debdc28bc7bb0b9fde031dd6d2966ce46eddea.json b/cedar-integration-tests/corpus_tests/68debdc28bc7bb0b9fde031dd6d2966ce46eddea.json
index 667f31ada..1b37703e9 100644
--- a/cedar-integration-tests/corpus_tests/68debdc28bc7bb0b9fde031dd6d2966ce46eddea.json
+++ b/cedar-integration-tests/corpus_tests/68debdc28bc7bb0b9fde031dd6d2966ce46eddea.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "mS133o3333b3": ""
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "mS133o3333b3": ""
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "mS133o3333b3": ""
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "mS133o3333b3": ""
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "mS133o3333b3": ""
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "mS133o3333b3": ""
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "mS133o3333b3": ""
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "mS133o3333b3": ""
diff --git a/cedar-integration-tests/corpus_tests/6905796d4dccd760c485e3cb89f45cbab82527d2.json b/cedar-integration-tests/corpus_tests/6905796d4dccd760c485e3cb89f45cbab82527d2.json
index 845944a63..7e09ae628 100644
--- a/cedar-integration-tests/corpus_tests/6905796d4dccd760c485e3cb89f45cbab82527d2.json
+++ b/cedar-integration-tests/corpus_tests/6905796d4dccd760c485e3cb89f45cbab82527d2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "p::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\\u{1b}\"",
+      "principal": {
+        "type": "p",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": "\u001b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "p::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\\u{1b}\"",
+      "principal": {
+        "type": "p",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": "\u001b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "p::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\\u{1b}\"",
+      "principal": {
+        "type": "p",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": "\u001b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "p::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\\u{1b}\"",
+      "principal": {
+        "type": "p",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": "\u001b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "p::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\\u{1b}\"",
+      "principal": {
+        "type": "p",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": "\u001b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "p::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\\u{1b}\"",
+      "principal": {
+        "type": "p",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": "\u001b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "p::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\\u{1b}\"",
+      "principal": {
+        "type": "p",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": "\u001b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "p::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\\u{1b}\"",
+      "principal": {
+        "type": "p",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": "\u001b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/691e9453786f2fc93c9edcf3df9e10a9e63370b2.json b/cedar-integration-tests/corpus_tests/691e9453786f2fc93c9edcf3df9e10a9e63370b2.json
index cc72c039f..4f1e99299 100644
--- a/cedar-integration-tests/corpus_tests/691e9453786f2fc93c9edcf3df9e10a9e63370b2.json
+++ b/cedar-integration-tests/corpus_tests/691e9453786f2fc93c9edcf3df9e10a9e63370b2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/6921d9a2ecdfcfee6cce4ff1f90ee25865ba761a.json b/cedar-integration-tests/corpus_tests/6921d9a2ecdfcfee6cce4ff1f90ee25865ba761a.json
index ab9e391be..114f44cc5 100644
--- a/cedar-integration-tests/corpus_tests/6921d9a2ecdfcfee6cce4ff1f90ee25865ba761a.json
+++ b/cedar-integration-tests/corpus_tests/6921d9a2ecdfcfee6cce4ff1f90ee25865ba761a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/692368edab7dbe12bd7306465c125b29971d8b32.json b/cedar-integration-tests/corpus_tests/692368edab7dbe12bd7306465c125b29971d8b32.json
index 190f3d55f..94bf9c92c 100644
--- a/cedar-integration-tests/corpus_tests/692368edab7dbe12bd7306465c125b29971d8b32.json
+++ b/cedar-integration-tests/corpus_tests/692368edab7dbe12bd7306465c125b29971d8b32.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"[\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "["
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"[\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"[\"",
+      "principal": {
+        "type": "a",
+        "id": "["
+      },
+      "resource": {
+        "type": "a",
+        "id": "["
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"[\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"[\"",
+      "principal": {
+        "type": "a",
+        "id": "["
+      },
+      "resource": {
+        "type": "a",
+        "id": "["
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"[\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"[\"",
+      "principal": {
+        "type": "a",
+        "id": "["
+      },
+      "resource": {
+        "type": "a",
+        "id": "["
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"[\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"[\"",
+      "principal": {
+        "type": "a",
+        "id": "["
+      },
+      "resource": {
+        "type": "a",
+        "id": "["
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"[\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"[\"",
+      "principal": {
+        "type": "a",
+        "id": "["
+      },
+      "resource": {
+        "type": "a",
+        "id": "["
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"[\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"[\"",
+      "principal": {
+        "type": "a",
+        "id": "["
+      },
+      "resource": {
+        "type": "a",
+        "id": "["
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"[\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"[\"",
+      "principal": {
+        "type": "a",
+        "id": "["
+      },
+      "resource": {
+        "type": "a",
+        "id": "["
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/697631c6c95119acf45b4b20267488ac7a700b02.json b/cedar-integration-tests/corpus_tests/697631c6c95119acf45b4b20267488ac7a700b02.json
index b7ff99e3c..3c28fe448 100644
--- a/cedar-integration-tests/corpus_tests/697631c6c95119acf45b4b20267488ac7a700b02.json
+++ b/cedar-integration-tests/corpus_tests/697631c6c95119acf45b4b20267488ac7a700b02.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::a::\"j\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"j\"",
+      "principal": {
+        "type": "A::a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "j"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/6984a182df03f0aac385f34679e4c3c20137d479.json b/cedar-integration-tests/corpus_tests/6984a182df03f0aac385f34679e4c3c20137d479.json
index fb571cb6c..1b63f75a5 100644
--- a/cedar-integration-tests/corpus_tests/6984a182df03f0aac385f34679e4c3c20137d479.json
+++ b/cedar-integration-tests/corpus_tests/6984a182df03f0aac385f34679e4c3c20137d479.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "m::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\"\\0\"",
+      "principal": {
+        "type": "m",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "m",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "m::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "m",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "m",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "m::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\"\\0\"",
+      "principal": {
+        "type": "m",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "m",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "m::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\"\\0\"",
+      "principal": {
+        "type": "m",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "m",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "m::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\"\\0\"",
+      "principal": {
+        "type": "m",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "m",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "m::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\"\\0\"",
+      "principal": {
+        "type": "m",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "m",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "m::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\"\\0\"",
+      "principal": {
+        "type": "m",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "m",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "m::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "m::\"\\0\"",
+      "principal": {
+        "type": "m",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "m",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/69ca4af315a692202dd173f97a2332896d49e692.json b/cedar-integration-tests/corpus_tests/69ca4af315a692202dd173f97a2332896d49e692.json
index c4b62cdb5..7d3962d2f 100644
--- a/cedar-integration-tests/corpus_tests/69ca4af315a692202dd173f97a2332896d49e692.json
+++ b/cedar-integration-tests/corpus_tests/69ca4af315a692202dd173f97a2332896d49e692.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::a::\"\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::a::\"\\0\"",
+      "principal": {
+        "type": "r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::a::\"\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::a::\"\"",
+      "principal": {
+        "type": "r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::a::\"\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::a::\"\\0\"",
+      "principal": {
+        "type": "r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::a::\"\\0\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::a::\"\\0\"",
+      "principal": {
+        "type": "r::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "r::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::a::\"\\0\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::a::\"\\0\"",
+      "principal": {
+        "type": "r::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "r::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::a::\"\\0\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::a::\"\\0\"",
+      "principal": {
+        "type": "r::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "r::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::a::\"\\0\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::a::\"\\0\"",
+      "principal": {
+        "type": "r::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "r::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::a::\"\\0\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::a::\"\\0\"",
+      "principal": {
+        "type": "r::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "r::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/69d41647b14ed47571fe950f2fbda31127455843.json b/cedar-integration-tests/corpus_tests/69d41647b14ed47571fe950f2fbda31127455843.json
index 69ec44c08..76e9e21d4 100644
--- a/cedar-integration-tests/corpus_tests/69d41647b14ed47571fe950f2fbda31127455843.json
+++ b/cedar-integration-tests/corpus_tests/69d41647b14ed47571fe950f2fbda31127455843.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/6a23c5fb1ef322b8f01e0ab9652bc294e36db2fa.json b/cedar-integration-tests/corpus_tests/6a23c5fb1ef322b8f01e0ab9652bc294e36db2fa.json
index bcb02a0ce..600e01692 100644
--- a/cedar-integration-tests/corpus_tests/6a23c5fb1ef322b8f01e0ab9652bc294e36db2fa.json
+++ b/cedar-integration-tests/corpus_tests/6a23c5fb1ef322b8f01e0ab9652bc294e36db2fa.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0FFFFFFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0FFFFFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000FFFFFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000FFFFFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0FFFFFFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0FFFFFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000FFFFFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000FFFFFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0FFFFFFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0FFFFFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000FFFFFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000FFFFFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0FFFFFFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0FFFFFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000FFFFFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000FFFFFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0FFFFFFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0FFFFFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000FFFFFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000FFFFFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0FFFFFFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0FFFFFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000FFFFFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000FFFFFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0FFFFFFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0FFFFFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000FFFFFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000FFFFFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0FFFFFFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0FFFFFFF\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000FFFFFFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000FFFFFFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/6a405134ca667831ffd1e2633bc903c171c8bc27.json b/cedar-integration-tests/corpus_tests/6a405134ca667831ffd1e2633bc903c171c8bc27.json
index a35f2d541..0f13e716f 100644
--- a/cedar-integration-tests/corpus_tests/6a405134ca667831ffd1e2633bc903c171c8bc27.json
+++ b/cedar-integration-tests/corpus_tests/6a405134ca667831ffd1e2633bc903c171c8bc27.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/6a7418396e090ede0881c9cd4144898403c3ebbc.json b/cedar-integration-tests/corpus_tests/6a7418396e090ede0881c9cd4144898403c3ebbc.json
index 693d3fa24..4526347a7 100644
--- a/cedar-integration-tests/corpus_tests/6a7418396e090ede0881c9cd4144898403c3ebbc.json
+++ b/cedar-integration-tests/corpus_tests/6a7418396e090ede0881c9cd4144898403c3ebbc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {
         "A2": true
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {
         "A2": false
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {
         "A2": false
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {
         "A2": false
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {
         "A2": false
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {
         "A2": false
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {
         "A2": false
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {
         "A2": false
       },
diff --git a/cedar-integration-tests/corpus_tests/6a80d8de7f543465fbf4d89e1e2b6f6ae0616e82.json b/cedar-integration-tests/corpus_tests/6a80d8de7f543465fbf4d89e1e2b6f6ae0616e82.json
index 66f3ef411..119a80292 100644
--- a/cedar-integration-tests/corpus_tests/6a80d8de7f543465fbf4d89e1e2b6f6ae0616e82.json
+++ b/cedar-integration-tests/corpus_tests/6a80d8de7f543465fbf4d89e1e2b6f6ae0616e82.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/6a9d1b9638b00d05d7795dd89b30162da95c9441.json b/cedar-integration-tests/corpus_tests/6a9d1b9638b00d05d7795dd89b30162da95c9441.json
index 236802c52..969d802cd 100644
--- a/cedar-integration-tests/corpus_tests/6a9d1b9638b00d05d7795dd89b30162da95c9441.json
+++ b/cedar-integration-tests/corpus_tests/6a9d1b9638b00d05d7795dd89b30162da95c9441.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "B::a::\"\\0fffffbffff\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"\\0fffffbffff\"",
+      "principal": {
+        "type": "B::a",
+        "id": "\u0000fffffbffff"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "\u0000fffffbffff"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "B::a::\"\\0fffffbffff\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"\\0fffffbffff\"",
+      "principal": {
+        "type": "B::a",
+        "id": "\u0000fffffbffff"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "\u0000fffffbffff"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "B::a::\"\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"\\0fffffbffff\"",
+      "principal": {
+        "type": "B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "\u0000fffffbffff"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "B::a::\"\\0fffffbffff\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"\\0fffffbffff\"",
+      "principal": {
+        "type": "B::a",
+        "id": "\u0000fffffbffff"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "\u0000fffffbffff"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "B::a::\"\\0fffffbffff\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"\\0fffffbffff\"",
+      "principal": {
+        "type": "B::a",
+        "id": "\u0000fffffbffff"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "\u0000fffffbffff"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "B::a::\"\\0fffffbffff\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"\\0fffffbffff\"",
+      "principal": {
+        "type": "B::a",
+        "id": "\u0000fffffbffff"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "\u0000fffffbffff"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "B::a::\"\\0fffffbffff\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"\\0fffffbffff\"",
+      "principal": {
+        "type": "B::a",
+        "id": "\u0000fffffbffff"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "\u0000fffffbffff"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "B::a::\"\\0fffffbffff\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"\\0fffffbffff\"",
+      "principal": {
+        "type": "B::a",
+        "id": "\u0000fffffbffff"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "\u0000fffffbffff"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/6af53a1267dedc8cca5e2bcf8053e0004bbe90c7.json b/cedar-integration-tests/corpus_tests/6af53a1267dedc8cca5e2bcf8053e0004bbe90c7.json
index c1881f3c1..b75917c67 100644
--- a/cedar-integration-tests/corpus_tests/6af53a1267dedc8cca5e2bcf8053e0004bbe90c7.json
+++ b/cedar-integration-tests/corpus_tests/6af53a1267dedc8cca5e2bcf8053e0004bbe90c7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "J0000000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "J0000000::\"\"",
+      "principal": {
+        "type": "J0000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "J0000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Famklwww": "",
         "FYkdqhY0000000": ""
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "J0000000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "J0000000::\"\"",
+      "principal": {
+        "type": "J0000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "J0000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Famklwww": "",
         "FYkdqhY0000000": ""
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "J0000000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "J0000000::\"\"",
+      "principal": {
+        "type": "J0000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "J0000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Famklwww": "",
         "FYkdqhY0000000": ""
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "J0000000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "J0000000::\"\"",
+      "principal": {
+        "type": "J0000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "J0000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Famklwww": "",
         "FYkdqhY0000000": ""
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "J0000000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "J0000000::\"\"",
+      "principal": {
+        "type": "J0000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "J0000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Famklwww": "",
         "FYkdqhY0000000": ""
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "J0000000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "J0000000::\"\"",
+      "principal": {
+        "type": "J0000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "J0000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Famklwww": "",
         "FYkdqhY0000000": ""
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "J0000000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "J0000000::\"\"",
+      "principal": {
+        "type": "J0000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "J0000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Famklwww": "",
         "FYkdqhY0000000": ""
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "J0000000::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "J0000000::\"\"",
+      "principal": {
+        "type": "J0000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "J0000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Famklwww": "",
         "FYkdqhY0000000": ""
diff --git a/cedar-integration-tests/corpus_tests/6af9d7dcf0429428e6e566ea67e90cd2a92c0606.json b/cedar-integration-tests/corpus_tests/6af9d7dcf0429428e6e566ea67e90cd2a92c0606.json
index ca49456da..64375cd5a 100644
--- a/cedar-integration-tests/corpus_tests/6af9d7dcf0429428e6e566ea67e90cd2a92c0606.json
+++ b/cedar-integration-tests/corpus_tests/6af9d7dcf0429428e6e566ea67e90cd2a92c0606.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/6b4764209b7d9aa251bf79f721ac35c9cbbd3eae.json b/cedar-integration-tests/corpus_tests/6b4764209b7d9aa251bf79f721ac35c9cbbd3eae.json
index 2033ab189..595f4f879 100644
--- a/cedar-integration-tests/corpus_tests/6b4764209b7d9aa251bf79f721ac35c9cbbd3eae.json
+++ b/cedar-integration-tests/corpus_tests/6b4764209b7d9aa251bf79f721ac35c9cbbd3eae.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/6b4e82a987352dc8dcce60ddabe05da8409325bf.json b/cedar-integration-tests/corpus_tests/6b4e82a987352dc8dcce60ddabe05da8409325bf.json
index df0fb3dd8..8f1ffca1c 100644
--- a/cedar-integration-tests/corpus_tests/6b4e82a987352dc8dcce60ddabe05da8409325bf.json
+++ b/cedar-integration-tests/corpus_tests/6b4e82a987352dc8dcce60ddabe05da8409325bf.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/6b787ff93eaf47694db647e9981122e6f71896cb.json b/cedar-integration-tests/corpus_tests/6b787ff93eaf47694db647e9981122e6f71896cb.json
index bf3028168..8da709c3e 100644
--- a/cedar-integration-tests/corpus_tests/6b787ff93eaf47694db647e9981122e6f71896cb.json
+++ b/cedar-integration-tests/corpus_tests/6b787ff93eaf47694db647e9981122e6f71896cb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/6b963e4ae007e7f7dac2eacabae5954b61b0fa9a.json b/cedar-integration-tests/corpus_tests/6b963e4ae007e7f7dac2eacabae5954b61b0fa9a.json
index 39e566d3b..4f0d7fa34 100644
--- a/cedar-integration-tests/corpus_tests/6b963e4ae007e7f7dac2eacabae5954b61b0fa9a.json
+++ b/cedar-integration-tests/corpus_tests/6b963e4ae007e7f7dac2eacabae5954b61b0fa9a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/6bb7b7d5396f2e5850df4a465f8ee22385254062.json b/cedar-integration-tests/corpus_tests/6bb7b7d5396f2e5850df4a465f8ee22385254062.json
index 33fc54ed0..0bfe8e27b 100644
--- a/cedar-integration-tests/corpus_tests/6bb7b7d5396f2e5850df4a465f8ee22385254062.json
+++ b/cedar-integration-tests/corpus_tests/6bb7b7d5396f2e5850df4a465f8ee22385254062.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"::::::\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"::::::\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"::::::\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"::::::\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"::::::\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"::::::\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"::::::\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"::::::\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/6bd85935b72b96cef2480563a8b387fbe994645c.json b/cedar-integration-tests/corpus_tests/6bd85935b72b96cef2480563a8b387fbe994645c.json
index 4aa9e9cd0..e60aa8323 100644
--- a/cedar-integration-tests/corpus_tests/6bd85935b72b96cef2480563a8b387fbe994645c.json
+++ b/cedar-integration-tests/corpus_tests/6bd85935b72b96cef2480563a8b387fbe994645c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/6c3775c309f54696e29118db9d532a48f35f79ae.json b/cedar-integration-tests/corpus_tests/6c3775c309f54696e29118db9d532a48f35f79ae.json
index 24cf2c536..bfbbbdcb6 100644
--- a/cedar-integration-tests/corpus_tests/6c3775c309f54696e29118db9d532a48f35f79ae.json
+++ b/cedar-integration-tests/corpus_tests/6c3775c309f54696e29118db9d532a48f35f79ae.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/6c66c9279f1c5e69a767457ec2006f22e3966fe2.json b/cedar-integration-tests/corpus_tests/6c66c9279f1c5e69a767457ec2006f22e3966fe2.json
index 6e497d164..99cf6c1c1 100644
--- a/cedar-integration-tests/corpus_tests/6c66c9279f1c5e69a767457ec2006f22e3966fe2.json
+++ b/cedar-integration-tests/corpus_tests/6c66c9279f1c5e69a767457ec2006f22e3966fe2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/6ca329d5b193d19c6512dbddb1a50128e34ce690.json b/cedar-integration-tests/corpus_tests/6ca329d5b193d19c6512dbddb1a50128e34ce690.json
index bf040e09f..c6b905ae5 100644
--- a/cedar-integration-tests/corpus_tests/6ca329d5b193d19c6512dbddb1a50128e34ce690.json
+++ b/cedar-integration-tests/corpus_tests/6ca329d5b193d19c6512dbddb1a50128e34ce690.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"FF%%\\0\\0\\0\\0\\0\\0\\0@\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0\\0\\0\\0\\0\\0@\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"FF%%\\0\\0\\0\\0\\0\\0\\0@\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0\\0\\0\\0\\0\\0@\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"FF%%\\0\\0\\0\\0\\0\\0\\0@\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0\\0\\0\\0\\0\\0@\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"FF%%\\0\\0\\0\\0\\0\\0\\0@\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0\\0\\0\\0\\0\\0@\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"FF%%\\0\\0\\0\\0\\0\\0\\0@\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0\\0\\0\\0\\0\\0@\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"FF%%\\0\\0\\0\\0\\0\\0\\0@\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0\\0\\0\\0\\0\\0@\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"FF%%\\0\\0\\0\\0\\0\\0\\0@\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0\\0\\0\\0\\0\\0@\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"FF%%\\0\\0\\0\\0\\0\\0\\0@\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0\\0\\0\\0\\0\\0@\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000\u0000\u0000\u0000\u0000\u0000@\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/6ca51aa544f3347ee2555c7157554cfef53c48d3.json b/cedar-integration-tests/corpus_tests/6ca51aa544f3347ee2555c7157554cfef53c48d3.json
index 69884b38b..7f466f36a 100644
--- a/cedar-integration-tests/corpus_tests/6ca51aa544f3347ee2555c7157554cfef53c48d3.json
+++ b/cedar-integration-tests/corpus_tests/6ca51aa544f3347ee2555c7157554cfef53c48d3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/6cd716bec960cc0a84556d82e5f5475b59192344.json b/cedar-integration-tests/corpus_tests/6cd716bec960cc0a84556d82e5f5475b59192344.json
index 298794594..ab06af4d2 100644
--- a/cedar-integration-tests/corpus_tests/6cd716bec960cc0a84556d82e5f5475b59192344.json
+++ b/cedar-integration-tests/corpus_tests/6cd716bec960cc0a84556d82e5f5475b59192344.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"BBB\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "BBB\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/6ce55f921806bc574050a450b7b8faa303c9f3fc.json b/cedar-integration-tests/corpus_tests/6ce55f921806bc574050a450b7b8faa303c9f3fc.json
index da2366f73..46cc37908 100644
--- a/cedar-integration-tests/corpus_tests/6ce55f921806bc574050a450b7b8faa303c9f3fc.json
+++ b/cedar-integration-tests/corpus_tests/6ce55f921806bc574050a450b7b8faa303c9f3fc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/6cfc2e19564dc9b5d218fb1b7c5387cf4ff164bd.json b/cedar-integration-tests/corpus_tests/6cfc2e19564dc9b5d218fb1b7c5387cf4ff164bd.json
index f426753c1..9caa2e6d9 100644
--- a/cedar-integration-tests/corpus_tests/6cfc2e19564dc9b5d218fb1b7c5387cf4ff164bd.json
+++ b/cedar-integration-tests/corpus_tests/6cfc2e19564dc9b5d218fb1b7c5387cf4ff164bd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"FFFA\\0\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFA\\0\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFA\u0000\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFA\u0000\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"FFFA\\0\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFA\\0\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFA\u0000\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFA\u0000\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"FFFA\\0\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFA\\0\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFA\u0000\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFA\u0000\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"FFFA\\0\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFA\\0\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFA\u0000\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFA\u0000\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"FFFA\\0\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFA\\0\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFA\u0000\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFA\u0000\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"FFFA\\0\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFA\\0\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFA\u0000\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFA\u0000\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"FFFA\\0\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFA\\0\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFA\u0000\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFA\u0000\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"FFFA\\0\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFA\\0\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFA\u0000\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFA\u0000\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/6de05639a846fa66cbb84d304bd0fdb02a941f71.json b/cedar-integration-tests/corpus_tests/6de05639a846fa66cbb84d304bd0fdb02a941f71.json
index 3292e1030..e42325676 100644
--- a/cedar-integration-tests/corpus_tests/6de05639a846fa66cbb84d304bd0fdb02a941f71.json
+++ b/cedar-integration-tests/corpus_tests/6de05639a846fa66cbb84d304bd0fdb02a941f71.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"y/\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"y/\"",
+      "principal": {
+        "type": "a",
+        "id": "y/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "y/"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"y/\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"y/\"",
+      "principal": {
+        "type": "a",
+        "id": "y/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "y/"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"y/\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"y/\"",
+      "principal": {
+        "type": "a",
+        "id": "y/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "y/"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"y/\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"y/\"",
+      "principal": {
+        "type": "a",
+        "id": "y/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "y/"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"y/\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"y/\"",
+      "principal": {
+        "type": "a",
+        "id": "y/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "y/"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"y/\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"y/\"",
+      "principal": {
+        "type": "a",
+        "id": "y/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "y/"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"y/\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"y/\"",
+      "principal": {
+        "type": "a",
+        "id": "y/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "y/"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"y/\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"y/\"",
+      "principal": {
+        "type": "a",
+        "id": "y/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "y/"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/6e49c3e38920168a198b70b6d04c853866146440.json b/cedar-integration-tests/corpus_tests/6e49c3e38920168a198b70b6d04c853866146440.json
index ae9c449d9..0381029bf 100644
--- a/cedar-integration-tests/corpus_tests/6e49c3e38920168a198b70b6d04c853866146440.json
+++ b/cedar-integration-tests/corpus_tests/6e49c3e38920168a198b70b6d04c853866146440.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/6e57104bd2645f6d8da6fb3b46cac26ec681221a.json b/cedar-integration-tests/corpus_tests/6e57104bd2645f6d8da6fb3b46cac26ec681221a.json
index 418b05d3a..3142641e6 100644
--- a/cedar-integration-tests/corpus_tests/6e57104bd2645f6d8da6fb3b46cac26ec681221a.json
+++ b/cedar-integration-tests/corpus_tests/6e57104bd2645f6d8da6fb3b46cac26ec681221a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/6e8e7e91c57a86a78c4b78b8d7ea11c198a11fc5.json b/cedar-integration-tests/corpus_tests/6e8e7e91c57a86a78c4b78b8d7ea11c198a11fc5.json
index d093e72b9..6638d1ce3 100644
--- a/cedar-integration-tests/corpus_tests/6e8e7e91c57a86a78c4b78b8d7ea11c198a11fc5.json
+++ b/cedar-integration-tests/corpus_tests/6e8e7e91c57a86a78c4b78b8d7ea11c198a11fc5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0ff\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0ff\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0ff\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0ff\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0ff\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0ff\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0ff\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0ff\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/6f09236a6b94b54ed6bde936d3a073a02a6a6376.json b/cedar-integration-tests/corpus_tests/6f09236a6b94b54ed6bde936d3a073a02a6a6376.json
index 91010228f..357ed1ccc 100644
--- a/cedar-integration-tests/corpus_tests/6f09236a6b94b54ed6bde936d3a073a02a6a6376.json
+++ b/cedar-integration-tests/corpus_tests/6f09236a6b94b54ed6bde936d3a073a02a6a6376.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/6f39fc31e46817318751745ca182faa912a002f0.json b/cedar-integration-tests/corpus_tests/6f39fc31e46817318751745ca182faa912a002f0.json
index 6da1c2393..4de9a0fdf 100644
--- a/cedar-integration-tests/corpus_tests/6f39fc31e46817318751745ca182faa912a002f0.json
+++ b/cedar-integration-tests/corpus_tests/6f39fc31e46817318751745ca182faa912a002f0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -82,9 +145,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/6f45f0b3fe354bafdcc5e920c4331321fa57780d.json b/cedar-integration-tests/corpus_tests/6f45f0b3fe354bafdcc5e920c4331321fa57780d.json
index 3c3a7a6f0..5ff396f94 100644
--- a/cedar-integration-tests/corpus_tests/6f45f0b3fe354bafdcc5e920c4331321fa57780d.json
+++ b/cedar-integration-tests/corpus_tests/6f45f0b3fe354bafdcc5e920c4331321fa57780d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::a::\"\\0\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\\0\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::a::\"\\0\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/6f59cb5117c6fb1fb9971f546ff4a718f545aa25.json b/cedar-integration-tests/corpus_tests/6f59cb5117c6fb1fb9971f546ff4a718f545aa25.json
index 64c88bc00..e1cb2777b 100644
--- a/cedar-integration-tests/corpus_tests/6f59cb5117c6fb1fb9971f546ff4a718f545aa25.json
+++ b/cedar-integration-tests/corpus_tests/6f59cb5117c6fb1fb9971f546ff4a718f545aa25.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"z\\0\\0!\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "z\u0000\u0000!\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"z\\0\\0!\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\\0\\0!\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "z\u0000\u0000!\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z\u0000\u0000!\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/6f80f1549b17696747e5cba66bb4997ff843d81f.json b/cedar-integration-tests/corpus_tests/6f80f1549b17696747e5cba66bb4997ff843d81f.json
index b08a09487..e41fd0abf 100644
--- a/cedar-integration-tests/corpus_tests/6f80f1549b17696747e5cba66bb4997ff843d81f.json
+++ b/cedar-integration-tests/corpus_tests/6f80f1549b17696747e5cba66bb4997ff843d81f.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/6fa62d99a95be2f5acd33b1d6072299cfab24505.json b/cedar-integration-tests/corpus_tests/6fa62d99a95be2f5acd33b1d6072299cfab24505.json
index 2a1851ae0..96feb346e 100644
--- a/cedar-integration-tests/corpus_tests/6fa62d99a95be2f5acd33b1d6072299cfab24505.json
+++ b/cedar-integration-tests/corpus_tests/6fa62d99a95be2f5acd33b1d6072299cfab24505.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::W::r::a::\"\"",
-      "action": "r::W::r::Action::\"action\"",
-      "resource": "r::W::r::a::\"\"",
+      "principal": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::W::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::W::r::a::\"\"",
-      "action": "r::W::r::Action::\"action\"",
-      "resource": "r::W::r::a::\"\"",
+      "principal": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::W::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::W::r::a::\"\"",
-      "action": "r::W::r::Action::\"action\"",
-      "resource": "r::W::r::a::\"\"",
+      "principal": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::W::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::W::r::a::\"\"",
-      "action": "r::W::r::Action::\"action\"",
-      "resource": "r::W::r::a::\"\"",
+      "principal": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::W::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::W::r::a::\"\"",
-      "action": "r::W::r::Action::\"action\"",
-      "resource": "r::W::r::a::\"\"",
+      "principal": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::W::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::W::r::a::\"\"",
-      "action": "r::W::r::Action::\"action\"",
-      "resource": "r::W::r::a::\"\"",
+      "principal": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::W::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::W::r::a::\"\"",
-      "action": "r::W::r::Action::\"action\"",
-      "resource": "r::W::r::a::\"\"",
+      "principal": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::W::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::W::r::a::\"\"",
-      "action": "r::W::r::Action::\"action\"",
-      "resource": "r::W::r::a::\"\"",
+      "principal": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::W::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::W::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/6fd8189e2fe88662dc06a04df0676824c692e94a.json b/cedar-integration-tests/corpus_tests/6fd8189e2fe88662dc06a04df0676824c692e94a.json
index b880aa2c6..02d2d4310 100644
--- a/cedar-integration-tests/corpus_tests/6fd8189e2fe88662dc06a04df0676824c692e94a.json
+++ b/cedar-integration-tests/corpus_tests/6fd8189e2fe88662dc06a04df0676824c692e94a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/702a0eed1ebff6ff86c8b11a288329d3c6058d52.json b/cedar-integration-tests/corpus_tests/702a0eed1ebff6ff86c8b11a288329d3c6058d52.json
index f3c11719b..e69f42356 100644
--- a/cedar-integration-tests/corpus_tests/702a0eed1ebff6ff86c8b11a288329d3c6058d52.json
+++ b/cedar-integration-tests/corpus_tests/702a0eed1ebff6ff86c8b11a288329d3c6058d52.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "",
         "w": ""
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "",
         "w": ""
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "",
         "w": ""
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "",
         "w": ""
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "",
         "w": ""
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "",
         "w": ""
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "",
         "w": ""
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "",
         "w": ""
diff --git a/cedar-integration-tests/corpus_tests/7109315f6f0894fb9a66f68a3ce989a8df283dcb.json b/cedar-integration-tests/corpus_tests/7109315f6f0894fb9a66f68a3ce989a8df283dcb.json
index 30d1048ec..ef3898be4 100644
--- a/cedar-integration-tests/corpus_tests/7109315f6f0894fb9a66f68a3ce989a8df283dcb.json
+++ b/cedar-integration-tests/corpus_tests/7109315f6f0894fb9a66f68a3ce989a8df283dcb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"::4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::4\"",
+      "principal": {
+        "type": "a",
+        "id": "::4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::4"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/71500876d9546ead0a4fc26858db3e0b22985791.json b/cedar-integration-tests/corpus_tests/71500876d9546ead0a4fc26858db3e0b22985791.json
index f7971db79..c95fe7c07 100644
--- a/cedar-integration-tests/corpus_tests/71500876d9546ead0a4fc26858db3e0b22985791.json
+++ b/cedar-integration-tests/corpus_tests/71500876d9546ead0a4fc26858db3e0b22985791.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"::A\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::A\"",
+      "principal": {
+        "type": "a",
+        "id": "::A"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::A"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"::A\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::A\"",
+      "principal": {
+        "type": "a",
+        "id": "::A"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::A"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"::A\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::A\"",
+      "principal": {
+        "type": "a",
+        "id": "::A"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::A"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"::A\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::A\"",
+      "principal": {
+        "type": "a",
+        "id": "::A"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::A"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"::A\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::A\"",
+      "principal": {
+        "type": "a",
+        "id": "::A"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::A"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"::A\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::A\"",
+      "principal": {
+        "type": "a",
+        "id": "::A"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::A"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"::A\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::A\"",
+      "principal": {
+        "type": "a",
+        "id": "::A"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::A"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"::A\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::A\"",
+      "principal": {
+        "type": "a",
+        "id": "::A"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::A"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/715b64a2f2bfe9838dd219497fd43af7a945e63b.json b/cedar-integration-tests/corpus_tests/715b64a2f2bfe9838dd219497fd43af7a945e63b.json
index ede54da8d..14a6b40a8 100644
--- a/cedar-integration-tests/corpus_tests/715b64a2f2bfe9838dd219497fd43af7a945e63b.json
+++ b/cedar-integration-tests/corpus_tests/715b64a2f2bfe9838dd219497fd43af7a945e63b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/71b7c9224c7bc61c360c980314c8846dfe6b6d42.json b/cedar-integration-tests/corpus_tests/71b7c9224c7bc61c360c980314c8846dfe6b6d42.json
index 045fee3ff..97cdb2aff 100644
--- a/cedar-integration-tests/corpus_tests/71b7c9224c7bc61c360c980314c8846dfe6b6d42.json
+++ b/cedar-integration-tests/corpus_tests/71b7c9224c7bc61c360c980314c8846dfe6b6d42.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/71bac38d9141511e7691466bdfde0c88f66090a5.json b/cedar-integration-tests/corpus_tests/71bac38d9141511e7691466bdfde0c88f66090a5.json
index bd75de2f3..c06b3c473 100644
--- a/cedar-integration-tests/corpus_tests/71bac38d9141511e7691466bdfde0c88f66090a5.json
+++ b/cedar-integration-tests/corpus_tests/71bac38d9141511e7691466bdfde0c88f66090a5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}s\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}s\"",
+      "principal": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011s"
+      },
+      "resource": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011s"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}s\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}s\"",
+      "principal": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011s"
+      },
+      "resource": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011s"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}s\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}s\"",
+      "principal": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011s"
+      },
+      "resource": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011s"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}s\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}s\"",
+      "principal": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011s"
+      },
+      "resource": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011s"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}s\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}s\"",
+      "principal": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011s"
+      },
+      "resource": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011s"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}s\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}s\"",
+      "principal": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011s"
+      },
+      "resource": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011s"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}s\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}s\"",
+      "principal": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011s"
+      },
+      "resource": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011s"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}s\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"L\\0\\0\\0\\0\\0\\u{2}\\u{1}\\0\\0\\0\\0\\0\\0\\0\\0\\u{11}s\"",
+      "principal": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011s"
+      },
+      "resource": {
+        "type": "a",
+        "id": "L\u0000\u0000\u0000\u0000\u0000\u0002\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0011s"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/71c8f2589f53af052906ae69136a7479ba446ec1.json b/cedar-integration-tests/corpus_tests/71c8f2589f53af052906ae69136a7479ba446ec1.json
index 90111ccc3..51ebde139 100644
--- a/cedar-integration-tests/corpus_tests/71c8f2589f53af052906ae69136a7479ba446ec1.json
+++ b/cedar-integration-tests/corpus_tests/71c8f2589f53af052906ae69136a7479ba446ec1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/71d4fe6ed6a265145c056d17295c0cc32006db90.json b/cedar-integration-tests/corpus_tests/71d4fe6ed6a265145c056d17295c0cc32006db90.json
index dcb586787..3d3fe95a5 100644
--- a/cedar-integration-tests/corpus_tests/71d4fe6ed6a265145c056d17295c0cc32006db90.json
+++ b/cedar-integration-tests/corpus_tests/71d4fe6ed6a265145c056d17295c0cc32006db90.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0F\\u{2}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000F\u0002\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"FF%%\\0\\0F\\u{2}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0F\\u{2}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000F\u0002\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000F\u0002\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"FF%%\\0\\0F\\u{2}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0F\\u{2}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000F\u0002\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000F\u0002\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"FF%%\\0\\0F\\u{2}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0F\\u{2}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000F\u0002\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000F\u0002\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"FF%%\\0\\0F\\u{2}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0F\\u{2}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000F\u0002\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000F\u0002\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"FF%%\\0\\0F\\u{2}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0F\\u{2}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000F\u0002\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000F\u0002\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"FF%%\\0\\0F\\u{2}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0F\\u{2}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000F\u0002\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000F\u0002\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"FF%%\\0\\0F\\u{2}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0F\\u{2}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000F\u0002\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000F\u0002\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/7284584f3d64e4a462729a2952f283b5a6bfe3ea.json b/cedar-integration-tests/corpus_tests/7284584f3d64e4a462729a2952f283b5a6bfe3ea.json
index 737598857..dd532003c 100644
--- a/cedar-integration-tests/corpus_tests/7284584f3d64e4a462729a2952f283b5a6bfe3ea.json
+++ b/cedar-integration-tests/corpus_tests/7284584f3d64e4a462729a2952f283b5a6bfe3ea.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/728e7c4e709364b4251fe7988f3c8a48ba15b7da.json b/cedar-integration-tests/corpus_tests/728e7c4e709364b4251fe7988f3c8a48ba15b7da.json
index 4992715d0..fa118ae72 100644
--- a/cedar-integration-tests/corpus_tests/728e7c4e709364b4251fe7988f3c8a48ba15b7da.json
+++ b/cedar-integration-tests/corpus_tests/728e7c4e709364b4251fe7988f3c8a48ba15b7da.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "L::V::r::\"\"",
-      "action": "L::V::Action::\"fffff\"",
-      "resource": "L::V::r::\"\"",
+      "principal": {
+        "type": "L::V::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "L::V::r",
+        "id": ""
+      },
+      "action": {
+        "type": "L::V::Action",
+        "id": "fffff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "L::V::r::\"\"",
-      "action": "L::V::Action::\"fffff\"",
-      "resource": "L::V::r::\"\"",
+      "principal": {
+        "type": "L::V::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "L::V::r",
+        "id": ""
+      },
+      "action": {
+        "type": "L::V::Action",
+        "id": "fffff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "L::V::r::\"\"",
-      "action": "L::V::Action::\"fffff\"",
-      "resource": "L::V::r::\"\"",
+      "principal": {
+        "type": "L::V::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "L::V::r",
+        "id": ""
+      },
+      "action": {
+        "type": "L::V::Action",
+        "id": "fffff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "L::V::r::\"\"",
-      "action": "L::V::Action::\"fffff\"",
-      "resource": "L::V::r::\"\"",
+      "principal": {
+        "type": "L::V::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "L::V::r",
+        "id": ""
+      },
+      "action": {
+        "type": "L::V::Action",
+        "id": "fffff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "L::V::r::\"\"",
-      "action": "L::V::Action::\"fffff\"",
-      "resource": "L::V::r::\"\"",
+      "principal": {
+        "type": "L::V::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "L::V::r",
+        "id": ""
+      },
+      "action": {
+        "type": "L::V::Action",
+        "id": "fffff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "L::V::r::\"\"",
-      "action": "L::V::Action::\"fffff\"",
-      "resource": "L::V::r::\"\"",
+      "principal": {
+        "type": "L::V::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "L::V::r",
+        "id": ""
+      },
+      "action": {
+        "type": "L::V::Action",
+        "id": "fffff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "L::V::r::\"\"",
-      "action": "L::V::Action::\"fffff\"",
-      "resource": "L::V::r::\"\"",
+      "principal": {
+        "type": "L::V::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "L::V::r",
+        "id": ""
+      },
+      "action": {
+        "type": "L::V::Action",
+        "id": "fffff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "L::V::r::\"\"",
-      "action": "L::V::Action::\"fffff\"",
-      "resource": "L::V::r::\"\"",
+      "principal": {
+        "type": "L::V::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "L::V::r",
+        "id": ""
+      },
+      "action": {
+        "type": "L::V::Action",
+        "id": "fffff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/72a0f7c100bac2cc5512c6d78dc7c4bd2c3ff426.json b/cedar-integration-tests/corpus_tests/72a0f7c100bac2cc5512c6d78dc7c4bd2c3ff426.json
index d93898d4a..9b0eab47c 100644
--- a/cedar-integration-tests/corpus_tests/72a0f7c100bac2cc5512c6d78dc7c4bd2c3ff426.json
+++ b/cedar-integration-tests/corpus_tests/72a0f7c100bac2cc5512c6d78dc7c4bd2c3ff426.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/72a46e5f8a98d5e4828b68a428f9e537251c830e.json b/cedar-integration-tests/corpus_tests/72a46e5f8a98d5e4828b68a428f9e537251c830e.json
index 18206e002..7cf39e703 100644
--- a/cedar-integration-tests/corpus_tests/72a46e5f8a98d5e4828b68a428f9e537251c830e.json
+++ b/cedar-integration-tests/corpus_tests/72a46e5f8a98d5e4828b68a428f9e537251c830e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/72ba9b2b2a3db0cf42997827f581619cb12acfd6.json b/cedar-integration-tests/corpus_tests/72ba9b2b2a3db0cf42997827f581619cb12acfd6.json
index 779ea02a1..605cf1ff0 100644
--- a/cedar-integration-tests/corpus_tests/72ba9b2b2a3db0cf42997827f581619cb12acfd6.json
+++ b/cedar-integration-tests/corpus_tests/72ba9b2b2a3db0cf42997827f581619cb12acfd6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx::\"\"",
-      "action": "uSJJlg1lU::Q80xxu_YYXW::Action::\"action\"",
-      "resource": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx::\"\"",
+      "principal": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx",
+        "id": ""
+      },
+      "action": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx::\"\"",
-      "action": "uSJJlg1lU::Q80xxu_YYXW::Action::\"action\"",
-      "resource": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx::\"\"",
+      "principal": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx",
+        "id": ""
+      },
+      "action": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx::\"\"",
-      "action": "uSJJlg1lU::Q80xxu_YYXW::Action::\"action\"",
-      "resource": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx::\"\"",
+      "principal": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx",
+        "id": ""
+      },
+      "action": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx::\"\"",
-      "action": "uSJJlg1lU::Q80xxu_YYXW::Action::\"action\"",
-      "resource": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx::\"\"",
+      "principal": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx",
+        "id": ""
+      },
+      "action": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx::\"\"",
-      "action": "uSJJlg1lU::Q80xxu_YYXW::Action::\"action\"",
-      "resource": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx::\"\"",
+      "principal": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx",
+        "id": ""
+      },
+      "action": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx::\"\"",
-      "action": "uSJJlg1lU::Q80xxu_YYXW::Action::\"action\"",
-      "resource": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx::\"\"",
+      "principal": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx",
+        "id": ""
+      },
+      "action": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx::\"\"",
-      "action": "uSJJlg1lU::Q80xxu_YYXW::Action::\"action\"",
-      "resource": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx::\"\"",
+      "principal": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx",
+        "id": ""
+      },
+      "action": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx::\"\"",
-      "action": "uSJJlg1lU::Q80xxu_YYXW::Action::\"action\"",
-      "resource": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx::\"\"",
+      "principal": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Mxxwxx",
+        "id": ""
+      },
+      "action": {
+        "type": "uSJJlg1lU::Q80xxu_YYXW::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/72d5b71f1265742f8ee5657f60c8608688370960.json b/cedar-integration-tests/corpus_tests/72d5b71f1265742f8ee5657f60c8608688370960.json
index 0381175bc..be511e5d1 100644
--- a/cedar-integration-tests/corpus_tests/72d5b71f1265742f8ee5657f60c8608688370960.json
+++ b/cedar-integration-tests/corpus_tests/72d5b71f1265742f8ee5657f60c8608688370960.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}12\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u000212"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}12\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}12\"",
+      "principal": {
+        "type": "a",
+        "id": "\u000212"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u000212"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}12\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}12\"",
+      "principal": {
+        "type": "a",
+        "id": "\u000212"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u000212"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}12\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}12\"",
+      "principal": {
+        "type": "a",
+        "id": "\u000212"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u000212"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}12\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}12\"",
+      "principal": {
+        "type": "a",
+        "id": "\u000212"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u000212"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}12\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}12\"",
+      "principal": {
+        "type": "a",
+        "id": "\u000212"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u000212"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/73126d9b0b475e3fc2096b9ef2e4abd11bf0f3fd.json b/cedar-integration-tests/corpus_tests/73126d9b0b475e3fc2096b9ef2e4abd11bf0f3fd.json
index bcac46b46..17905fe48 100644
--- a/cedar-integration-tests/corpus_tests/73126d9b0b475e3fc2096b9ef2e4abd11bf0f3fd.json
+++ b/cedar-integration-tests/corpus_tests/73126d9b0b475e3fc2096b9ef2e4abd11bf0f3fd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::_::r::r37::R::a::\"\"",
-      "action": "r::_::r::r37::R::Action::\"action\"",
-      "resource": "r::_::r::r37::R::a::\"\"",
+      "principal": {
+        "type": "r::_::r::r37::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::_::r::r37::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::_::r::r37::R::Action",
+        "id": "action"
+      },
       "context": {
         "Qxxx": false
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::_::r::r37::R::a::\"\"",
-      "action": "r::_::r::r37::R::Action::\"action\"",
-      "resource": "r::_::r::r37::R::a::\"\"",
+      "principal": {
+        "type": "r::_::r::r37::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::_::r::r37::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::_::r::r37::R::Action",
+        "id": "action"
+      },
       "context": {
         "Qxxx": false
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::_::r::r37::R::a::\"\"",
-      "action": "r::_::r::r37::R::Action::\"action\"",
-      "resource": "r::_::r::r37::R::a::\"\"",
+      "principal": {
+        "type": "r::_::r::r37::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::_::r::r37::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::_::r::r37::R::Action",
+        "id": "action"
+      },
       "context": {
         "Qxxx": false
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::_::r::r37::R::a::\"\"",
-      "action": "r::_::r::r37::R::Action::\"action\"",
-      "resource": "r::_::r::r37::R::a::\"\"",
+      "principal": {
+        "type": "r::_::r::r37::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::_::r::r37::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::_::r::r37::R::Action",
+        "id": "action"
+      },
       "context": {
         "Qxxx": false
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::_::r::r37::R::a::\"\"",
-      "action": "r::_::r::r37::R::Action::\"action\"",
-      "resource": "r::_::r::r37::R::a::\"\"",
+      "principal": {
+        "type": "r::_::r::r37::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::_::r::r37::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::_::r::r37::R::Action",
+        "id": "action"
+      },
       "context": {
         "Qxxx": false
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::_::r::r37::R::a::\"\"",
-      "action": "r::_::r::r37::R::Action::\"action\"",
-      "resource": "r::_::r::r37::R::a::\"\"",
+      "principal": {
+        "type": "r::_::r::r37::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::_::r::r37::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::_::r::r37::R::Action",
+        "id": "action"
+      },
       "context": {
         "Qxxx": false
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::_::r::r37::R::a::\"\"",
-      "action": "r::_::r::r37::R::Action::\"action\"",
-      "resource": "r::_::r::r37::R::a::\"\"",
+      "principal": {
+        "type": "r::_::r::r37::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::_::r::r37::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::_::r::r37::R::Action",
+        "id": "action"
+      },
       "context": {
         "Qxxx": false
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::_::r::r37::R::a::\"\"",
-      "action": "r::_::r::r37::R::Action::\"action\"",
-      "resource": "r::_::r::r37::R::a::\"\"",
+      "principal": {
+        "type": "r::_::r::r37::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::_::r::r37::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::_::r::r37::R::Action",
+        "id": "action"
+      },
       "context": {
         "Qxxx": false
       },
diff --git a/cedar-integration-tests/corpus_tests/731d19cc28b9abfb181b66e4ad631dfcdda2790c.json b/cedar-integration-tests/corpus_tests/731d19cc28b9abfb181b66e4ad631dfcdda2790c.json
index 969246556..f3317a757 100644
--- a/cedar-integration-tests/corpus_tests/731d19cc28b9abfb181b66e4ad631dfcdda2790c.json
+++ b/cedar-integration-tests/corpus_tests/731d19cc28b9abfb181b66e4ad631dfcdda2790c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"FF\\u{6}\\0F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF\\u{6}\\0F\"",
+      "principal": {
+        "type": "a",
+        "id": "FF\u0006\u0000F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF\u0006\u0000F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"FF\\u{6}\\0F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF\\u{6}\\0F\"",
+      "principal": {
+        "type": "a",
+        "id": "FF\u0006\u0000F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF\u0006\u0000F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"FF\\u{6}\\0F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF\\u{6}\\0F\"",
+      "principal": {
+        "type": "a",
+        "id": "FF\u0006\u0000F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF\u0006\u0000F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"FF\\u{6}\\0F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF\\u{6}\\0F\"",
+      "principal": {
+        "type": "a",
+        "id": "FF\u0006\u0000F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF\u0006\u0000F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"FF\\u{6}\\0F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF\\u{6}\\0F\"",
+      "principal": {
+        "type": "a",
+        "id": "FF\u0006\u0000F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF\u0006\u0000F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"FF\\u{6}\\0F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF\\u{6}\\0F\"",
+      "principal": {
+        "type": "a",
+        "id": "FF\u0006\u0000F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF\u0006\u0000F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/7355653a76b963d961091dc312be4d67c4e3b070.json b/cedar-integration-tests/corpus_tests/7355653a76b963d961091dc312be4d67c4e3b070.json
index c24bc7dd0..9fc647d02 100644
--- a/cedar-integration-tests/corpus_tests/7355653a76b963d961091dc312be4d67c4e3b070.json
+++ b/cedar-integration-tests/corpus_tests/7355653a76b963d961091dc312be4d67c4e3b070.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/73693c4e67eec37a551e7aab906e26bdaf479475.json b/cedar-integration-tests/corpus_tests/73693c4e67eec37a551e7aab906e26bdaf479475.json
index bb7e826e5..fbc62aeec 100644
--- a/cedar-integration-tests/corpus_tests/73693c4e67eec37a551e7aab906e26bdaf479475.json
+++ b/cedar-integration-tests/corpus_tests/73693c4e67eec37a551e7aab906e26bdaf479475.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/7371969cd47bf1f523502dcc01998d220df2594d.json b/cedar-integration-tests/corpus_tests/7371969cd47bf1f523502dcc01998d220df2594d.json
index 6bfd4e446..47ec3a166 100644
--- a/cedar-integration-tests/corpus_tests/7371969cd47bf1f523502dcc01998d220df2594d.json
+++ b/cedar-integration-tests/corpus_tests/7371969cd47bf1f523502dcc01998d220df2594d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"FFFF\\0&F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFF\\0&F\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFF\u0000&F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFF\u0000&F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"FFFF\\0&F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFF\\0&F\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFF\u0000&F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFF\u0000&F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"FFFF\\0&F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFF\\0&F\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFF\u0000&F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFF\u0000&F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"FFFF\\0&F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFF\\0&F\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFF\u0000&F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFF\u0000&F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"FFFF\\0&F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFF\\0&F\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFF\u0000&F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFF\u0000&F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"FFFF\\0&F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFF\\0&F\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFF\u0000&F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFF\u0000&F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"FFFF\\0&F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFF\\0&F\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFF\u0000&F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFF\u0000&F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"FFFF\\0&F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFF\\0&F\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFF\u0000&F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFF\u0000&F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/73f09692588e0571b635451fc1b3763246eec60f.json b/cedar-integration-tests/corpus_tests/73f09692588e0571b635451fc1b3763246eec60f.json
index d213317ec..db8f67351 100644
--- a/cedar-integration-tests/corpus_tests/73f09692588e0571b635451fc1b3763246eec60f.json
+++ b/cedar-integration-tests/corpus_tests/73f09692588e0571b635451fc1b3763246eec60f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"*\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*\"",
+      "principal": {
+        "type": "a",
+        "id": "*"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"*\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*\"",
+      "principal": {
+        "type": "a",
+        "id": "*"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"*\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*\"",
+      "principal": {
+        "type": "a",
+        "id": "*"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"*\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*\"",
+      "principal": {
+        "type": "a",
+        "id": "*"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"*\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*\"",
+      "principal": {
+        "type": "a",
+        "id": "*"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"*\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*\"",
+      "principal": {
+        "type": "a",
+        "id": "*"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7403031002cb460a1df9b6d9a169f4ccb76b70d3.json b/cedar-integration-tests/corpus_tests/7403031002cb460a1df9b6d9a169f4ccb76b70d3.json
index 7695cd94a..f84ea53e3 100644
--- a/cedar-integration-tests/corpus_tests/7403031002cb460a1df9b6d9a169f4ccb76b70d3.json
+++ b/cedar-integration-tests/corpus_tests/7403031002cb460a1df9b6d9a169f4ccb76b70d3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/740d091a7026855d819c74f94ad2c1b3aecb7f82.json b/cedar-integration-tests/corpus_tests/740d091a7026855d819c74f94ad2c1b3aecb7f82.json
index 312a6cc99..57fa5fdd3 100644
--- a/cedar-integration-tests/corpus_tests/740d091a7026855d819c74f94ad2c1b3aecb7f82.json
+++ b/cedar-integration-tests/corpus_tests/740d091a7026855d819c74f94ad2c1b3aecb7f82.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "RH::\":c\"",
-      "action": "Action::\"action\"",
-      "resource": "j::\"\"",
+      "principal": {
+        "type": "RH",
+        "id": ":c"
+      },
+      "resource": {
+        "type": "j",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "RH::\":c\"",
-      "action": "Action::\"action\"",
-      "resource": "j::\"\"",
+      "principal": {
+        "type": "RH",
+        "id": ":c"
+      },
+      "resource": {
+        "type": "j",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "RH::\":c\"",
-      "action": "Action::\"action\"",
-      "resource": "j::\"\"",
+      "principal": {
+        "type": "RH",
+        "id": ":c"
+      },
+      "resource": {
+        "type": "j",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "RH::\":c\"",
-      "action": "Action::\"action\"",
-      "resource": "j::\"\"",
+      "principal": {
+        "type": "RH",
+        "id": ":c"
+      },
+      "resource": {
+        "type": "j",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "RH::\":c\"",
-      "action": "Action::\"action\"",
-      "resource": "j::\"\"",
+      "principal": {
+        "type": "RH",
+        "id": ":c"
+      },
+      "resource": {
+        "type": "j",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "RH::\":c\"",
-      "action": "Action::\"action\"",
-      "resource": "j::\"\"",
+      "principal": {
+        "type": "RH",
+        "id": ":c"
+      },
+      "resource": {
+        "type": "j",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "RH::\":c\"",
-      "action": "Action::\"action\"",
-      "resource": "j::\"\"",
+      "principal": {
+        "type": "RH",
+        "id": ":c"
+      },
+      "resource": {
+        "type": "j",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "RH::\":c\"",
-      "action": "Action::\"action\"",
-      "resource": "j::\"\"",
+      "principal": {
+        "type": "RH",
+        "id": ":c"
+      },
+      "resource": {
+        "type": "j",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/745512c893ab675ebce92d613df4c15f820334fd.json b/cedar-integration-tests/corpus_tests/745512c893ab675ebce92d613df4c15f820334fd.json
index 6ea62d015..5cab7303d 100644
--- a/cedar-integration-tests/corpus_tests/745512c893ab675ebce92d613df4c15f820334fd.json
+++ b/cedar-integration-tests/corpus_tests/745512c893ab675ebce92d613df4c15f820334fd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/74cb1c7bc7c5cd009274db3878641b5f68615989.json b/cedar-integration-tests/corpus_tests/74cb1c7bc7c5cd009274db3878641b5f68615989.json
index 5d802f5ad..cd1f6d817 100644
--- a/cedar-integration-tests/corpus_tests/74cb1c7bc7c5cd009274db3878641b5f68615989.json
+++ b/cedar-integration-tests/corpus_tests/74cb1c7bc7c5cd009274db3878641b5f68615989.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/74fc6528dec498d8409c8a72a7f24be4f27e1888.json b/cedar-integration-tests/corpus_tests/74fc6528dec498d8409c8a72a7f24be4f27e1888.json
index 6b47192e0..5a0f269e9 100644
--- a/cedar-integration-tests/corpus_tests/74fc6528dec498d8409c8a72a7f24be4f27e1888.json
+++ b/cedar-integration-tests/corpus_tests/74fc6528dec498d8409c8a72a7f24be4f27e1888.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\";;;\\u{7f}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\";;;\\u{7f}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ";;;\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ";;;\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\";;;\\u{7f}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\";;;\\u{7f}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ";;;\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ";;;\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\";;;\\u{7f}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\";;;\\u{7f}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ";;;\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ";;;\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\";;;\\u{7f}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\";;;\\u{7f}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ";;;\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ";;;\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\";;;\\u{7f}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\";;;\\u{7f}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ";;;\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ";;;\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\";;;\\u{7f}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\";;;\\u{7f}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ";;;\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ";;;\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\";;;\\u{7f}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\";;;\\u{7f}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ";;;\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ";;;\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\";;;\\u{7f}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\";;;\\u{7f}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ";;;\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ";;;\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/74fe417ab7d038ce58b8dc106bab99fa76eadd17.json b/cedar-integration-tests/corpus_tests/74fe417ab7d038ce58b8dc106bab99fa76eadd17.json
index 429086271..a974760d0 100644
--- a/cedar-integration-tests/corpus_tests/74fe417ab7d038ce58b8dc106bab99fa76eadd17.json
+++ b/cedar-integration-tests/corpus_tests/74fe417ab7d038ce58b8dc106bab99fa76eadd17.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{6}:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{6}:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{6}:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7554afe3451c9e6592df5042bfc0bd519c12468e.json b/cedar-integration-tests/corpus_tests/7554afe3451c9e6592df5042bfc0bd519c12468e.json
index 2d44d7e87..6bc83c7c7 100644
--- a/cedar-integration-tests/corpus_tests/7554afe3451c9e6592df5042bfc0bd519c12468e.json
+++ b/cedar-integration-tests/corpus_tests/7554afe3451c9e6592df5042bfc0bd519c12468e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\"\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\"\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\"\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\"\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\"\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\"\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\"\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\"\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\"\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\"\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\"\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\"\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/755f2966b4141044d5f3a1b1737132c905d07ac4.json b/cedar-integration-tests/corpus_tests/755f2966b4141044d5f3a1b1737132c905d07ac4.json
index 97787a73f..5aaa80d1c 100644
--- a/cedar-integration-tests/corpus_tests/755f2966b4141044d5f3a1b1737132c905d07ac4.json
+++ b/cedar-integration-tests/corpus_tests/755f2966b4141044d5f3a1b1737132c905d07ac4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/75991579ecaf381eb36bdbe0e57b539cc6d3fd05.json b/cedar-integration-tests/corpus_tests/75991579ecaf381eb36bdbe0e57b539cc6d3fd05.json
index d768a9f66..d491af395 100644
--- a/cedar-integration-tests/corpus_tests/75991579ecaf381eb36bdbe0e57b539cc6d3fd05.json
+++ b/cedar-integration-tests/corpus_tests/75991579ecaf381eb36bdbe0e57b539cc6d3fd05.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/75aa7fb6f7ae6bb13f1e334dbf73b8219b915f57.json b/cedar-integration-tests/corpus_tests/75aa7fb6f7ae6bb13f1e334dbf73b8219b915f57.json
index 63bbda166..ebe1e8ab6 100644
--- a/cedar-integration-tests/corpus_tests/75aa7fb6f7ae6bb13f1e334dbf73b8219b915f57.json
+++ b/cedar-integration-tests/corpus_tests/75aa7fb6f7ae6bb13f1e334dbf73b8219b915f57.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0&\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0&\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0&\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0&\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0&\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0&\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0&\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0&\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/75e47b98788febe22f67d562e70c983ef7b6cf81.json b/cedar-integration-tests/corpus_tests/75e47b98788febe22f67d562e70c983ef7b6cf81.json
index 12bed444c..b486d1197 100644
--- a/cedar-integration-tests/corpus_tests/75e47b98788febe22f67d562e70c983ef7b6cf81.json
+++ b/cedar-integration-tests/corpus_tests/75e47b98788febe22f67d562e70c983ef7b6cf81.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/75f7bec7370822f1887e7ccadf05ffd1e24921f3.json b/cedar-integration-tests/corpus_tests/75f7bec7370822f1887e7ccadf05ffd1e24921f3.json
index ad54ff824..4a3e2e238 100644
--- a/cedar-integration-tests/corpus_tests/75f7bec7370822f1887e7ccadf05ffd1e24921f3.json
+++ b/cedar-integration-tests/corpus_tests/75f7bec7370822f1887e7ccadf05ffd1e24921f3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7600b8d3728a0b54b7d8ad5e18adecfe9f71c3f8.json b/cedar-integration-tests/corpus_tests/7600b8d3728a0b54b7d8ad5e18adecfe9f71c3f8.json
index bb3911e99..981eac0b2 100644
--- a/cedar-integration-tests/corpus_tests/7600b8d3728a0b54b7d8ad5e18adecfe9f71c3f8.json
+++ b/cedar-integration-tests/corpus_tests/7600b8d3728a0b54b7d8ad5e18adecfe9f71c3f8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"R\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"R\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "R\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "R\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"R\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"R\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "R\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "R\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"R\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"R\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "R\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "R\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"R\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "R\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"R\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"R\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "R\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "R\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"R\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"R\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "R\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "R\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"R\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"R\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "R\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "R\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"R\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"R\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "R\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "R\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/762d6af30778d678da7849f82db71d278c02d7a1.json b/cedar-integration-tests/corpus_tests/762d6af30778d678da7849f82db71d278c02d7a1.json
index 920ea373c..e74416581 100644
--- a/cedar-integration-tests/corpus_tests/762d6af30778d678da7849f82db71d278c02d7a1.json
+++ b/cedar-integration-tests/corpus_tests/762d6af30778d678da7849f82db71d278c02d7a1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "MYqs::\"\"",
-      "action": "Action::\"egi\"",
-      "resource": "MYqs::\"\"",
+      "principal": {
+        "type": "MYqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "MYqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "egi"
+      },
       "context": {
         "r": "",
         "Ay": ""
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "MYqs::\"\"",
-      "action": "Action::\"egi\"",
-      "resource": "MYqs::\"\"",
+      "principal": {
+        "type": "MYqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "MYqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "egi"
+      },
       "context": {
         "r": "",
         "Ay": ""
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "MYqs::\"\"",
-      "action": "Action::\"egi\"",
-      "resource": "MYqs::\"\"",
+      "principal": {
+        "type": "MYqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "MYqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "egi"
+      },
       "context": {
         "r": "",
         "Ay": ""
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "MYqs::\"\"",
-      "action": "Action::\"egi\"",
-      "resource": "MYqs::\"\"",
+      "principal": {
+        "type": "MYqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "MYqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "egi"
+      },
       "context": {
         "r": "",
         "Ay": ""
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "MYqs::\"\"",
-      "action": "Action::\"egi\"",
-      "resource": "MYqs::\"\"",
+      "principal": {
+        "type": "MYqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "MYqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "egi"
+      },
       "context": {
         "r": "",
         "Ay": ""
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "MYqs::\"\"",
-      "action": "Action::\"egi\"",
-      "resource": "MYqs::\"\"",
+      "principal": {
+        "type": "MYqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "MYqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "egi"
+      },
       "context": {
         "r": "",
         "Ay": ""
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "MYqs::\"\"",
-      "action": "Action::\"egi\"",
-      "resource": "MYqs::\"\"",
+      "principal": {
+        "type": "MYqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "MYqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "egi"
+      },
       "context": {
         "r": "",
         "Ay": ""
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "MYqs::\"\"",
-      "action": "Action::\"egi\"",
-      "resource": "MYqs::\"\"",
+      "principal": {
+        "type": "MYqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "MYqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "egi"
+      },
       "context": {
         "r": "",
         "Ay": ""
diff --git a/cedar-integration-tests/corpus_tests/764a4880f4e99a191e53a03ef16da22fb02bc397.json b/cedar-integration-tests/corpus_tests/764a4880f4e99a191e53a03ef16da22fb02bc397.json
index 658ebe717..1c91e9024 100644
--- a/cedar-integration-tests/corpus_tests/764a4880f4e99a191e53a03ef16da22fb02bc397.json
+++ b/cedar-integration-tests/corpus_tests/764a4880f4e99a191e53a03ef16da22fb02bc397.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/76a183abe57b42df274fdc83a8adc4a76a86e972.json b/cedar-integration-tests/corpus_tests/76a183abe57b42df274fdc83a8adc4a76a86e972.json
index eef29505f..e9cd40ea5 100644
--- a/cedar-integration-tests/corpus_tests/76a183abe57b42df274fdc83a8adc4a76a86e972.json
+++ b/cedar-integration-tests/corpus_tests/76a183abe57b42df274fdc83a8adc4a76a86e972.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "bLD000aw988::r09::A::Fww33333::a::\"\"",
-      "action": "bLD000aw988::r09::A::Fww33333::Action::\"action\"",
-      "resource": "bLD000aw988::r09::A::Fww33333::a::\"\"",
+      "principal": {
+        "type": "bLD000aw988::r09::A::Fww33333::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "bLD000aw988::r09::A::Fww33333::a",
+        "id": ""
+      },
+      "action": {
+        "type": "bLD000aw988::r09::A::Fww33333::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "bLD000aw988::r09::A::Fww33333::a::\"\"",
-      "action": "bLD000aw988::r09::A::Fww33333::Action::\"action\"",
-      "resource": "bLD000aw988::r09::A::Fww33333::a::\"\"",
+      "principal": {
+        "type": "bLD000aw988::r09::A::Fww33333::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "bLD000aw988::r09::A::Fww33333::a",
+        "id": ""
+      },
+      "action": {
+        "type": "bLD000aw988::r09::A::Fww33333::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "bLD000aw988::r09::A::Fww33333::a::\"\"",
-      "action": "bLD000aw988::r09::A::Fww33333::Action::\"action\"",
-      "resource": "bLD000aw988::r09::A::Fww33333::a::\"\"",
+      "principal": {
+        "type": "bLD000aw988::r09::A::Fww33333::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "bLD000aw988::r09::A::Fww33333::a",
+        "id": ""
+      },
+      "action": {
+        "type": "bLD000aw988::r09::A::Fww33333::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "bLD000aw988::r09::A::Fww33333::a::\"\"",
-      "action": "bLD000aw988::r09::A::Fww33333::Action::\"action\"",
-      "resource": "bLD000aw988::r09::A::Fww33333::a::\"\"",
+      "principal": {
+        "type": "bLD000aw988::r09::A::Fww33333::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "bLD000aw988::r09::A::Fww33333::a",
+        "id": ""
+      },
+      "action": {
+        "type": "bLD000aw988::r09::A::Fww33333::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "bLD000aw988::r09::A::Fww33333::a::\"\"",
-      "action": "bLD000aw988::r09::A::Fww33333::Action::\"action\"",
-      "resource": "bLD000aw988::r09::A::Fww33333::a::\"\"",
+      "principal": {
+        "type": "bLD000aw988::r09::A::Fww33333::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "bLD000aw988::r09::A::Fww33333::a",
+        "id": ""
+      },
+      "action": {
+        "type": "bLD000aw988::r09::A::Fww33333::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "bLD000aw988::r09::A::Fww33333::a::\"\"",
-      "action": "bLD000aw988::r09::A::Fww33333::Action::\"action\"",
-      "resource": "bLD000aw988::r09::A::Fww33333::a::\"\"",
+      "principal": {
+        "type": "bLD000aw988::r09::A::Fww33333::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "bLD000aw988::r09::A::Fww33333::a",
+        "id": ""
+      },
+      "action": {
+        "type": "bLD000aw988::r09::A::Fww33333::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "bLD000aw988::r09::A::Fww33333::a::\"\"",
-      "action": "bLD000aw988::r09::A::Fww33333::Action::\"action\"",
-      "resource": "bLD000aw988::r09::A::Fww33333::a::\"\"",
+      "principal": {
+        "type": "bLD000aw988::r09::A::Fww33333::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "bLD000aw988::r09::A::Fww33333::a",
+        "id": ""
+      },
+      "action": {
+        "type": "bLD000aw988::r09::A::Fww33333::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "bLD000aw988::r09::A::Fww33333::a::\"\"",
-      "action": "bLD000aw988::r09::A::Fww33333::Action::\"action\"",
-      "resource": "bLD000aw988::r09::A::Fww33333::a::\"\"",
+      "principal": {
+        "type": "bLD000aw988::r09::A::Fww33333::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "bLD000aw988::r09::A::Fww33333::a",
+        "id": ""
+      },
+      "action": {
+        "type": "bLD000aw988::r09::A::Fww33333::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/76fa0ec48009d3e86ce13407ee52ec66eb7fb4d8.json b/cedar-integration-tests/corpus_tests/76fa0ec48009d3e86ce13407ee52ec66eb7fb4d8.json
index d014ff82f..1339fc545 100644
--- a/cedar-integration-tests/corpus_tests/76fa0ec48009d3e86ce13407ee52ec66eb7fb4d8.json
+++ b/cedar-integration-tests/corpus_tests/76fa0ec48009d3e86ce13407ee52ec66eb7fb4d8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"l/\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "l/"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/7715f3baa9f05ec3f8031da871969c004074be89.json b/cedar-integration-tests/corpus_tests/7715f3baa9f05ec3f8031da871969c004074be89.json
index 5e3f1c412..582c84122 100644
--- a/cedar-integration-tests/corpus_tests/7715f3baa9f05ec3f8031da871969c004074be89.json
+++ b/cedar-integration-tests/corpus_tests/7715f3baa9f05ec3f8031da871969c004074be89.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/772762b782fd4f6c322d1ec3c9dc8b4a2bfa8909.json b/cedar-integration-tests/corpus_tests/772762b782fd4f6c322d1ec3c9dc8b4a2bfa8909.json
index 59585a50d..792e33448 100644
--- a/cedar-integration-tests/corpus_tests/772762b782fd4f6c322d1ec3c9dc8b4a2bfa8909.json
+++ b/cedar-integration-tests/corpus_tests/772762b782fd4f6c322d1ec3c9dc8b4a2bfa8909.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"/mo\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"/mo\"",
+      "principal": {
+        "type": "a",
+        "id": "/mo"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/mo"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"/mo\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"/mo\"",
+      "principal": {
+        "type": "a",
+        "id": "/mo"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/mo"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"/mo\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"/mo\"",
+      "principal": {
+        "type": "a",
+        "id": "/mo"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/mo"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"/mo\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"/mo\"",
+      "principal": {
+        "type": "a",
+        "id": "/mo"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/mo"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"/mo\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"/mo\"",
+      "principal": {
+        "type": "a",
+        "id": "/mo"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/mo"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"/mo\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"/mo\"",
+      "principal": {
+        "type": "a",
+        "id": "/mo"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/mo"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"/mo\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"/mo\"",
+      "principal": {
+        "type": "a",
+        "id": "/mo"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/mo"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"/mo\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"/mo\"",
+      "principal": {
+        "type": "a",
+        "id": "/mo"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/mo"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/773e994b3aed1e7755ea250064c70256e12d2f22.json b/cedar-integration-tests/corpus_tests/773e994b3aed1e7755ea250064c70256e12d2f22.json
index 13e9f2b79..8e43219dd 100644
--- a/cedar-integration-tests/corpus_tests/773e994b3aed1e7755ea250064c70256e12d2f22.json
+++ b/cedar-integration-tests/corpus_tests/773e994b3aed1e7755ea250064c70256e12d2f22.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{7}!\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{7}!\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0007!"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0007!"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{7}!\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{7}!\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0007!"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0007!"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{7}!\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{7}!\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0007!"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0007!"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{7}!\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{7}!\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0007!"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0007!"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{7}!\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0007!"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{7}!\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{7}!\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0007!"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0007!"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{7}!\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{7}!\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0007!"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0007!"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{7}!\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{7}!\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0007!"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0007!"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/7756eab468f4b3f5425417050c27371a62259b00.json b/cedar-integration-tests/corpus_tests/7756eab468f4b3f5425417050c27371a62259b00.json
index aec6e251f..e8d7c0523 100644
--- a/cedar-integration-tests/corpus_tests/7756eab468f4b3f5425417050c27371a62259b00.json
+++ b/cedar-integration-tests/corpus_tests/7756eab468f4b3f5425417050c27371a62259b00.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\t\\t\\t\\t\\t\\t\\t\\t\\t\\t\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\t\"",
+      "principal": {
+        "type": "a",
+        "id": "\t\t\t\t\t\t\t\t\t\t\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\t"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\t\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\t\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\t"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\t"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\t\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\t\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\t"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\t"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\t\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\t\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\t"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\t"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\t\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\t\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\t"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\t"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\t\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\t\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\t"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\t"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\t\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\t\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\t"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\t"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\t\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\t\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\t"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\t"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/77708836eae103c79faa5430bb540443ada6b188.json b/cedar-integration-tests/corpus_tests/77708836eae103c79faa5430bb540443ada6b188.json
index 88588648c..8c2717d89 100644
--- a/cedar-integration-tests/corpus_tests/77708836eae103c79faa5430bb540443ada6b188.json
+++ b/cedar-integration-tests/corpus_tests/77708836eae103c79faa5430bb540443ada6b188.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "l::Kdw6wyUy6y78::Fww6y788::\"\"",
-      "action": "l::Kdw6wyUy6y78::Action::\"action\"",
-      "resource": "l::Kdw6wyUy6y78::Fww6y788::\"\"",
+      "principal": {
+        "type": "l::Kdw6wyUy6y78::Fww6y788",
+        "id": ""
+      },
+      "resource": {
+        "type": "l::Kdw6wyUy6y78::Fww6y788",
+        "id": ""
+      },
+      "action": {
+        "type": "l::Kdw6wyUy6y78::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "l::Kdw6wyUy6y78::Fww6y788::\"\"",
-      "action": "l::Kdw6wyUy6y78::Action::\"action\"",
-      "resource": "l::Kdw6wyUy6y78::Fww6y788::\"\"",
+      "principal": {
+        "type": "l::Kdw6wyUy6y78::Fww6y788",
+        "id": ""
+      },
+      "resource": {
+        "type": "l::Kdw6wyUy6y78::Fww6y788",
+        "id": ""
+      },
+      "action": {
+        "type": "l::Kdw6wyUy6y78::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "l::Kdw6wyUy6y78::Fww6y788::\"\"",
-      "action": "l::Kdw6wyUy6y78::Action::\"action\"",
-      "resource": "l::Kdw6wyUy6y78::Fww6y788::\"\"",
+      "principal": {
+        "type": "l::Kdw6wyUy6y78::Fww6y788",
+        "id": ""
+      },
+      "resource": {
+        "type": "l::Kdw6wyUy6y78::Fww6y788",
+        "id": ""
+      },
+      "action": {
+        "type": "l::Kdw6wyUy6y78::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "l::Kdw6wyUy6y78::Fww6y788::\"\"",
-      "action": "l::Kdw6wyUy6y78::Action::\"action\"",
-      "resource": "l::Kdw6wyUy6y78::Fww6y788::\"\"",
+      "principal": {
+        "type": "l::Kdw6wyUy6y78::Fww6y788",
+        "id": ""
+      },
+      "resource": {
+        "type": "l::Kdw6wyUy6y78::Fww6y788",
+        "id": ""
+      },
+      "action": {
+        "type": "l::Kdw6wyUy6y78::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "l::Kdw6wyUy6y78::Fww6y788::\"\"",
-      "action": "l::Kdw6wyUy6y78::Action::\"action\"",
-      "resource": "l::Kdw6wyUy6y78::Fww6y788::\"\"",
+      "principal": {
+        "type": "l::Kdw6wyUy6y78::Fww6y788",
+        "id": ""
+      },
+      "resource": {
+        "type": "l::Kdw6wyUy6y78::Fww6y788",
+        "id": ""
+      },
+      "action": {
+        "type": "l::Kdw6wyUy6y78::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "l::Kdw6wyUy6y78::Fww6y788::\"\"",
-      "action": "l::Kdw6wyUy6y78::Action::\"action\"",
-      "resource": "l::Kdw6wyUy6y78::Fww6y788::\"\"",
+      "principal": {
+        "type": "l::Kdw6wyUy6y78::Fww6y788",
+        "id": ""
+      },
+      "resource": {
+        "type": "l::Kdw6wyUy6y78::Fww6y788",
+        "id": ""
+      },
+      "action": {
+        "type": "l::Kdw6wyUy6y78::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "l::Kdw6wyUy6y78::Fww6y788::\"\"",
-      "action": "l::Kdw6wyUy6y78::Action::\"action\"",
-      "resource": "l::Kdw6wyUy6y78::Fww6y788::\"\"",
+      "principal": {
+        "type": "l::Kdw6wyUy6y78::Fww6y788",
+        "id": ""
+      },
+      "resource": {
+        "type": "l::Kdw6wyUy6y78::Fww6y788",
+        "id": ""
+      },
+      "action": {
+        "type": "l::Kdw6wyUy6y78::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "l::Kdw6wyUy6y78::Fww6y788::\"\"",
-      "action": "l::Kdw6wyUy6y78::Action::\"action\"",
-      "resource": "l::Kdw6wyUy6y78::Fww6y788::\"\"",
+      "principal": {
+        "type": "l::Kdw6wyUy6y78::Fww6y788",
+        "id": ""
+      },
+      "resource": {
+        "type": "l::Kdw6wyUy6y78::Fww6y788",
+        "id": ""
+      },
+      "action": {
+        "type": "l::Kdw6wyUy6y78::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/77860eec88dc6c6ebe6d152e2f31aecfef2c8ef0.json b/cedar-integration-tests/corpus_tests/77860eec88dc6c6ebe6d152e2f31aecfef2c8ef0.json
index 2f9789844..fec561842 100644
--- a/cedar-integration-tests/corpus_tests/77860eec88dc6c6ebe6d152e2f31aecfef2c8ef0.json
+++ b/cedar-integration-tests/corpus_tests/77860eec88dc6c6ebe6d152e2f31aecfef2c8ef0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\":::A\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::A\"",
+      "principal": {
+        "type": "a",
+        "id": ":::A"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::A"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":::A\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::A\"",
+      "principal": {
+        "type": "a",
+        "id": ":::A"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::A"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\":::A\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::A\"",
+      "principal": {
+        "type": "a",
+        "id": ":::A"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::A"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\":::A\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::A\"",
+      "principal": {
+        "type": "a",
+        "id": ":::A"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::A"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\":::A\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::A\"",
+      "principal": {
+        "type": "a",
+        "id": ":::A"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::A"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\":::A\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::A\"",
+      "principal": {
+        "type": "a",
+        "id": ":::A"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::A"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\":::A\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::A\"",
+      "principal": {
+        "type": "a",
+        "id": ":::A"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::A"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\":::A\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::A\"",
+      "principal": {
+        "type": "a",
+        "id": ":::A"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::A"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/778c0d33302970609091b9cbf36e8f5983e9ed57.json b/cedar-integration-tests/corpus_tests/778c0d33302970609091b9cbf36e8f5983e9ed57.json
index 924ea922e..e6de6ce77 100644
--- a/cedar-integration-tests/corpus_tests/778c0d33302970609091b9cbf36e8f5983e9ed57.json
+++ b/cedar-integration-tests/corpus_tests/778c0d33302970609091b9cbf36e8f5983e9ed57.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\"\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\"\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"j\\0\\0\\\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\"\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\"\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"j\\0\\0\\\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\"\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\"\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"j\\0\\0\\\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\"\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\"\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"j\\0\\0\\\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\"\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\"\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"j\\0\\0\\\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\"\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\"\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/77a7f54975c9f3359639b96c27b9927dd628da05.json b/cedar-integration-tests/corpus_tests/77a7f54975c9f3359639b96c27b9927dd628da05.json
index cfdb1f860..f4a1049ae 100644
--- a/cedar-integration-tests/corpus_tests/77a7f54975c9f3359639b96c27b9927dd628da05.json
+++ b/cedar-integration-tests/corpus_tests/77a7f54975c9f3359639b96c27b9927dd628da05.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vRRRRRcwwRRR": false,
         "v": {
@@ -26,9 +35,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vRRRRRcwwRRR": false,
         "v": {
@@ -46,9 +64,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vRRRRRcwwRRR": false,
         "v": {
@@ -66,9 +93,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vRRRRRcwwRRR": false,
         "v": {
@@ -86,9 +122,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vRRRRRcwwRRR": false,
         "v": {
@@ -106,9 +151,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vRRRRRcwwRRR": false,
         "v": {
@@ -126,9 +180,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vRRRRRcwwRRR": false,
         "v": {
@@ -146,9 +209,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vRRRRRcwwRRR": false,
         "v": {
diff --git a/cedar-integration-tests/corpus_tests/77d60e4b0629689724e27ae7261b0fd2f7d1dfd9.json b/cedar-integration-tests/corpus_tests/77d60e4b0629689724e27ae7261b0fd2f7d1dfd9.json
index 407342e65..5bd0eb1b6 100644
--- a/cedar-integration-tests/corpus_tests/77d60e4b0629689724e27ae7261b0fd2f7d1dfd9.json
+++ b/cedar-integration-tests/corpus_tests/77d60e4b0629689724e27ae7261b0fd2f7d1dfd9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/77e6019f6506e218ba90c883acb9d9eeadee19f5.json b/cedar-integration-tests/corpus_tests/77e6019f6506e218ba90c883acb9d9eeadee19f5.json
index 2f87ba537..9f3fd0cd9 100644
--- a/cedar-integration-tests/corpus_tests/77e6019f6506e218ba90c883acb9d9eeadee19f5.json
+++ b/cedar-integration-tests/corpus_tests/77e6019f6506e218ba90c883acb9d9eeadee19f5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Khdhhhh::a::\"......\"",
-      "action": "Khdhhhh::Action::\"action\"",
-      "resource": "Khdhhhh::a::\"......\"",
+      "principal": {
+        "type": "Khdhhhh::a",
+        "id": "......"
+      },
+      "resource": {
+        "type": "Khdhhhh::a",
+        "id": "......"
+      },
+      "action": {
+        "type": "Khdhhhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Khdhhhh::a::\"......\"",
-      "action": "Khdhhhh::Action::\"action\"",
-      "resource": "Khdhhhh::a::\"......\"",
+      "principal": {
+        "type": "Khdhhhh::a",
+        "id": "......"
+      },
+      "resource": {
+        "type": "Khdhhhh::a",
+        "id": "......"
+      },
+      "action": {
+        "type": "Khdhhhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Khdhhhh::a::\"......\"",
-      "action": "Khdhhhh::Action::\"action\"",
-      "resource": "Khdhhhh::a::\"......\"",
+      "principal": {
+        "type": "Khdhhhh::a",
+        "id": "......"
+      },
+      "resource": {
+        "type": "Khdhhhh::a",
+        "id": "......"
+      },
+      "action": {
+        "type": "Khdhhhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Khdhhhh::a::\"......\"",
-      "action": "Khdhhhh::Action::\"action\"",
-      "resource": "Khdhhhh::a::\"......\"",
+      "principal": {
+        "type": "Khdhhhh::a",
+        "id": "......"
+      },
+      "resource": {
+        "type": "Khdhhhh::a",
+        "id": "......"
+      },
+      "action": {
+        "type": "Khdhhhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Khdhhhh::a::\"......\"",
-      "action": "Khdhhhh::Action::\"action\"",
-      "resource": "Khdhhhh::a::\"......\"",
+      "principal": {
+        "type": "Khdhhhh::a",
+        "id": "......"
+      },
+      "resource": {
+        "type": "Khdhhhh::a",
+        "id": "......"
+      },
+      "action": {
+        "type": "Khdhhhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Khdhhhh::a::\"......\"",
-      "action": "Khdhhhh::Action::\"action\"",
-      "resource": "Khdhhhh::a::\"......\"",
+      "principal": {
+        "type": "Khdhhhh::a",
+        "id": "......"
+      },
+      "resource": {
+        "type": "Khdhhhh::a",
+        "id": "......"
+      },
+      "action": {
+        "type": "Khdhhhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Khdhhhh::a::\"......\"",
-      "action": "Khdhhhh::Action::\"action\"",
-      "resource": "Khdhhhh::a::\"......\"",
+      "principal": {
+        "type": "Khdhhhh::a",
+        "id": "......"
+      },
+      "resource": {
+        "type": "Khdhhhh::a",
+        "id": "......"
+      },
+      "action": {
+        "type": "Khdhhhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Khdhhhh::a::\"......\"",
-      "action": "Khdhhhh::Action::\"action\"",
-      "resource": "Khdhhhh::a::\"......\"",
+      "principal": {
+        "type": "Khdhhhh::a",
+        "id": "......"
+      },
+      "resource": {
+        "type": "Khdhhhh::a",
+        "id": "......"
+      },
+      "action": {
+        "type": "Khdhhhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/77e781d02ac0279776ed46250f81c57bfae604ed.json b/cedar-integration-tests/corpus_tests/77e781d02ac0279776ed46250f81c57bfae604ed.json
index 5f3a16b83..5f6e7b55b 100644
--- a/cedar-integration-tests/corpus_tests/77e781d02ac0279776ed46250f81c57bfae604ed.json
+++ b/cedar-integration-tests/corpus_tests/77e781d02ac0279776ed46250f81c57bfae604ed.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"$\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "$\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"$\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "$\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"$\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "$\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"$\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "$\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"$\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "$\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"$\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "$\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"$\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "$\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"$\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "$\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/781f72a1adf8dcc76f8bcc6e3f78fcb738583ec5.json b/cedar-integration-tests/corpus_tests/781f72a1adf8dcc76f8bcc6e3f78fcb738583ec5.json
index 8c847ec8a..8b20cc099 100644
--- a/cedar-integration-tests/corpus_tests/781f72a1adf8dcc76f8bcc6e3f78fcb738583ec5.json
+++ b/cedar-integration-tests/corpus_tests/781f72a1adf8dcc76f8bcc6e3f78fcb738583ec5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Dlqsllvklb::a::\"\"",
-      "action": "Dlqsllvklb::Action::\"action\"",
-      "resource": "Dlqsllvklb::a::\"\"",
+      "principal": {
+        "type": "Dlqsllvklb::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Dlqsllvklb::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Dlqsllvklb::Action",
+        "id": "action"
+      },
       "context": {
         "C": {
           "\u0002": "",
@@ -24,9 +33,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Dlqsllvklb::a::\"\"",
-      "action": "Dlqsllvklb::Action::\"action\"",
-      "resource": "Dlqsllvklb::a::\"\"",
+      "principal": {
+        "type": "Dlqsllvklb::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Dlqsllvklb::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Dlqsllvklb::Action",
+        "id": "action"
+      },
       "context": {
         "C": {
           "\u0002": "",
@@ -42,9 +60,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Dlqsllvklb::a::\"\"",
-      "action": "Dlqsllvklb::Action::\"action\"",
-      "resource": "Dlqsllvklb::a::\"\"",
+      "principal": {
+        "type": "Dlqsllvklb::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Dlqsllvklb::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Dlqsllvklb::Action",
+        "id": "action"
+      },
       "context": {
         "C": {
           "\u0002": "",
@@ -60,9 +87,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Dlqsllvklb::a::\"\"",
-      "action": "Dlqsllvklb::Action::\"action\"",
-      "resource": "Dlqsllvklb::a::\"\"",
+      "principal": {
+        "type": "Dlqsllvklb::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Dlqsllvklb::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Dlqsllvklb::Action",
+        "id": "action"
+      },
       "context": {
         "C": {
           "\u0002": "",
@@ -78,9 +114,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Dlqsllvklb::a::\"\"",
-      "action": "Dlqsllvklb::Action::\"action\"",
-      "resource": "Dlqsllvklb::a::\"\"",
+      "principal": {
+        "type": "Dlqsllvklb::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Dlqsllvklb::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Dlqsllvklb::Action",
+        "id": "action"
+      },
       "context": {
         "C": {
           "\u0002": "",
@@ -96,9 +141,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Dlqsllvklb::a::\"\"",
-      "action": "Dlqsllvklb::Action::\"action\"",
-      "resource": "Dlqsllvklb::a::\"\"",
+      "principal": {
+        "type": "Dlqsllvklb::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Dlqsllvklb::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Dlqsllvklb::Action",
+        "id": "action"
+      },
       "context": {
         "C": {
           "\u0002": "",
@@ -114,9 +168,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Dlqsllvklb::a::\"\"",
-      "action": "Dlqsllvklb::Action::\"action\"",
-      "resource": "Dlqsllvklb::a::\"\"",
+      "principal": {
+        "type": "Dlqsllvklb::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Dlqsllvklb::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Dlqsllvklb::Action",
+        "id": "action"
+      },
       "context": {
         "C": {
           "\u0002": "",
@@ -132,9 +195,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Dlqsllvklb::a::\"\"",
-      "action": "Dlqsllvklb::Action::\"action\"",
-      "resource": "Dlqsllvklb::a::\"\"",
+      "principal": {
+        "type": "Dlqsllvklb::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Dlqsllvklb::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Dlqsllvklb::Action",
+        "id": "action"
+      },
       "context": {
         "C": {
           "\u0002": "",
diff --git a/cedar-integration-tests/corpus_tests/781fbc4805de88ec4530a67a60551980f29106f9.json b/cedar-integration-tests/corpus_tests/781fbc4805de88ec4530a67a60551980f29106f9.json
index 5e9cd6141..6b5e2c781 100644
--- a/cedar-integration-tests/corpus_tests/781fbc4805de88ec4530a67a60551980f29106f9.json
+++ b/cedar-integration-tests/corpus_tests/781fbc4805de88ec4530a67a60551980f29106f9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"xm\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"xm\"",
+      "principal": {
+        "type": "a",
+        "id": "xm"
+      },
+      "resource": {
+        "type": "a",
+        "id": "xm"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"xm\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"xm\"",
+      "principal": {
+        "type": "a",
+        "id": "xm"
+      },
+      "resource": {
+        "type": "a",
+        "id": "xm"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"xm\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"xm\"",
+      "principal": {
+        "type": "a",
+        "id": "xm"
+      },
+      "resource": {
+        "type": "a",
+        "id": "xm"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"xm\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"xm\"",
+      "principal": {
+        "type": "a",
+        "id": "xm"
+      },
+      "resource": {
+        "type": "a",
+        "id": "xm"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"xm\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"xm\"",
+      "principal": {
+        "type": "a",
+        "id": "xm"
+      },
+      "resource": {
+        "type": "a",
+        "id": "xm"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"xm\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"xm\"",
+      "principal": {
+        "type": "a",
+        "id": "xm"
+      },
+      "resource": {
+        "type": "a",
+        "id": "xm"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"xm\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"xm\"",
+      "principal": {
+        "type": "a",
+        "id": "xm"
+      },
+      "resource": {
+        "type": "a",
+        "id": "xm"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"xm\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"xm\"",
+      "principal": {
+        "type": "a",
+        "id": "xm"
+      },
+      "resource": {
+        "type": "a",
+        "id": "xm"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/7826cd6fef262b30541dcf601bb6b829a6147542.json b/cedar-integration-tests/corpus_tests/7826cd6fef262b30541dcf601bb6b829a6147542.json
index b09dbd958..7279ac2bc 100644
--- a/cedar-integration-tests/corpus_tests/7826cd6fef262b30541dcf601bb6b829a6147542.json
+++ b/cedar-integration-tests/corpus_tests/7826cd6fef262b30541dcf601bb6b829a6147542.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/78394109dbfcb981c399e46a8654508464eb9ae5.json b/cedar-integration-tests/corpus_tests/78394109dbfcb981c399e46a8654508464eb9ae5.json
index 4db633c6a..0f558003f 100644
--- a/cedar-integration-tests/corpus_tests/78394109dbfcb981c399e46a8654508464eb9ae5.json
+++ b/cedar-integration-tests/corpus_tests/78394109dbfcb981c399e46a8654508464eb9ae5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7843f1ebab364d0464751c4e692049eebc7884b3.json b/cedar-integration-tests/corpus_tests/7843f1ebab364d0464751c4e692049eebc7884b3.json
index d7dc07217..eee97e0e5 100644
--- a/cedar-integration-tests/corpus_tests/7843f1ebab364d0464751c4e692049eebc7884b3.json
+++ b/cedar-integration-tests/corpus_tests/7843f1ebab364d0464751c4e692049eebc7884b3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{3}\\0\\0n/\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\u{3}\\0\\0n/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000n/"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/785cb406a2478ad3cab821f05de51194d858110e.json b/cedar-integration-tests/corpus_tests/785cb406a2478ad3cab821f05de51194d858110e.json
index be2723e74..48a0106eb 100644
--- a/cedar-integration-tests/corpus_tests/785cb406a2478ad3cab821f05de51194d858110e.json
+++ b/cedar-integration-tests/corpus_tests/785cb406a2478ad3cab821f05de51194d858110e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"91p\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "91p"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/7876eafee5c27b4be49c894923a72008dd32edc5.json b/cedar-integration-tests/corpus_tests/7876eafee5c27b4be49c894923a72008dd32edc5.json
index 85589ad3b..b6c826e69 100644
--- a/cedar-integration-tests/corpus_tests/7876eafee5c27b4be49c894923a72008dd32edc5.json
+++ b/cedar-integration-tests/corpus_tests/7876eafee5c27b4be49c894923a72008dd32edc5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/78e6dc287b333b74145e3812acca38315b888cd5.json b/cedar-integration-tests/corpus_tests/78e6dc287b333b74145e3812acca38315b888cd5.json
index 2a5c44baa..734a5fc72 100644
--- a/cedar-integration-tests/corpus_tests/78e6dc287b333b74145e3812acca38315b888cd5.json
+++ b/cedar-integration-tests/corpus_tests/78e6dc287b333b74145e3812acca38315b888cd5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/790548c540ab8e24e820d02ec0e6bd38c823c317.json b/cedar-integration-tests/corpus_tests/790548c540ab8e24e820d02ec0e6bd38c823c317.json
index 8cba44de9..45103c67b 100644
--- a/cedar-integration-tests/corpus_tests/790548c540ab8e24e820d02ec0e6bd38c823c317.json
+++ b/cedar-integration-tests/corpus_tests/790548c540ab8e24e820d02ec0e6bd38c823c317.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "stYWLSk::a::\"\\u{15}\\u{15}\\u{1c}\"",
-      "action": "stYWLSk::Action::\"action\"",
-      "resource": "stYWLSk::a::\"\\u{15}\\u{15}\\u{1c}\"",
+      "principal": {
+        "type": "stYWLSk::a",
+        "id": "\u0015\u0015\u001c"
+      },
+      "resource": {
+        "type": "stYWLSk::a",
+        "id": "\u0015\u0015\u001c"
+      },
+      "action": {
+        "type": "stYWLSk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "stYWLSk::a::\"\\u{15}\\u{15}\\u{1c}\"",
-      "action": "stYWLSk::Action::\"action\"",
-      "resource": "stYWLSk::a::\"\\u{15}\\u{15}\\u{1c}\"",
+      "principal": {
+        "type": "stYWLSk::a",
+        "id": "\u0015\u0015\u001c"
+      },
+      "resource": {
+        "type": "stYWLSk::a",
+        "id": "\u0015\u0015\u001c"
+      },
+      "action": {
+        "type": "stYWLSk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "stYWLSk::a::\"\\u{15}\\u{15}\\u{1c}\"",
-      "action": "stYWLSk::Action::\"action\"",
-      "resource": "stYWLSk::a::\"\\u{15}\\u{15}\\u{1c}\"",
+      "principal": {
+        "type": "stYWLSk::a",
+        "id": "\u0015\u0015\u001c"
+      },
+      "resource": {
+        "type": "stYWLSk::a",
+        "id": "\u0015\u0015\u001c"
+      },
+      "action": {
+        "type": "stYWLSk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "stYWLSk::a::\"\\u{15}\\u{15}\\u{1c}\"",
-      "action": "stYWLSk::Action::\"action\"",
-      "resource": "stYWLSk::a::\"\\u{15}\\u{15}\\u{1c}\"",
+      "principal": {
+        "type": "stYWLSk::a",
+        "id": "\u0015\u0015\u001c"
+      },
+      "resource": {
+        "type": "stYWLSk::a",
+        "id": "\u0015\u0015\u001c"
+      },
+      "action": {
+        "type": "stYWLSk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "stYWLSk::a::\"\\u{15}\\u{15}\\u{1c}\"",
-      "action": "stYWLSk::Action::\"action\"",
-      "resource": "stYWLSk::a::\"\\u{15}\\u{15}\\u{1c}\"",
+      "principal": {
+        "type": "stYWLSk::a",
+        "id": "\u0015\u0015\u001c"
+      },
+      "resource": {
+        "type": "stYWLSk::a",
+        "id": "\u0015\u0015\u001c"
+      },
+      "action": {
+        "type": "stYWLSk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "stYWLSk::a::\"\\u{15}\\u{15}\\u{1c}\"",
-      "action": "stYWLSk::Action::\"action\"",
-      "resource": "stYWLSk::a::\"\\u{15}\\u{15}\\u{1c}\"",
+      "principal": {
+        "type": "stYWLSk::a",
+        "id": "\u0015\u0015\u001c"
+      },
+      "resource": {
+        "type": "stYWLSk::a",
+        "id": "\u0015\u0015\u001c"
+      },
+      "action": {
+        "type": "stYWLSk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "stYWLSk::a::\"\\u{15}\\u{15}\\u{1c}\"",
-      "action": "stYWLSk::Action::\"action\"",
-      "resource": "stYWLSk::a::\"\\u{15}\\u{15}\\u{1c}\"",
+      "principal": {
+        "type": "stYWLSk::a",
+        "id": "\u0015\u0015\u001c"
+      },
+      "resource": {
+        "type": "stYWLSk::a",
+        "id": "\u0015\u0015\u001c"
+      },
+      "action": {
+        "type": "stYWLSk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "stYWLSk::a::\"\\u{15}\\u{15}\\u{1c}\"",
-      "action": "stYWLSk::Action::\"action\"",
-      "resource": "stYWLSk::a::\"\\u{15}\\u{15}\\u{1c}\"",
+      "principal": {
+        "type": "stYWLSk::a",
+        "id": "\u0015\u0015\u001c"
+      },
+      "resource": {
+        "type": "stYWLSk::a",
+        "id": "\u0015\u0015\u001c"
+      },
+      "action": {
+        "type": "stYWLSk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/793fa6a9f31eb328da35f6e47331fdee10e41a18.json b/cedar-integration-tests/corpus_tests/793fa6a9f31eb328da35f6e47331fdee10e41a18.json
index 593086f2f..2957d04b9 100644
--- a/cedar-integration-tests/corpus_tests/793fa6a9f31eb328da35f6e47331fdee10e41a18.json
+++ b/cedar-integration-tests/corpus_tests/793fa6a9f31eb328da35f6e47331fdee10e41a18.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Qxxxxxxxxxx::a::\"\"",
-      "action": "Qxxxxxxxxxx::Action::\"action\"",
-      "resource": "Qxxxxxxxxxx::a::\"\"",
+      "principal": {
+        "type": "Qxxxxxxxxxx::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Qxxxxxxxxxx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Qxxxxxxxxxx::Action",
+        "id": "action"
+      },
       "context": {
         "v": {
           "__entity": {
@@ -25,9 +34,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Qxxxxxxxxxx::a::\"\"",
-      "action": "Qxxxxxxxxxx::Action::\"action\"",
-      "resource": "Qxxxxxxxxxx::a::\"\"",
+      "principal": {
+        "type": "Qxxxxxxxxxx::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Qxxxxxxxxxx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Qxxxxxxxxxx::Action",
+        "id": "action"
+      },
       "context": {
         "v": {
           "__entity": {
@@ -44,9 +62,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Qxxxxxxxxxx::a::\"\"",
-      "action": "Qxxxxxxxxxx::Action::\"action\"",
-      "resource": "Qxxxxxxxxxx::a::\"\"",
+      "principal": {
+        "type": "Qxxxxxxxxxx::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Qxxxxxxxxxx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Qxxxxxxxxxx::Action",
+        "id": "action"
+      },
       "context": {
         "v": {
           "__entity": {
@@ -63,9 +90,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Qxxxxxxxxxx::a::\"\"",
-      "action": "Qxxxxxxxxxx::Action::\"action\"",
-      "resource": "Qxxxxxxxxxx::a::\"\"",
+      "principal": {
+        "type": "Qxxxxxxxxxx::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Qxxxxxxxxxx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Qxxxxxxxxxx::Action",
+        "id": "action"
+      },
       "context": {
         "v": {
           "__entity": {
@@ -82,9 +118,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Qxxxxxxxxxx::a::\"\"",
-      "action": "Qxxxxxxxxxx::Action::\"action\"",
-      "resource": "Qxxxxxxxxxx::a::\"\"",
+      "principal": {
+        "type": "Qxxxxxxxxxx::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Qxxxxxxxxxx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Qxxxxxxxxxx::Action",
+        "id": "action"
+      },
       "context": {
         "v": {
           "__entity": {
@@ -101,9 +146,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Qxxxxxxxxxx::a::\"\"",
-      "action": "Qxxxxxxxxxx::Action::\"action\"",
-      "resource": "Qxxxxxxxxxx::a::\"\"",
+      "principal": {
+        "type": "Qxxxxxxxxxx::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Qxxxxxxxxxx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Qxxxxxxxxxx::Action",
+        "id": "action"
+      },
       "context": {
         "v": {
           "__entity": {
@@ -120,9 +174,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Qxxxxxxxxxx::a::\"\"",
-      "action": "Qxxxxxxxxxx::Action::\"action\"",
-      "resource": "Qxxxxxxxxxx::a::\"\"",
+      "principal": {
+        "type": "Qxxxxxxxxxx::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Qxxxxxxxxxx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Qxxxxxxxxxx::Action",
+        "id": "action"
+      },
       "context": {
         "v": {
           "__entity": {
@@ -139,9 +202,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Qxxxxxxxxxx::a::\"\"",
-      "action": "Qxxxxxxxxxx::Action::\"action\"",
-      "resource": "Qxxxxxxxxxx::a::\"\"",
+      "principal": {
+        "type": "Qxxxxxxxxxx::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Qxxxxxxxxxx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Qxxxxxxxxxx::Action",
+        "id": "action"
+      },
       "context": {
         "v": {
           "__entity": {
diff --git a/cedar-integration-tests/corpus_tests/79e20304effab67d62ee64404284039250203aa5.json b/cedar-integration-tests/corpus_tests/79e20304effab67d62ee64404284039250203aa5.json
index f8827f72d..7bf077d1e 100644
--- a/cedar-integration-tests/corpus_tests/79e20304effab67d62ee64404284039250203aa5.json
+++ b/cedar-integration-tests/corpus_tests/79e20304effab67d62ee64404284039250203aa5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "m::r::a::\"\"",
-      "action": "m::r::Action::\"action\"",
-      "resource": "m::r::a::\"\"",
+      "principal": {
+        "type": "m::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "m::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "m::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "m::r::a::\"\"",
-      "action": "m::r::Action::\"action\"",
-      "resource": "m::r::a::\"\"",
+      "principal": {
+        "type": "m::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "m::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "m::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "m::r::a::\"\"",
-      "action": "m::r::Action::\"action\"",
-      "resource": "m::r::a::\"\"",
+      "principal": {
+        "type": "m::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "m::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "m::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "m::r::a::\"\"",
-      "action": "m::r::Action::\"action\"",
-      "resource": "m::r::a::\"\"",
+      "principal": {
+        "type": "m::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "m::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "m::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "m::r::a::\"\"",
-      "action": "m::r::Action::\"action\"",
-      "resource": "m::r::a::\"\"",
+      "principal": {
+        "type": "m::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "m::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "m::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "m::r::a::\"\"",
-      "action": "m::r::Action::\"action\"",
-      "resource": "m::r::a::\"\"",
+      "principal": {
+        "type": "m::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "m::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "m::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "m::r::a::\"\"",
-      "action": "m::r::Action::\"action\"",
-      "resource": "m::r::a::\"\"",
+      "principal": {
+        "type": "m::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "m::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "m::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "m::r::a::\"\"",
-      "action": "m::r::Action::\"action\"",
-      "resource": "m::r::a::\"\"",
+      "principal": {
+        "type": "m::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "m::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "m::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/79ff59936ed79973c005e36c9ef55c5326d9ce66.json b/cedar-integration-tests/corpus_tests/79ff59936ed79973c005e36c9ef55c5326d9ce66.json
index 4055beb22..0da51b29e 100644
--- a/cedar-integration-tests/corpus_tests/79ff59936ed79973c005e36c9ef55c5326d9ce66.json
+++ b/cedar-integration-tests/corpus_tests/79ff59936ed79973c005e36c9ef55c5326d9ce66.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "F_wxwwww::\"\"",
-      "action": "Action::\"7\"",
-      "resource": "F_wxwwww::\"\"",
+      "principal": {
+        "type": "F_wxwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F_wxwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "7"
+      },
       "context": {
         "vh00000000000000": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "F_wxwwww::\"\"",
-      "action": "Action::\"7\"",
-      "resource": "F_wxwwww::\"\"",
+      "principal": {
+        "type": "F_wxwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F_wxwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "7"
+      },
       "context": {
         "vh00000000000000": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "F_wxwwww::\"\"",
-      "action": "Action::\"7\"",
-      "resource": "F_wxwwww::\"\"",
+      "principal": {
+        "type": "F_wxwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F_wxwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "7"
+      },
       "context": {
         "vh00000000000000": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "F_wxwwww::\"\"",
-      "action": "Action::\"7\"",
-      "resource": "F_wxwwww::\"\"",
+      "principal": {
+        "type": "F_wxwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F_wxwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "7"
+      },
       "context": {
         "vh00000000000000": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "F_wxwwww::\"\"",
-      "action": "Action::\"7\"",
-      "resource": "F_wxwwww::\"\"",
+      "principal": {
+        "type": "F_wxwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F_wxwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "7"
+      },
       "context": {
         "vh00000000000000": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "F_wxwwww::\"\"",
-      "action": "Action::\"7\"",
-      "resource": "F_wxwwww::\"\"",
+      "principal": {
+        "type": "F_wxwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F_wxwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "7"
+      },
       "context": {
         "vh00000000000000": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "F_wxwwww::\"\"",
-      "action": "Action::\"7\"",
-      "resource": "F_wxwwww::\"\"",
+      "principal": {
+        "type": "F_wxwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F_wxwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "7"
+      },
       "context": {
         "vh00000000000000": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "F_wxwwww::\"\"",
-      "action": "Action::\"7\"",
-      "resource": "F_wxwwww::\"\"",
+      "principal": {
+        "type": "F_wxwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F_wxwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "7"
+      },
       "context": {
         "vh00000000000000": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/7a089572bbbeebd8f64e2e8ae9773b02eff6c7a1.json b/cedar-integration-tests/corpus_tests/7a089572bbbeebd8f64e2e8ae9773b02eff6c7a1.json
index a36317a1d..8e4973e0f 100644
--- a/cedar-integration-tests/corpus_tests/7a089572bbbeebd8f64e2e8ae9773b02eff6c7a1.json
+++ b/cedar-integration-tests/corpus_tests/7a089572bbbeebd8f64e2e8ae9773b02eff6c7a1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7a75c93748788ee3682ccb5c38b7e9e0daabc374.json b/cedar-integration-tests/corpus_tests/7a75c93748788ee3682ccb5c38b7e9e0daabc374.json
index 4b25da503..09e9e6702 100644
--- a/cedar-integration-tests/corpus_tests/7a75c93748788ee3682ccb5c38b7e9e0daabc374.json
+++ b/cedar-integration-tests/corpus_tests/7a75c93748788ee3682ccb5c38b7e9e0daabc374.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7a7cf07a92c1881c48212c5318767c5e80b2f814.json b/cedar-integration-tests/corpus_tests/7a7cf07a92c1881c48212c5318767c5e80b2f814.json
index 7d6ea513f..c528d4e30 100644
--- a/cedar-integration-tests/corpus_tests/7a7cf07a92c1881c48212c5318767c5e80b2f814.json
+++ b/cedar-integration-tests/corpus_tests/7a7cf07a92c1881c48212c5318767c5e80b2f814.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/7a83868b9c4dd125773856602c9883d76442cabb.json b/cedar-integration-tests/corpus_tests/7a83868b9c4dd125773856602c9883d76442cabb.json
index f88e14fe0..bb84beffd 100644
--- a/cedar-integration-tests/corpus_tests/7a83868b9c4dd125773856602c9883d76442cabb.json
+++ b/cedar-integration-tests/corpus_tests/7a83868b9c4dd125773856602c9883d76442cabb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/7ae2b13be44f9b010cac82960fadc5ab7a3305c9.json b/cedar-integration-tests/corpus_tests/7ae2b13be44f9b010cac82960fadc5ab7a3305c9.json
index a4bc4c567..c8172ac8e 100644
--- a/cedar-integration-tests/corpus_tests/7ae2b13be44f9b010cac82960fadc5ab7a3305c9.json
+++ b/cedar-integration-tests/corpus_tests/7ae2b13be44f9b010cac82960fadc5ab7a3305c9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"om\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "om"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"Q+\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "Q+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"Q+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"Q+\"",
+      "principal": {
+        "type": "a",
+        "id": "Q+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "Q+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"Q+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"Q+\"",
+      "principal": {
+        "type": "a",
+        "id": "Q+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "Q+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"Q+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"Q+\"",
+      "principal": {
+        "type": "a",
+        "id": "Q+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "Q+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"Q+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"Q+\"",
+      "principal": {
+        "type": "a",
+        "id": "Q+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "Q+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"Q+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"Q+\"",
+      "principal": {
+        "type": "a",
+        "id": "Q+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "Q+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"Q+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"Q+\"",
+      "principal": {
+        "type": "a",
+        "id": "Q+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "Q+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7af6dce0ed8937af4f3341e8d78ebb9de967563b.json b/cedar-integration-tests/corpus_tests/7af6dce0ed8937af4f3341e8d78ebb9de967563b.json
index e4ea980e7..aa68c500b 100644
--- a/cedar-integration-tests/corpus_tests/7af6dce0ed8937af4f3341e8d78ebb9de967563b.json
+++ b/cedar-integration-tests/corpus_tests/7af6dce0ed8937af4f3341e8d78ebb9de967563b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7b01b2db594cc56ad84353cc76e1fdad524005db.json b/cedar-integration-tests/corpus_tests/7b01b2db594cc56ad84353cc76e1fdad524005db.json
index 626785e41..a323fc1bb 100644
--- a/cedar-integration-tests/corpus_tests/7b01b2db594cc56ad84353cc76e1fdad524005db.json
+++ b/cedar-integration-tests/corpus_tests/7b01b2db594cc56ad84353cc76e1fdad524005db.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"FFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"FFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"FFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"FFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"FFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"FFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"FFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"FFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7b15e95198ea64b9c9fcc3de85681a7b37de99a0.json b/cedar-integration-tests/corpus_tests/7b15e95198ea64b9c9fcc3de85681a7b37de99a0.json
index c2b04c091..f4589d98e 100644
--- a/cedar-integration-tests/corpus_tests/7b15e95198ea64b9c9fcc3de85681a7b37de99a0.json
+++ b/cedar-integration-tests/corpus_tests/7b15e95198ea64b9c9fcc3de85681a7b37de99a0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"ff&f\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "ff&f"
+      },
       "context": {
         "v7kkkkk000": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"ff&f\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "ff&f"
+      },
       "context": {
         "v7kkkkk000": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"ff&f\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "ff&f"
+      },
       "context": {
         "v7kkkkk000": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"ff&f\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "ff&f"
+      },
       "context": {
         "v7kkkkk000": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"ff&f\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "ff&f"
+      },
       "context": {
         "v7kkkkk000": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"ff&f\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "ff&f"
+      },
       "context": {
         "v7kkkkk000": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"ff&f\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "ff&f"
+      },
       "context": {
         "v7kkkkk000": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"ff&f\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "ff&f"
+      },
       "context": {
         "v7kkkkk000": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/7b316784cf9e60631768b35cb7a7e15ba6d01c05.json b/cedar-integration-tests/corpus_tests/7b316784cf9e60631768b35cb7a7e15ba6d01c05.json
index 6a9dbca11..b4edb129f 100644
--- a/cedar-integration-tests/corpus_tests/7b316784cf9e60631768b35cb7a7e15ba6d01c05.json
+++ b/cedar-integration-tests/corpus_tests/7b316784cf9e60631768b35cb7a7e15ba6d01c05.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7b3989b521214bd643a5be5ed6157ec1ebb07ff3.json b/cedar-integration-tests/corpus_tests/7b3989b521214bd643a5be5ed6157ec1ebb07ff3.json
index d47f1014e..da7213ccf 100644
--- a/cedar-integration-tests/corpus_tests/7b3989b521214bd643a5be5ed6157ec1ebb07ff3.json
+++ b/cedar-integration-tests/corpus_tests/7b3989b521214bd643a5be5ed6157ec1ebb07ff3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "C::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "C::\"\"",
+      "principal": {
+        "type": "C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "C::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "C::\"\"",
+      "principal": {
+        "type": "C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "C::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "C::\"\"",
+      "principal": {
+        "type": "C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "C::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "C::\"\"",
+      "principal": {
+        "type": "C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "C::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "C::\"\"",
+      "principal": {
+        "type": "C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "C::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "C::\"\"",
+      "principal": {
+        "type": "C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "C::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "C::\"\"",
+      "principal": {
+        "type": "C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "C::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "C::\"\"",
+      "principal": {
+        "type": "C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/7b8a0adcf9a94ba713b2b01a3e63f16cdc5a6463.json b/cedar-integration-tests/corpus_tests/7b8a0adcf9a94ba713b2b01a3e63f16cdc5a6463.json
index 10562fd17..25451c99a 100644
--- a/cedar-integration-tests/corpus_tests/7b8a0adcf9a94ba713b2b01a3e63f16cdc5a6463.json
+++ b/cedar-integration-tests/corpus_tests/7b8a0adcf9a94ba713b2b01a3e63f16cdc5a6463.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\".0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\".0\"",
+      "principal": {
+        "type": "a",
+        "id": ".0"
+      },
+      "resource": {
+        "type": "a",
+        "id": ".0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\".0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\".0\"",
+      "principal": {
+        "type": "a",
+        "id": ".0"
+      },
+      "resource": {
+        "type": "a",
+        "id": ".0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\".0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\".0\"",
+      "principal": {
+        "type": "a",
+        "id": ".0"
+      },
+      "resource": {
+        "type": "a",
+        "id": ".0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\".0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\".0\"",
+      "principal": {
+        "type": "a",
+        "id": ".0"
+      },
+      "resource": {
+        "type": "a",
+        "id": ".0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\".0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\".0\"",
+      "principal": {
+        "type": "a",
+        "id": ".0"
+      },
+      "resource": {
+        "type": "a",
+        "id": ".0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\".0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\".0\"",
+      "principal": {
+        "type": "a",
+        "id": ".0"
+      },
+      "resource": {
+        "type": "a",
+        "id": ".0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\".0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\".0\"",
+      "principal": {
+        "type": "a",
+        "id": ".0"
+      },
+      "resource": {
+        "type": "a",
+        "id": ".0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\".0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\".0\"",
+      "principal": {
+        "type": "a",
+        "id": ".0"
+      },
+      "resource": {
+        "type": "a",
+        "id": ".0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7b9bcbbc7a191f346a4b355e999c0e7af112f464.json b/cedar-integration-tests/corpus_tests/7b9bcbbc7a191f346a4b355e999c0e7af112f464.json
index 58a185629..6cc372a43 100644
--- a/cedar-integration-tests/corpus_tests/7b9bcbbc7a191f346a4b355e999c0e7af112f464.json
+++ b/cedar-integration-tests/corpus_tests/7b9bcbbc7a191f346a4b355e999c0e7af112f464.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7bddb2c6c02a5973392e44c285dda262d41e93ae.json b/cedar-integration-tests/corpus_tests/7bddb2c6c02a5973392e44c285dda262d41e93ae.json
index 06e649827..3c4b9f38f 100644
--- a/cedar-integration-tests/corpus_tests/7bddb2c6c02a5973392e44c285dda262d41e93ae.json
+++ b/cedar-integration-tests/corpus_tests/7bddb2c6c02a5973392e44c285dda262d41e93ae.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7bed48ea9fea21713719621d39a49bce6a884913.json b/cedar-integration-tests/corpus_tests/7bed48ea9fea21713719621d39a49bce6a884913.json
index aaf28fd83..f8c7197fc 100644
--- a/cedar-integration-tests/corpus_tests/7bed48ea9fea21713719621d39a49bce6a884913.json
+++ b/cedar-integration-tests/corpus_tests/7bed48ea9fea21713719621d39a49bce6a884913.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::\"\"",
-      "action": "Action::\":\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ":"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::\"\"",
-      "action": "Action::\":\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ":"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::\"\"",
-      "action": "Action::\":\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ":"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::\"\"",
-      "action": "Action::\":\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ":"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::\"\"",
-      "action": "Action::\":\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ":"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::\"\"",
-      "action": "Action::\":\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ":"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::\"\"",
-      "action": "Action::\":\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ":"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::\"\"",
-      "action": "Action::\":\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ":"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/7c2a4e29605b66e49b6344c8cfe34084f2c0c5bc.json b/cedar-integration-tests/corpus_tests/7c2a4e29605b66e49b6344c8cfe34084f2c0c5bc.json
index b59364539..70420c0fa 100644
--- a/cedar-integration-tests/corpus_tests/7c2a4e29605b66e49b6344c8cfe34084f2c0c5bc.json
+++ b/cedar-integration-tests/corpus_tests/7c2a4e29605b66e49b6344c8cfe34084f2c0c5bc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7c34e0067e81ec637d7a2eb9a4c1d03e6ea74ebd.json b/cedar-integration-tests/corpus_tests/7c34e0067e81ec637d7a2eb9a4c1d03e6ea74ebd.json
index e9a2fa24d..6f4a9e436 100644
--- a/cedar-integration-tests/corpus_tests/7c34e0067e81ec637d7a2eb9a4c1d03e6ea74ebd.json
+++ b/cedar-integration-tests/corpus_tests/7c34e0067e81ec637d7a2eb9a4c1d03e6ea74ebd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/7c804e83f6eb53159536f545664138a9139de58a.json b/cedar-integration-tests/corpus_tests/7c804e83f6eb53159536f545664138a9139de58a.json
index b6b8eb6c1..a957e77cf 100644
--- a/cedar-integration-tests/corpus_tests/7c804e83f6eb53159536f545664138a9139de58a.json
+++ b/cedar-integration-tests/corpus_tests/7c804e83f6eb53159536f545664138a9139de58a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"0..\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "0.."
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0..\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "0.."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0..\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "0.."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"0..\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0..\"",
+      "principal": {
+        "type": "a",
+        "id": "0.."
+      },
+      "resource": {
+        "type": "a",
+        "id": "0.."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"0..\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0..\"",
+      "principal": {
+        "type": "a",
+        "id": "0.."
+      },
+      "resource": {
+        "type": "a",
+        "id": "0.."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"0..\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0..\"",
+      "principal": {
+        "type": "a",
+        "id": "0.."
+      },
+      "resource": {
+        "type": "a",
+        "id": "0.."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"0..\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0..\"",
+      "principal": {
+        "type": "a",
+        "id": "0.."
+      },
+      "resource": {
+        "type": "a",
+        "id": "0.."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"0..\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0..\"",
+      "principal": {
+        "type": "a",
+        "id": "0.."
+      },
+      "resource": {
+        "type": "a",
+        "id": "0.."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7c86e43a5b649553003524a121d788581e8b519b.json b/cedar-integration-tests/corpus_tests/7c86e43a5b649553003524a121d788581e8b519b.json
index 39dfbb96d..26778668b 100644
--- a/cedar-integration-tests/corpus_tests/7c86e43a5b649553003524a121d788581e8b519b.json
+++ b/cedar-integration-tests/corpus_tests/7c86e43a5b649553003524a121d788581e8b519b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7c942a6198f4194ccc81cf6be143dd118bc2fd29.json b/cedar-integration-tests/corpus_tests/7c942a6198f4194ccc81cf6be143dd118bc2fd29.json
index c2da239f2..32a0e185a 100644
--- a/cedar-integration-tests/corpus_tests/7c942a6198f4194ccc81cf6be143dd118bc2fd29.json
+++ b/cedar-integration-tests/corpus_tests/7c942a6198f4194ccc81cf6be143dd118bc2fd29.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qxxx0": "",
         "wrEajYqq": "",
@@ -23,9 +32,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qxxx0": "",
         "wrEajYqq": "",
@@ -40,9 +58,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qxxx0": "",
         "wrEajYqq": "",
@@ -57,9 +84,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qxxx0": "",
         "wrEajYqq": "",
@@ -74,9 +110,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qxxx0": "",
         "wrEajYqq": "",
@@ -91,9 +136,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qxxx0": "",
         "wrEajYqq": "",
@@ -108,9 +162,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qxxx0": "",
         "wrEajYqq": "",
@@ -125,9 +188,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qxxx0": "",
         "wrEajYqq": "",
diff --git a/cedar-integration-tests/corpus_tests/7c9d4dea53dc2243566328f40cb2bd97ffbbdff8.json b/cedar-integration-tests/corpus_tests/7c9d4dea53dc2243566328f40cb2bd97ffbbdff8.json
index c8803873f..ebc586433 100644
--- a/cedar-integration-tests/corpus_tests/7c9d4dea53dc2243566328f40cb2bd97ffbbdff8.json
+++ b/cedar-integration-tests/corpus_tests/7c9d4dea53dc2243566328f40cb2bd97ffbbdff8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7ca848ce836993ff836dd884591a6ae2ea97250e.json b/cedar-integration-tests/corpus_tests/7ca848ce836993ff836dd884591a6ae2ea97250e.json
index 76b1a6ec8..82f703084 100644
--- a/cedar-integration-tests/corpus_tests/7ca848ce836993ff836dd884591a6ae2ea97250e.json
+++ b/cedar-integration-tests/corpus_tests/7ca848ce836993ff836dd884591a6ae2ea97250e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7cd50515e56779a3cda79dcc3ffb3f6f1bc8c16e.json b/cedar-integration-tests/corpus_tests/7cd50515e56779a3cda79dcc3ffb3f6f1bc8c16e.json
index 96810d7ef..74d93eb5b 100644
--- a/cedar-integration-tests/corpus_tests/7cd50515e56779a3cda79dcc3ffb3f6f1bc8c16e.json
+++ b/cedar-integration-tests/corpus_tests/7cd50515e56779a3cda79dcc3ffb3f6f1bc8c16e.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"(....\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "(...."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"(....\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "(...."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"(....\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "(...."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"(....\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "(...."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"(....\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "(...."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"(....\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "(...."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"(....\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "(...."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"(....\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "(...."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/7cf6c65ea774eb97a4608436b16ed472963403ee.json b/cedar-integration-tests/corpus_tests/7cf6c65ea774eb97a4608436b16ed472963403ee.json
index 67e7c7780..56ab5559c 100644
--- a/cedar-integration-tests/corpus_tests/7cf6c65ea774eb97a4608436b16ed472963403ee.json
+++ b/cedar-integration-tests/corpus_tests/7cf6c65ea774eb97a4608436b16ed472963403ee.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\":m_\\u{1a}i\\u{96}Œu\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ":m_\u001ai–Œu"
+      },
       "context": {
         "FgwkWQwQ7Wjjkg": "",
         "B0000000000000000": ""
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\":m_\\u{1a}i\\u{96}Œu\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ":m_\u001ai–Œu"
+      },
       "context": {
         "FgwkWQwQ7Wjjkg": "",
         "B0000000000000000": ""
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\":m_\\u{1a}i\\u{96}Œu\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ":m_\u001ai–Œu"
+      },
       "context": {
         "FgwkWQwQ7Wjjkg": "",
         "B0000000000000000": ""
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\":m_\\u{1a}i\\u{96}Œu\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ":m_\u001ai–Œu"
+      },
       "context": {
         "FgwkWQwQ7Wjjkg": "",
         "B0000000000000000": ""
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\":m_\\u{1a}i\\u{96}Œu\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ":m_\u001ai–Œu"
+      },
       "context": {
         "FgwkWQwQ7Wjjkg": "",
         "B0000000000000000": ""
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\":m_\\u{1a}i\\u{96}Œu\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ":m_\u001ai–Œu"
+      },
       "context": {
         "FgwkWQwQ7Wjjkg": "",
         "B0000000000000000": ""
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\":m_\\u{1a}i\\u{96}Œu\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ":m_\u001ai–Œu"
+      },
       "context": {
         "FgwkWQwQ7Wjjkg": "",
         "B0000000000000000": ""
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\":m_\\u{1a}i\\u{96}Œu\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ":m_\u001ai–Œu"
+      },
       "context": {
         "FgwkWQwQ7Wjjkg": "",
         "B0000000000000000": ""
diff --git a/cedar-integration-tests/corpus_tests/7d02ec581db89c9402aa5dc621dd9cab1c5c2aad.json b/cedar-integration-tests/corpus_tests/7d02ec581db89c9402aa5dc621dd9cab1c5c2aad.json
index 7621a8ae6..ddee57d5d 100644
--- a/cedar-integration-tests/corpus_tests/7d02ec581db89c9402aa5dc621dd9cab1c5c2aad.json
+++ b/cedar-integration-tests/corpus_tests/7d02ec581db89c9402aa5dc621dd9cab1c5c2aad.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Kxx0xnx::Edml::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Edml::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Kxx0xnx::Edml::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Edml::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Kxx0xnx::Edml::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Edml::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Kxx0xnx::Edml::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Edml::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Kxx0xnx::Edml::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Edml::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Kxx0xnx::Edml::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Edml::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Kxx0xnx::Edml::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Edml::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Kxx0xnx::Edml::\"\"",
-      "action": "Kxx0xnx::Action::\"action\"",
-      "resource": "Kxx0xnx::Edml::\"\"",
+      "principal": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kxx0xnx::Edml",
+        "id": ""
+      },
+      "action": {
+        "type": "Kxx0xnx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/7d62dbe121e6b9f46e46c164b14c997bde13304b.json b/cedar-integration-tests/corpus_tests/7d62dbe121e6b9f46e46c164b14c997bde13304b.json
index 0b961205d..2b7c34301 100644
--- a/cedar-integration-tests/corpus_tests/7d62dbe121e6b9f46e46c164b14c997bde13304b.json
+++ b/cedar-integration-tests/corpus_tests/7d62dbe121e6b9f46e46c164b14c997bde13304b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7d64278cfdc6c47035c40e414192bf0eef7028ad.json b/cedar-integration-tests/corpus_tests/7d64278cfdc6c47035c40e414192bf0eef7028ad.json
index cefd8a546..48ac6e215 100644
--- a/cedar-integration-tests/corpus_tests/7d64278cfdc6c47035c40e414192bf0eef7028ad.json
+++ b/cedar-integration-tests/corpus_tests/7d64278cfdc6c47035c40e414192bf0eef7028ad.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": ""
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/7de7df399c3a3d595019128b600198bd0bb368ef.json b/cedar-integration-tests/corpus_tests/7de7df399c3a3d595019128b600198bd0bb368ef.json
index 8186b2fa7..d331a79a7 100644
--- a/cedar-integration-tests/corpus_tests/7de7df399c3a3d595019128b600198bd0bb368ef.json
+++ b/cedar-integration-tests/corpus_tests/7de7df399c3a3d595019128b600198bd0bb368ef.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"ff\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "ff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"ff\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "ff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"ff\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "ff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"ff\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "ff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"ff\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "ff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"ff\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "ff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"ff\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "ff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"ff\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "ff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/7e545a5af2c43e384fee0bb2520166cc2a89f0b7.json b/cedar-integration-tests/corpus_tests/7e545a5af2c43e384fee0bb2520166cc2a89f0b7.json
index 4d5077b0f..6801a3ef0 100644
--- a/cedar-integration-tests/corpus_tests/7e545a5af2c43e384fee0bb2520166cc2a89f0b7.json
+++ b/cedar-integration-tests/corpus_tests/7e545a5af2c43e384fee0bb2520166cc2a89f0b7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::a::\"\\0\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::a::\"\\0\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\\0\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::a::\"\\0\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\\0\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::a::\"\\0\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\\0\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::a::\"\\0\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\\0\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::a::\"\\0\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\\0\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::a::\"\\0\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\\0\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::a::\"\\0\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\\0\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7e5967a70a851c46c4de2ce306b3654d2dfc8be4.json b/cedar-integration-tests/corpus_tests/7e5967a70a851c46c4de2ce306b3654d2dfc8be4.json
index 87cf08f84..a66e14565 100644
--- a/cedar-integration-tests/corpus_tests/7e5967a70a851c46c4de2ce306b3654d2dfc8be4.json
+++ b/cedar-integration-tests/corpus_tests/7e5967a70a851c46c4de2ce306b3654d2dfc8be4.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/7e650f77996e5262f09093185cb7a9ff74935036.json b/cedar-integration-tests/corpus_tests/7e650f77996e5262f09093185cb7a9ff74935036.json
index 64c5a365a..b4a044641 100644
--- a/cedar-integration-tests/corpus_tests/7e650f77996e5262f09093185cb7a9ff74935036.json
+++ b/cedar-integration-tests/corpus_tests/7e650f77996e5262f09093185cb7a9ff74935036.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7ea9e66f0f9e3cd6d923fadea94a4d79f28bc13b.json b/cedar-integration-tests/corpus_tests/7ea9e66f0f9e3cd6d923fadea94a4d79f28bc13b.json
index 4c0c9ffd9..bd4715a21 100644
--- a/cedar-integration-tests/corpus_tests/7ea9e66f0f9e3cd6d923fadea94a4d79f28bc13b.json
+++ b/cedar-integration-tests/corpus_tests/7ea9e66f0f9e3cd6d923fadea94a4d79f28bc13b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7eab303c0a078d7b3ec3fa9d5fb0afa6bdbc1d7a.json b/cedar-integration-tests/corpus_tests/7eab303c0a078d7b3ec3fa9d5fb0afa6bdbc1d7a.json
index 2bf704325..91f50c2c0 100644
--- a/cedar-integration-tests/corpus_tests/7eab303c0a078d7b3ec3fa9d5fb0afa6bdbc1d7a.json
+++ b/cedar-integration-tests/corpus_tests/7eab303c0a078d7b3ec3fa9d5fb0afa6bdbc1d7a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7ecad9939f8607228e8fa6d489f56e0f21e7e647.json b/cedar-integration-tests/corpus_tests/7ecad9939f8607228e8fa6d489f56e0f21e7e647.json
index 88ff5cc3b..e6b34b92d 100644
--- a/cedar-integration-tests/corpus_tests/7ecad9939f8607228e8fa6d489f56e0f21e7e647.json
+++ b/cedar-integration-tests/corpus_tests/7ecad9939f8607228e8fa6d489f56e0f21e7e647.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7ee6fb3a43cc9ddb6fea6f1920b863b7cc3f5b79.json b/cedar-integration-tests/corpus_tests/7ee6fb3a43cc9ddb6fea6f1920b863b7cc3f5b79.json
index e7b25371e..3af58e2a1 100644
--- a/cedar-integration-tests/corpus_tests/7ee6fb3a43cc9ddb6fea6f1920b863b7cc3f5b79.json
+++ b/cedar-integration-tests/corpus_tests/7ee6fb3a43cc9ddb6fea6f1920b863b7cc3f5b79.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/7f4b0c162ff3c41fd812d3e6fcd35a43160ab053.json b/cedar-integration-tests/corpus_tests/7f4b0c162ff3c41fd812d3e6fcd35a43160ab053.json
index 3ae5561fe..fce847726 100644
--- a/cedar-integration-tests/corpus_tests/7f4b0c162ff3c41fd812d3e6fcd35a43160ab053.json
+++ b/cedar-integration-tests/corpus_tests/7f4b0c162ff3c41fd812d3e6fcd35a43160ab053.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{7}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0007\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/7f57d33658a504a738b57487d367015a07bb96b3.json b/cedar-integration-tests/corpus_tests/7f57d33658a504a738b57487d367015a07bb96b3.json
index 334c92048..0356ff975 100644
--- a/cedar-integration-tests/corpus_tests/7f57d33658a504a738b57487d367015a07bb96b3.json
+++ b/cedar-integration-tests/corpus_tests/7f57d33658a504a738b57487d367015a07bb96b3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::r::r::r::a::\"::\"",
-      "action": "r::r::r::r::r::Action::\"action\"",
-      "resource": "r::r::r::r::r::a::\"::\"",
+      "principal": {
+        "type": "r::r::r::r::r::a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r::r::r::r::r::a",
+        "id": "::"
+      },
+      "action": {
+        "type": "r::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::r::r::r::a::\"::\"",
-      "action": "r::r::r::r::r::Action::\"action\"",
-      "resource": "r::r::r::r::r::a::\"::\"",
+      "principal": {
+        "type": "r::r::r::r::r::a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r::r::r::r::r::a",
+        "id": "::"
+      },
+      "action": {
+        "type": "r::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::r::r::r::a::\"::\"",
-      "action": "r::r::r::r::r::Action::\"action\"",
-      "resource": "r::r::r::r::r::a::\"::\"",
+      "principal": {
+        "type": "r::r::r::r::r::a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r::r::r::r::r::a",
+        "id": "::"
+      },
+      "action": {
+        "type": "r::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::r::r::r::a::\"::\"",
-      "action": "r::r::r::r::r::Action::\"action\"",
-      "resource": "r::r::r::r::r::a::\"::\"",
+      "principal": {
+        "type": "r::r::r::r::r::a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r::r::r::r::r::a",
+        "id": "::"
+      },
+      "action": {
+        "type": "r::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::r::r::r::a::\"::\"",
-      "action": "r::r::r::r::r::Action::\"action\"",
-      "resource": "r::r::r::r::r::a::\"::\"",
+      "principal": {
+        "type": "r::r::r::r::r::a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r::r::r::r::r::a",
+        "id": "::"
+      },
+      "action": {
+        "type": "r::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::r::r::r::a::\"::\"",
-      "action": "r::r::r::r::r::Action::\"action\"",
-      "resource": "r::r::r::r::r::a::\"::\"",
+      "principal": {
+        "type": "r::r::r::r::r::a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r::r::r::r::r::a",
+        "id": "::"
+      },
+      "action": {
+        "type": "r::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::r::r::r::a::\"::\"",
-      "action": "r::r::r::r::r::Action::\"action\"",
-      "resource": "r::r::r::r::r::a::\"::\"",
+      "principal": {
+        "type": "r::r::r::r::r::a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r::r::r::r::r::a",
+        "id": "::"
+      },
+      "action": {
+        "type": "r::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::r::r::r::a::\"::\"",
-      "action": "r::r::r::r::r::Action::\"action\"",
-      "resource": "r::r::r::r::r::a::\"::\"",
+      "principal": {
+        "type": "r::r::r::r::r::a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r::r::r::r::r::a",
+        "id": "::"
+      },
+      "action": {
+        "type": "r::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/7f596b214a3c4a30c80dee1999b81cda0214d3e5.json b/cedar-integration-tests/corpus_tests/7f596b214a3c4a30c80dee1999b81cda0214d3e5.json
index a8b670060..26d7bd06f 100644
--- a/cedar-integration-tests/corpus_tests/7f596b214a3c4a30c80dee1999b81cda0214d3e5.json
+++ b/cedar-integration-tests/corpus_tests/7f596b214a3c4a30c80dee1999b81cda0214d3e5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7f6f7bc48b745460951322d29033e15a37d81517.json b/cedar-integration-tests/corpus_tests/7f6f7bc48b745460951322d29033e15a37d81517.json
index 2207cbcc4..5984e5110 100644
--- a/cedar-integration-tests/corpus_tests/7f6f7bc48b745460951322d29033e15a37d81517.json
+++ b/cedar-integration-tests/corpus_tests/7f6f7bc48b745460951322d29033e15a37d81517.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/7f763280b38e3ae0b4ae15829f53fcd5b8937b62.json b/cedar-integration-tests/corpus_tests/7f763280b38e3ae0b4ae15829f53fcd5b8937b62.json
index 77065a2c7..79154f5a5 100644
--- a/cedar-integration-tests/corpus_tests/7f763280b38e3ae0b4ae15829f53fcd5b8937b62.json
+++ b/cedar-integration-tests/corpus_tests/7f763280b38e3ae0b4ae15829f53fcd5b8937b62.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "0\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "0\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "0\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "0\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "0\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "0\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "0\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "0\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "0\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/7fc5b0951ef5748665395b4d678c76faa1724d17.json b/cedar-integration-tests/corpus_tests/7fc5b0951ef5748665395b4d678c76faa1724d17.json
index 0a41b798d..6a3634cc0 100644
--- a/cedar-integration-tests/corpus_tests/7fc5b0951ef5748665395b4d678c76faa1724d17.json
+++ b/cedar-integration-tests/corpus_tests/7fc5b0951ef5748665395b4d678c76faa1724d17.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::O::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::O::\"\"",
+      "principal": {
+        "type": "A::O",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::O",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::O::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::O::\"\"",
+      "principal": {
+        "type": "A::O",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::O",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::O::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::O::\"\"",
+      "principal": {
+        "type": "A::O",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::O",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::O::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::O::\"\"",
+      "principal": {
+        "type": "A::O",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::O",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::O::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::O::\"\"",
+      "principal": {
+        "type": "A::O",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::O",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::O::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::O::\"\"",
+      "principal": {
+        "type": "A::O",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::O",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::O::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::O::\"\"",
+      "principal": {
+        "type": "A::O",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::O",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::O::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::O::\"\"",
+      "principal": {
+        "type": "A::O",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::O",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8049272e63b684cbd301222ad09ab1223599b534.json b/cedar-integration-tests/corpus_tests/8049272e63b684cbd301222ad09ab1223599b534.json
index c7294e6b2..388037d51 100644
--- a/cedar-integration-tests/corpus_tests/8049272e63b684cbd301222ad09ab1223599b534.json
+++ b/cedar-integration-tests/corpus_tests/8049272e63b684cbd301222ad09ab1223599b534.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DWQwQwWj": "",
         "_wgwkCA0": "",
@@ -23,9 +32,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DWQwQwWj": "",
         "_wgwkCA0": "",
@@ -40,9 +58,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DWQwQwWj": "",
         "_wgwkCA0": "",
@@ -57,9 +84,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DWQwQwWj": "",
         "_wgwkCA0": "",
@@ -74,9 +110,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DWQwQwWj": "",
         "_wgwkCA0": "",
@@ -91,9 +136,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DWQwQwWj": "",
         "_wgwkCA0": "",
@@ -108,9 +162,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DWQwQwWj": "",
         "_wgwkCA0": "",
@@ -125,9 +188,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DWQwQwWj": "",
         "_wgwkCA0": "",
diff --git a/cedar-integration-tests/corpus_tests/8070f300740c1204c67346b23b10d4c86ccb744e.json b/cedar-integration-tests/corpus_tests/8070f300740c1204c67346b23b10d4c86ccb744e.json
index c102c0673..5276db653 100644
--- a/cedar-integration-tests/corpus_tests/8070f300740c1204c67346b23b10d4c86ccb744e.json
+++ b/cedar-integration-tests/corpus_tests/8070f300740c1204c67346b23b10d4c86ccb744e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "",
         "w": ""
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "",
         "w": ""
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "",
         "w": ""
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "",
         "w": ""
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "",
         "w": ""
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "",
         "w": ""
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "",
         "w": ""
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": "",
         "w": ""
diff --git a/cedar-integration-tests/corpus_tests/809781fa771e6743817dcaf47588007711137bfb.json b/cedar-integration-tests/corpus_tests/809781fa771e6743817dcaf47588007711137bfb.json
index c1d36eae3..853e936cf 100644
--- a/cedar-integration-tests/corpus_tests/809781fa771e6743817dcaf47588007711137bfb.json
+++ b/cedar-integration-tests/corpus_tests/809781fa771e6743817dcaf47588007711137bfb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "R::Wj::A::AJHH::a::\"\"",
-      "action": "R::Wj::A::AJHH::Action::\"action\"",
-      "resource": "R::Wj::A::AJHH::a::\"\"",
+      "principal": {
+        "type": "R::Wj::A::AJHH::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::A::AJHH::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::A::AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "R::Wj::A::AJHH::a::\"\"",
-      "action": "R::Wj::A::AJHH::Action::\"action\"",
-      "resource": "R::Wj::A::AJHH::a::\"\"",
+      "principal": {
+        "type": "R::Wj::A::AJHH::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::A::AJHH::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::A::AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "R::Wj::A::AJHH::a::\"\"",
-      "action": "R::Wj::A::AJHH::Action::\"action\"",
-      "resource": "R::Wj::A::AJHH::a::\"\"",
+      "principal": {
+        "type": "R::Wj::A::AJHH::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::A::AJHH::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::A::AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "R::Wj::A::AJHH::a::\"\"",
-      "action": "R::Wj::A::AJHH::Action::\"action\"",
-      "resource": "R::Wj::A::AJHH::a::\"\"",
+      "principal": {
+        "type": "R::Wj::A::AJHH::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::A::AJHH::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::A::AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "R::Wj::A::AJHH::a::\"\"",
-      "action": "R::Wj::A::AJHH::Action::\"action\"",
-      "resource": "R::Wj::A::AJHH::a::\"\"",
+      "principal": {
+        "type": "R::Wj::A::AJHH::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::A::AJHH::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::A::AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "R::Wj::A::AJHH::a::\"\"",
-      "action": "R::Wj::A::AJHH::Action::\"action\"",
-      "resource": "R::Wj::A::AJHH::a::\"\"",
+      "principal": {
+        "type": "R::Wj::A::AJHH::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::A::AJHH::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::A::AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "R::Wj::A::AJHH::a::\"\"",
-      "action": "R::Wj::A::AJHH::Action::\"action\"",
-      "resource": "R::Wj::A::AJHH::a::\"\"",
+      "principal": {
+        "type": "R::Wj::A::AJHH::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::A::AJHH::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::A::AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "R::Wj::A::AJHH::a::\"\"",
-      "action": "R::Wj::A::AJHH::Action::\"action\"",
-      "resource": "R::Wj::A::AJHH::a::\"\"",
+      "principal": {
+        "type": "R::Wj::A::AJHH::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::A::AJHH::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::A::AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/809c9748537ccf9230eaa8c70c538a16a0e54c86.json b/cedar-integration-tests/corpus_tests/809c9748537ccf9230eaa8c70c538a16a0e54c86.json
index 0fe1f25be..a4669ca7c 100644
--- a/cedar-integration-tests/corpus_tests/809c9748537ccf9230eaa8c70c538a16a0e54c86.json
+++ b/cedar-integration-tests/corpus_tests/809c9748537ccf9230eaa8c70c538a16a0e54c86.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "VhBhKfhmkkk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhBhKfhmkkk::\"\"",
+      "principal": {
+        "type": "VhBhKfhmkkk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhBhKfhmkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "VhBhKfhmkkk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhBhKfhmkkk::\"\"",
+      "principal": {
+        "type": "VhBhKfhmkkk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhBhKfhmkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "VhBhKfhmkkk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhBhKfhmkkk::\"\"",
+      "principal": {
+        "type": "VhBhKfhmkkk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhBhKfhmkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "VhBhKfhmkkk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhBhKfhmkkk::\"\"",
+      "principal": {
+        "type": "VhBhKfhmkkk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhBhKfhmkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "VhBhKfhmkkk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhBhKfhmkkk::\"\"",
+      "principal": {
+        "type": "VhBhKfhmkkk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhBhKfhmkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "VhBhKfhmkkk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhBhKfhmkkk::\"\"",
+      "principal": {
+        "type": "VhBhKfhmkkk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhBhKfhmkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "VhBhKfhmkkk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhBhKfhmkkk::\"\"",
+      "principal": {
+        "type": "VhBhKfhmkkk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhBhKfhmkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "VhBhKfhmkkk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhBhKfhmkkk::\"\"",
+      "principal": {
+        "type": "VhBhKfhmkkk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhBhKfhmkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/811009a9dc094ed3d54cade9ae525f147f457dd2.json b/cedar-integration-tests/corpus_tests/811009a9dc094ed3d54cade9ae525f147f457dd2.json
index 295ed580c..f8038f87f 100644
--- a/cedar-integration-tests/corpus_tests/811009a9dc094ed3d54cade9ae525f147f457dd2.json
+++ b/cedar-integration-tests/corpus_tests/811009a9dc094ed3d54cade9ae525f147f457dd2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "m8wwwwwwwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "m8wwwwwwwww::\"\"",
+      "principal": {
+        "type": "m8wwwwwwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "m8wwwwwwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "m8wwwwwwwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "m8wwwwwwwww::\"\"",
+      "principal": {
+        "type": "m8wwwwwwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "m8wwwwwwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "m8wwwwwwwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "m8wwwwwwwww::\"\"",
+      "principal": {
+        "type": "m8wwwwwwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "m8wwwwwwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "m8wwwwwwwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "m8wwwwwwwww::\"\"",
+      "principal": {
+        "type": "m8wwwwwwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "m8wwwwwwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "m8wwwwwwwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "m8wwwwwwwww::\"\"",
+      "principal": {
+        "type": "m8wwwwwwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "m8wwwwwwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "m8wwwwwwwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "m8wwwwwwwww::\"\"",
+      "principal": {
+        "type": "m8wwwwwwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "m8wwwwwwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "m8wwwwwwwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "m8wwwwwwwww::\"\"",
+      "principal": {
+        "type": "m8wwwwwwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "m8wwwwwwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "m8wwwwwwwww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "m8wwwwwwwww::\"\"",
+      "principal": {
+        "type": "m8wwwwwwwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "m8wwwwwwwww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/81128bfdaec02e2a97f5043dde1bd539e357fcaa.json b/cedar-integration-tests/corpus_tests/81128bfdaec02e2a97f5043dde1bd539e357fcaa.json
index 6ed0a4407..41cd845de 100644
--- a/cedar-integration-tests/corpus_tests/81128bfdaec02e2a97f5043dde1bd539e357fcaa.json
+++ b/cedar-integration-tests/corpus_tests/81128bfdaec02e2a97f5043dde1bd539e357fcaa.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"+\\u{3}\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"+\\u{3}\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"+\\u{3}\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"+\\u{3}\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"+\\u{3}\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/812182cd4ad1e94be57a6309c88dd2d69d5fffaf.json b/cedar-integration-tests/corpus_tests/812182cd4ad1e94be57a6309c88dd2d69d5fffaf.json
index 95fac8aa9..2bdc63385 100644
--- a/cedar-integration-tests/corpus_tests/812182cd4ad1e94be57a6309c88dd2d69d5fffaf.json
+++ b/cedar-integration-tests/corpus_tests/812182cd4ad1e94be57a6309c88dd2d69d5fffaf.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/81891b78bbb688f3635982e54913d2a8f32a3e92.json b/cedar-integration-tests/corpus_tests/81891b78bbb688f3635982e54913d2a8f32a3e92.json
index 4939f5e75..443272615 100644
--- a/cedar-integration-tests/corpus_tests/81891b78bbb688f3635982e54913d2a8f32a3e92.json
+++ b/cedar-integration-tests/corpus_tests/81891b78bbb688f3635982e54913d2a8f32a3e92.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/819b5df4fdd4474a32e5d6080e82c1e2a461a125.json b/cedar-integration-tests/corpus_tests/819b5df4fdd4474a32e5d6080e82c1e2a461a125.json
index 8322a630a..764a57a72 100644
--- a/cedar-integration-tests/corpus_tests/819b5df4fdd4474a32e5d6080e82c1e2a461a125.json
+++ b/cedar-integration-tests/corpus_tests/819b5df4fdd4474a32e5d6080e82c1e2a461a125.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{c}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}=\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{c}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}=\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\f\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002="
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\f\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002="
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{c}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}=\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{c}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}=\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\f\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002="
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\f\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002="
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{c}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}=\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{c}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}=\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\f\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002="
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\f\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002="
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{c}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}=\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{c}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}=\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\f\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002="
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\f\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002="
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{c}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}=\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{c}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}=\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\f\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002="
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\f\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002="
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{c}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}=\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{c}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}=\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\f\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002="
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\f\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002="
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{c}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}=\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{c}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}=\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\f\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002="
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\f\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002="
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{c}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}=\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{c}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}=\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\f\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002="
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\f\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002="
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/819d534f87b8929fa9df96a378fa6ca599e0e149.json b/cedar-integration-tests/corpus_tests/819d534f87b8929fa9df96a378fa6ca599e0e149.json
index f4d54963f..7862fc53f 100644
--- a/cedar-integration-tests/corpus_tests/819d534f87b8929fa9df96a378fa6ca599e0e149.json
+++ b/cedar-integration-tests/corpus_tests/819d534f87b8929fa9df96a378fa6ca599e0e149.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A00": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A00": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A00": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A00": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A00": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A00": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A00": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A00": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/81e612257aa8b074982ab4cdd68dd44f94c71a7f.json b/cedar-integration-tests/corpus_tests/81e612257aa8b074982ab4cdd68dd44f94c71a7f.json
index 1478450e6..b21b4c959 100644
--- a/cedar-integration-tests/corpus_tests/81e612257aa8b074982ab4cdd68dd44f94c71a7f.json
+++ b/cedar-integration-tests/corpus_tests/81e612257aa8b074982ab4cdd68dd44f94c71a7f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"s\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "s\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"s\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "s\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"s\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "s\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"s\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "s\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"s\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "s\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"s\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "s\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"s\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "s\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/82046ce1eaa9870071829c822ef11ec27470d5ba.json b/cedar-integration-tests/corpus_tests/82046ce1eaa9870071829c822ef11ec27470d5ba.json
index 00d6bc8ba..93be36947 100644
--- a/cedar-integration-tests/corpus_tests/82046ce1eaa9870071829c822ef11ec27470d5ba.json
+++ b/cedar-integration-tests/corpus_tests/82046ce1eaa9870071829c822ef11ec27470d5ba.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/823354d2421280e40716e95fb84bbcd4d0d20f99.json b/cedar-integration-tests/corpus_tests/823354d2421280e40716e95fb84bbcd4d0d20f99.json
index af28520f7..caf4b38b9 100644
--- a/cedar-integration-tests/corpus_tests/823354d2421280e40716e95fb84bbcd4d0d20f99.json
+++ b/cedar-integration-tests/corpus_tests/823354d2421280e40716e95fb84bbcd4d0d20f99.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\"",
+      "principal": {
+        "type": "a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\"",
+      "principal": {
+        "type": "a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\"",
+      "principal": {
+        "type": "a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\"",
+      "principal": {
+        "type": "a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\"",
+      "principal": {
+        "type": "a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\"",
+      "principal": {
+        "type": "a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\"",
+      "principal": {
+        "type": "a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\"",
+      "principal": {
+        "type": "a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/826e05f48f8fb596cdcd7bfcfe99f995c4a4012e.json b/cedar-integration-tests/corpus_tests/826e05f48f8fb596cdcd7bfcfe99f995c4a4012e.json
index ade148acf..2069fd367 100644
--- a/cedar-integration-tests/corpus_tests/826e05f48f8fb596cdcd7bfcfe99f995c4a4012e.json
+++ b/cedar-integration-tests/corpus_tests/826e05f48f8fb596cdcd7bfcfe99f995c4a4012e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "WhfhhhhhhkkkkZ::\"\\u{13}\\0\\0\\u{2}.....\"",
-      "action": "Action::\"action\"",
-      "resource": "WhfhhhhhhkkkkZ::\"\\u{13}\\0\\0\\u{2}.....\"",
+      "principal": {
+        "type": "WhfhhhhhhkkkkZ",
+        "id": "\u0013\u0000\u0000\u0002....."
+      },
+      "resource": {
+        "type": "WhfhhhhhhkkkkZ",
+        "id": "\u0013\u0000\u0000\u0002....."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "WhfhhhhhhkkkkZ::\"\\u{13}\\0\\0\\u{2}.....\"",
-      "action": "Action::\"action\"",
-      "resource": "WhfhhhhhhkkkkZ::\"\\u{13}\\0\\0\\u{2}.....\"",
+      "principal": {
+        "type": "WhfhhhhhhkkkkZ",
+        "id": "\u0013\u0000\u0000\u0002....."
+      },
+      "resource": {
+        "type": "WhfhhhhhhkkkkZ",
+        "id": "\u0013\u0000\u0000\u0002....."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "WhfhhhhhhkkkkZ::\"\\u{13}\\0\\0\\u{2}.....\"",
-      "action": "Action::\"action\"",
-      "resource": "WhfhhhhhhkkkkZ::\"\\u{13}\\0\\0\\u{2}.....\"",
+      "principal": {
+        "type": "WhfhhhhhhkkkkZ",
+        "id": "\u0013\u0000\u0000\u0002....."
+      },
+      "resource": {
+        "type": "WhfhhhhhhkkkkZ",
+        "id": "\u0013\u0000\u0000\u0002....."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "WhfhhhhhhkkkkZ::\"\\u{13}\\0\\0\\u{2}.....\"",
-      "action": "Action::\"action\"",
-      "resource": "WhfhhhhhhkkkkZ::\"\\u{13}\\0\\0\\u{2}.....\"",
+      "principal": {
+        "type": "WhfhhhhhhkkkkZ",
+        "id": "\u0013\u0000\u0000\u0002....."
+      },
+      "resource": {
+        "type": "WhfhhhhhhkkkkZ",
+        "id": "\u0013\u0000\u0000\u0002....."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "WhfhhhhhhkkkkZ::\"\\u{13}\\0\\0\\u{2}.....\"",
-      "action": "Action::\"action\"",
-      "resource": "WhfhhhhhhkkkkZ::\"\\u{13}\\0\\0\\u{2}.....\"",
+      "principal": {
+        "type": "WhfhhhhhhkkkkZ",
+        "id": "\u0013\u0000\u0000\u0002....."
+      },
+      "resource": {
+        "type": "WhfhhhhhhkkkkZ",
+        "id": "\u0013\u0000\u0000\u0002....."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "WhfhhhhhhkkkkZ::\"\\u{13}\\0\\0\\u{2}.....\"",
-      "action": "Action::\"action\"",
-      "resource": "WhfhhhhhhkkkkZ::\"\\u{13}\\0\\0\\u{2}.....\"",
+      "principal": {
+        "type": "WhfhhhhhhkkkkZ",
+        "id": "\u0013\u0000\u0000\u0002....."
+      },
+      "resource": {
+        "type": "WhfhhhhhhkkkkZ",
+        "id": "\u0013\u0000\u0000\u0002....."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "WhfhhhhhhkkkkZ::\"\\u{13}\\0\\0\\u{2}.....\"",
-      "action": "Action::\"action\"",
-      "resource": "WhfhhhhhhkkkkZ::\"\\u{13}\\0\\0\\u{2}.....\"",
+      "principal": {
+        "type": "WhfhhhhhhkkkkZ",
+        "id": "\u0013\u0000\u0000\u0002....."
+      },
+      "resource": {
+        "type": "WhfhhhhhhkkkkZ",
+        "id": "\u0013\u0000\u0000\u0002....."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "WhfhhhhhhkkkkZ::\"\\u{13}\\0\\0\\u{2}.....\"",
-      "action": "Action::\"action\"",
-      "resource": "WhfhhhhhhkkkkZ::\"\\u{13}\\0\\0\\u{2}.....\"",
+      "principal": {
+        "type": "WhfhhhhhhkkkkZ",
+        "id": "\u0013\u0000\u0000\u0002....."
+      },
+      "resource": {
+        "type": "WhfhhhhhhkkkkZ",
+        "id": "\u0013\u0000\u0000\u0002....."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/828631470611911cad0aef42e5761d7dc69c64ad.json b/cedar-integration-tests/corpus_tests/828631470611911cad0aef42e5761d7dc69c64ad.json
index e8edb3ec2..24382fceb 100644
--- a/cedar-integration-tests/corpus_tests/828631470611911cad0aef42e5761d7dc69c64ad.json
+++ b/cedar-integration-tests/corpus_tests/828631470611911cad0aef42e5761d7dc69c64ad.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/82a73100920bd4652f5fa8618bc0253ead9ef34f.json b/cedar-integration-tests/corpus_tests/82a73100920bd4652f5fa8618bc0253ead9ef34f.json
index 4c341c8d8..3310a4cb0 100644
--- a/cedar-integration-tests/corpus_tests/82a73100920bd4652f5fa8618bc0253ead9ef34f.json
+++ b/cedar-integration-tests/corpus_tests/82a73100920bd4652f5fa8618bc0253ead9ef34f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"*\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*\"",
+      "principal": {
+        "type": "a",
+        "id": "*"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"*\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*\"",
+      "principal": {
+        "type": "a",
+        "id": "*"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"*\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*\"",
+      "principal": {
+        "type": "a",
+        "id": "*"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"*\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*\"",
+      "principal": {
+        "type": "a",
+        "id": "*"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"*\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*\"",
+      "principal": {
+        "type": "a",
+        "id": "*"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"*\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*\"",
+      "principal": {
+        "type": "a",
+        "id": "*"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"*\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*\"",
+      "principal": {
+        "type": "a",
+        "id": "*"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"*\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*\"",
+      "principal": {
+        "type": "a",
+        "id": "*"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/82e0009729d4fe23f1ca9992ea9311b61228b36a.json b/cedar-integration-tests/corpus_tests/82e0009729d4fe23f1ca9992ea9311b61228b36a.json
index d2621e531..ae09afdd0 100644
--- a/cedar-integration-tests/corpus_tests/82e0009729d4fe23f1ca9992ea9311b61228b36a.json
+++ b/cedar-integration-tests/corpus_tests/82e0009729d4fe23f1ca9992ea9311b61228b36a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\"",
+      "principal": {
+        "type": "a",
+        "id": "ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/82fd390d362297d194d6680a9d0022be50071447.json b/cedar-integration-tests/corpus_tests/82fd390d362297d194d6680a9d0022be50071447.json
index 6ad5a00f0..2719b9f45 100644
--- a/cedar-integration-tests/corpus_tests/82fd390d362297d194d6680a9d0022be50071447.json
+++ b/cedar-integration-tests/corpus_tests/82fd390d362297d194d6680a9d0022be50071447.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::v::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::v",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::v::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::v",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::v::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::v",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::v::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::v",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::v::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::v",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::v::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::v",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::v::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::v",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::v::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::v",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/83296094a7d88d71a4a7b7cbe8d92117cb97f6c0.json b/cedar-integration-tests/corpus_tests/83296094a7d88d71a4a7b7cbe8d92117cb97f6c0.json
index b8426e24b..20d9c1952 100644
--- a/cedar-integration-tests/corpus_tests/83296094a7d88d71a4a7b7cbe8d92117cb97f6c0.json
+++ b/cedar-integration-tests/corpus_tests/83296094a7d88d71a4a7b7cbe8d92117cb97f6c0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/833ebac24f5aa87cfbcd4e7356047ee94335bcbe.json b/cedar-integration-tests/corpus_tests/833ebac24f5aa87cfbcd4e7356047ee94335bcbe.json
index dc4e5f1ac..26a009285 100644
--- a/cedar-integration-tests/corpus_tests/833ebac24f5aa87cfbcd4e7356047ee94335bcbe.json
+++ b/cedar-integration-tests/corpus_tests/833ebac24f5aa87cfbcd4e7356047ee94335bcbe.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::aLKKQ3J::r::A::\"\"",
-      "action": "r::r::aLKKQ3J::r::Action::\"action\"",
-      "resource": "r::r::aLKKQ3J::r::A::\"\"",
+      "principal": {
+        "type": "r::r::aLKKQ3J::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::aLKKQ3J::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::aLKKQ3J::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::aLKKQ3J::r::A::\"\"",
-      "action": "r::r::aLKKQ3J::r::Action::\"action\"",
-      "resource": "r::r::aLKKQ3J::r::A::\"\"",
+      "principal": {
+        "type": "r::r::aLKKQ3J::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::aLKKQ3J::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::aLKKQ3J::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::aLKKQ3J::r::A::\"\"",
-      "action": "r::r::aLKKQ3J::r::Action::\"action\"",
-      "resource": "r::r::aLKKQ3J::r::A::\"\"",
+      "principal": {
+        "type": "r::r::aLKKQ3J::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::aLKKQ3J::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::aLKKQ3J::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::aLKKQ3J::r::A::\"\"",
-      "action": "r::r::aLKKQ3J::r::Action::\"action\"",
-      "resource": "r::r::aLKKQ3J::r::A::\"\"",
+      "principal": {
+        "type": "r::r::aLKKQ3J::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::aLKKQ3J::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::aLKKQ3J::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::aLKKQ3J::r::A::\"\"",
-      "action": "r::r::aLKKQ3J::r::Action::\"action\"",
-      "resource": "r::r::aLKKQ3J::r::A::\"\"",
+      "principal": {
+        "type": "r::r::aLKKQ3J::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::aLKKQ3J::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::aLKKQ3J::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::aLKKQ3J::r::A::\"\"",
-      "action": "r::r::aLKKQ3J::r::Action::\"action\"",
-      "resource": "r::r::aLKKQ3J::r::A::\"\"",
+      "principal": {
+        "type": "r::r::aLKKQ3J::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::aLKKQ3J::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::aLKKQ3J::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::aLKKQ3J::r::A::\"\"",
-      "action": "r::r::aLKKQ3J::r::Action::\"action\"",
-      "resource": "r::r::aLKKQ3J::r::A::\"\"",
+      "principal": {
+        "type": "r::r::aLKKQ3J::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::aLKKQ3J::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::aLKKQ3J::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::aLKKQ3J::r::A::\"\"",
-      "action": "r::r::aLKKQ3J::r::Action::\"action\"",
-      "resource": "r::r::aLKKQ3J::r::A::\"\"",
+      "principal": {
+        "type": "r::r::aLKKQ3J::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::aLKKQ3J::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::aLKKQ3J::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/834280c350074a677889fb77ec7849eb89d4d304.json b/cedar-integration-tests/corpus_tests/834280c350074a677889fb77ec7849eb89d4d304.json
index 69d1866fc..2921d354f 100644
--- a/cedar-integration-tests/corpus_tests/834280c350074a677889fb77ec7849eb89d4d304.json
+++ b/cedar-integration-tests/corpus_tests/834280c350074a677889fb77ec7849eb89d4d304.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/83ce2c0c18a235290b93acbf1640314f6218792e.json b/cedar-integration-tests/corpus_tests/83ce2c0c18a235290b93acbf1640314f6218792e.json
index f33787bb6..0a3059a37 100644
--- a/cedar-integration-tests/corpus_tests/83ce2c0c18a235290b93acbf1640314f6218792e.json
+++ b/cedar-integration-tests/corpus_tests/83ce2c0c18a235290b93acbf1640314f6218792e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "": "",
@@ -27,9 +36,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "": "",
@@ -48,9 +66,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "": "",
@@ -69,9 +96,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "": "",
@@ -90,9 +126,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "": "",
@@ -111,9 +156,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "": "",
@@ -132,9 +186,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "": "",
@@ -153,9 +216,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "": "",
diff --git a/cedar-integration-tests/corpus_tests/83d7731c1f88066e65f32ca42ad015cd295ca475.json b/cedar-integration-tests/corpus_tests/83d7731c1f88066e65f32ca42ad015cd295ca475.json
index cc5f70f3b..b566cf155 100644
--- a/cedar-integration-tests/corpus_tests/83d7731c1f88066e65f32ca42ad015cd295ca475.json
+++ b/cedar-integration-tests/corpus_tests/83d7731c1f88066e65f32ca42ad015cd295ca475.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/8401598fc8849db48f87ae0e2451d84cfef21a0a.json b/cedar-integration-tests/corpus_tests/8401598fc8849db48f87ae0e2451d84cfef21a0a.json
index 4fba55ab5..7b15980b9 100644
--- a/cedar-integration-tests/corpus_tests/8401598fc8849db48f87ae0e2451d84cfef21a0a.json
+++ b/cedar-integration-tests/corpus_tests/8401598fc8849db48f87ae0e2451d84cfef21a0a.json
@@ -6,9 +6,15 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "u::\"\"",
-      "action": "Action::\"\"",
+      "principal": {
+        "type": "u",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +24,15 @@
     },
     {
       "desc": "Query 1",
-      "principal": "u::\"\"",
-      "action": "Action::\"\"",
+      "principal": {
+        "type": "u",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +42,15 @@
     },
     {
       "desc": "Query 2",
-      "principal": "u::\"\"",
-      "action": "Action::\"\"",
+      "principal": {
+        "type": "u",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +60,15 @@
     },
     {
       "desc": "Query 3",
-      "principal": "u::\"\"",
-      "action": "Action::\"\"",
+      "principal": {
+        "type": "u",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +78,15 @@
     },
     {
       "desc": "Query 4",
-      "principal": "u::\"\"",
-      "action": "Action::\"\"",
+      "principal": {
+        "type": "u",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +96,15 @@
     },
     {
       "desc": "Query 5",
-      "principal": "u::\"\"",
-      "action": "Action::\"\"",
+      "principal": {
+        "type": "u",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +114,15 @@
     },
     {
       "desc": "Query 6",
-      "principal": "u::\"\"",
-      "action": "Action::\"\"",
+      "principal": {
+        "type": "u",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +132,15 @@
     },
     {
       "desc": "Query 7",
-      "principal": "u::\"\"",
-      "action": "Action::\"\"",
+      "principal": {
+        "type": "u",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8422992aa599755d03ee771d9916fe0aa5bcd2ba.json b/cedar-integration-tests/corpus_tests/8422992aa599755d03ee771d9916fe0aa5bcd2ba.json
index 031eca199..efd0516af 100644
--- a/cedar-integration-tests/corpus_tests/8422992aa599755d03ee771d9916fe0aa5bcd2ba.json
+++ b/cedar-integration-tests/corpus_tests/8422992aa599755d03ee771d9916fe0aa5bcd2ba.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/84823b37c9609c57029d4b2217d8ed6f19504ef4.json b/cedar-integration-tests/corpus_tests/84823b37c9609c57029d4b2217d8ed6f19504ef4.json
index 863363873..d763d15ff 100644
--- a/cedar-integration-tests/corpus_tests/84823b37c9609c57029d4b2217d8ed6f19504ef4.json
+++ b/cedar-integration-tests/corpus_tests/84823b37c9609c57029d4b2217d8ed6f19504ef4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "I": false,
         "K776": "",
@@ -23,9 +32,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "I": false,
         "K776": "",
@@ -40,9 +58,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "I": false,
         "K776": "",
@@ -57,9 +84,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "I": false,
         "K776": "",
@@ -74,9 +110,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "I": false,
         "K776": "",
@@ -91,9 +136,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "I": false,
         "K776": "",
@@ -108,9 +162,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "I": false,
         "K776": "",
@@ -125,9 +188,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "I": false,
         "K776": "",
diff --git a/cedar-integration-tests/corpus_tests/8499dc3608bd9a3b4dcb97a74e219d48b1de6f5e.json b/cedar-integration-tests/corpus_tests/8499dc3608bd9a3b4dcb97a74e219d48b1de6f5e.json
index 618c0932b..81928a048 100644
--- a/cedar-integration-tests/corpus_tests/8499dc3608bd9a3b4dcb97a74e219d48b1de6f5e.json
+++ b/cedar-integration-tests/corpus_tests/8499dc3608bd9a3b4dcb97a74e219d48b1de6f5e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/84c1d156b5b9aa6d27c9394971b2757aee759ba0.json b/cedar-integration-tests/corpus_tests/84c1d156b5b9aa6d27c9394971b2757aee759ba0.json
index 83f5b8365..07c3cd485 100644
--- a/cedar-integration-tests/corpus_tests/84c1d156b5b9aa6d27c9394971b2757aee759ba0.json
+++ b/cedar-integration-tests/corpus_tests/84c1d156b5b9aa6d27c9394971b2757aee759ba0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"zzzzRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzRR\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"zzzzRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzRR\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"zzzzRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzRR\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"zzzzRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzRR\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"zzzzRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzRR\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"zzzzRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzRR\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"zzzzRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzRR\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"zzzzRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzRR\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/84f41f5ea0f77e2b817e38052fd58b2593c09f9f.json b/cedar-integration-tests/corpus_tests/84f41f5ea0f77e2b817e38052fd58b2593c09f9f.json
index 1fccf2a8d..ed5ef35a9 100644
--- a/cedar-integration-tests/corpus_tests/84f41f5ea0f77e2b817e38052fd58b2593c09f9f.json
+++ b/cedar-integration-tests/corpus_tests/84f41f5ea0f77e2b817e38052fd58b2593c09f9f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/850d5550a7987fccee6e5d66cbafdb33a167ae18.json b/cedar-integration-tests/corpus_tests/850d5550a7987fccee6e5d66cbafdb33a167ae18.json
index 17f317c05..2c49194c4 100644
--- a/cedar-integration-tests/corpus_tests/850d5550a7987fccee6e5d66cbafdb33a167ae18.json
+++ b/cedar-integration-tests/corpus_tests/850d5550a7987fccee6e5d66cbafdb33a167ae18.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0]\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0]\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0]\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000]"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0]\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0]\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000]"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0]\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0]\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000]"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0]\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0]\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000]"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0]\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0]\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000]"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0]\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0]\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000]"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0]\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0]\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000]"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/8517b6f5dfec8cd097e5be7e0bc4671be261086e.json b/cedar-integration-tests/corpus_tests/8517b6f5dfec8cd097e5be7e0bc4671be261086e.json
index 91be40966..a6adfbdfa 100644
--- a/cedar-integration-tests/corpus_tests/8517b6f5dfec8cd097e5be7e0bc4671be261086e.json
+++ b/cedar-integration-tests/corpus_tests/8517b6f5dfec8cd097e5be7e0bc4671be261086e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"sN\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}oc/\"",
+      "principal": {
+        "type": "a",
+        "id": "sN"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002oc/"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}oc/\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}oc/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002oc/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002oc/"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}oc/\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}oc/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002oc/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002oc/"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}oc/\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}oc/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002oc/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002oc/"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}oc/\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}oc/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002oc/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002oc/"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}oc/\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}oc/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002oc/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002oc/"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}oc/\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}oc/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002oc/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002oc/"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}oc/\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}oc/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002oc/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002oc/"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8568db717e8ce5d5c2eae1f530d4f2bc3de2eef6.json b/cedar-integration-tests/corpus_tests/8568db717e8ce5d5c2eae1f530d4f2bc3de2eef6.json
index b6af6cd9d..750cd805e 100644
--- a/cedar-integration-tests/corpus_tests/8568db717e8ce5d5c2eae1f530d4f2bc3de2eef6.json
+++ b/cedar-integration-tests/corpus_tests/8568db717e8ce5d5c2eae1f530d4f2bc3de2eef6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Gjxxxxjjj::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Gjxxxxjjj::\"\"",
+      "principal": {
+        "type": "Gjxxxxjjj",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gjxxxxjjj",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "WjxiG777x7A33xx0": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Gjxxxxjjj::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Gjxxxxjjj::\"\"",
+      "principal": {
+        "type": "Gjxxxxjjj",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gjxxxxjjj",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "WjxiG777x7A33xx0": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Gjxxxxjjj::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Gjxxxxjjj::\"\"",
+      "principal": {
+        "type": "Gjxxxxjjj",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gjxxxxjjj",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "WjxiG777x7A33xx0": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Gjxxxxjjj::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Gjxxxxjjj::\"\"",
+      "principal": {
+        "type": "Gjxxxxjjj",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gjxxxxjjj",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "WjxiG777x7A33xx0": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Gjxxxxjjj::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Gjxxxxjjj::\"\"",
+      "principal": {
+        "type": "Gjxxxxjjj",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gjxxxxjjj",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "WjxiG777x7A33xx0": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Gjxxxxjjj::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Gjxxxxjjj::\"\"",
+      "principal": {
+        "type": "Gjxxxxjjj",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gjxxxxjjj",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "WjxiG777x7A33xx0": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Gjxxxxjjj::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Gjxxxxjjj::\"\"",
+      "principal": {
+        "type": "Gjxxxxjjj",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gjxxxxjjj",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "WjxiG777x7A33xx0": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Gjxxxxjjj::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Gjxxxxjjj::\"\"",
+      "principal": {
+        "type": "Gjxxxxjjj",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gjxxxxjjj",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "WjxiG777x7A33xx0": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/858d3a0145d6b20088d1bd3044de51e229ca13a6.json b/cedar-integration-tests/corpus_tests/858d3a0145d6b20088d1bd3044de51e229ca13a6.json
index 411c73862..ec4b2d3e1 100644
--- a/cedar-integration-tests/corpus_tests/858d3a0145d6b20088d1bd3044de51e229ca13a6.json
+++ b/cedar-integration-tests/corpus_tests/858d3a0145d6b20088d1bd3044de51e229ca13a6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "G6660x6::r::a::\"\"",
-      "action": "G6660x6::r::Action::\"action\"",
-      "resource": "G6660x6::r::a::\"\"",
+      "principal": {
+        "type": "G6660x6::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "G6660x6::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "G6660x6::r::Action",
+        "id": "action"
+      },
       "context": {
         "b77750000000000": "",
         "sruyqcpv": ""
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "G6660x6::r::a::\"\"",
-      "action": "G6660x6::r::Action::\"action\"",
-      "resource": "G6660x6::r::a::\"\"",
+      "principal": {
+        "type": "G6660x6::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "G6660x6::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "G6660x6::r::Action",
+        "id": "action"
+      },
       "context": {
         "b77750000000000": "",
         "sruyqcpv": ""
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "G6660x6::r::a::\"\"",
-      "action": "G6660x6::r::Action::\"action\"",
-      "resource": "G6660x6::r::a::\"\"",
+      "principal": {
+        "type": "G6660x6::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "G6660x6::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "G6660x6::r::Action",
+        "id": "action"
+      },
       "context": {
         "b77750000000000": "",
         "sruyqcpv": ""
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "G6660x6::r::a::\"\"",
-      "action": "G6660x6::r::Action::\"action\"",
-      "resource": "G6660x6::r::a::\"\"",
+      "principal": {
+        "type": "G6660x6::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "G6660x6::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "G6660x6::r::Action",
+        "id": "action"
+      },
       "context": {
         "b77750000000000": "",
         "sruyqcpv": ""
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "G6660x6::r::a::\"\"",
-      "action": "G6660x6::r::Action::\"action\"",
-      "resource": "G6660x6::r::a::\"\"",
+      "principal": {
+        "type": "G6660x6::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "G6660x6::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "G6660x6::r::Action",
+        "id": "action"
+      },
       "context": {
         "b77750000000000": "",
         "sruyqcpv": ""
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "G6660x6::r::a::\"\"",
-      "action": "G6660x6::r::Action::\"action\"",
-      "resource": "G6660x6::r::a::\"\"",
+      "principal": {
+        "type": "G6660x6::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "G6660x6::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "G6660x6::r::Action",
+        "id": "action"
+      },
       "context": {
         "b77750000000000": "",
         "sruyqcpv": ""
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "G6660x6::r::a::\"\"",
-      "action": "G6660x6::r::Action::\"action\"",
-      "resource": "G6660x6::r::a::\"\"",
+      "principal": {
+        "type": "G6660x6::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "G6660x6::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "G6660x6::r::Action",
+        "id": "action"
+      },
       "context": {
         "b77750000000000": "",
         "sruyqcpv": ""
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "G6660x6::r::a::\"\"",
-      "action": "G6660x6::r::Action::\"action\"",
-      "resource": "G6660x6::r::a::\"\"",
+      "principal": {
+        "type": "G6660x6::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "G6660x6::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "G6660x6::r::Action",
+        "id": "action"
+      },
       "context": {
         "b77750000000000": "",
         "sruyqcpv": ""
diff --git a/cedar-integration-tests/corpus_tests/85e91c7c564be966dcd647fe9514670cc398150b.json b/cedar-integration-tests/corpus_tests/85e91c7c564be966dcd647fe9514670cc398150b.json
index a66b1c7a7..8c8b5f79e 100644
--- a/cedar-integration-tests/corpus_tests/85e91c7c564be966dcd647fe9514670cc398150b.json
+++ b/cedar-integration-tests/corpus_tests/85e91c7c564be966dcd647fe9514670cc398150b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0# \\u{4}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000# \u0004\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/85ee31bca0778b20851e4eec1a4b60f2554faae2.json b/cedar-integration-tests/corpus_tests/85ee31bca0778b20851e4eec1a4b60f2554faae2.json
index ca2f5cb32..f8d467ccd 100644
--- a/cedar-integration-tests/corpus_tests/85ee31bca0778b20851e4eec1a4b60f2554faae2.json
+++ b/cedar-integration-tests/corpus_tests/85ee31bca0778b20851e4eec1a4b60f2554faae2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{15}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/8687a31c52c12c4059d6573bc0f3495392c496dd.json b/cedar-integration-tests/corpus_tests/8687a31c52c12c4059d6573bc0f3495392c496dd.json
index 3fe585e36..311d8bdfe 100644
--- a/cedar-integration-tests/corpus_tests/8687a31c52c12c4059d6573bc0f3495392c496dd.json
+++ b/cedar-integration-tests/corpus_tests/8687a31c52c12c4059d6573bc0f3495392c496dd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\r\\r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\r\\r\"",
+      "principal": {
+        "type": "a",
+        "id": "\r\r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\r\r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\r\\r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\r\\r\"",
+      "principal": {
+        "type": "a",
+        "id": "\r\r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\r\r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\r\\r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\r\\r\"",
+      "principal": {
+        "type": "a",
+        "id": "\r\r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\r\r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\r\\r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\r\\r\"",
+      "principal": {
+        "type": "a",
+        "id": "\r\r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\r\r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\r\\r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\r\\r\"",
+      "principal": {
+        "type": "a",
+        "id": "\r\r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\r\r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\r\\r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\r\\r\"",
+      "principal": {
+        "type": "a",
+        "id": "\r\r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\r\r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\r\\r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\r\\r\"",
+      "principal": {
+        "type": "a",
+        "id": "\r\r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\r\r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\r\\r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\r\\r\"",
+      "principal": {
+        "type": "a",
+        "id": "\r\r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\r\r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/86d0a199b63876773d3ae8683ff767f7857b6116.json b/cedar-integration-tests/corpus_tests/86d0a199b63876773d3ae8683ff767f7857b6116.json
index ddb752299..cee554914 100644
--- a/cedar-integration-tests/corpus_tests/86d0a199b63876773d3ae8683ff767f7857b6116.json
+++ b/cedar-integration-tests/corpus_tests/86d0a199b63876773d3ae8683ff767f7857b6116.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/86d4560b43a0a1d09c22b61edede50be15077139.json b/cedar-integration-tests/corpus_tests/86d4560b43a0a1d09c22b61edede50be15077139.json
index c738382e1..918f6bcfe 100644
--- a/cedar-integration-tests/corpus_tests/86d4560b43a0a1d09c22b61edede50be15077139.json
+++ b/cedar-integration-tests/corpus_tests/86d4560b43a0a1d09c22b61edede50be15077139.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0>\\0\\0L\\0fff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000>\u0000\u0000L\u0000fff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0>\\0\\0L\\0fff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000>\u0000\u0000L\u0000fff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0>\\0\\0L\\0fff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0>\\0\\0L\\0fff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000>\u0000\u0000L\u0000fff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000>\u0000\u0000L\u0000fff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0>\\0\\0L\\0fff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0>\\0\\0L\\0fff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000>\u0000\u0000L\u0000fff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000>\u0000\u0000L\u0000fff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0>\\0\\0L\\0fff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0>\\0\\0L\\0fff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000>\u0000\u0000L\u0000fff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000>\u0000\u0000L\u0000fff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0>\\0\\0L\\0fff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0>\\0\\0L\\0fff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000>\u0000\u0000L\u0000fff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000>\u0000\u0000L\u0000fff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0>\\0\\0L\\0fff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0>\\0\\0L\\0fff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000>\u0000\u0000L\u0000fff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000>\u0000\u0000L\u0000fff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0>\\0\\0L\\0fff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0>\\0\\0L\\0fff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000>\u0000\u0000L\u0000fff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000>\u0000\u0000L\u0000fff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/86d842e37350ffc25126fd71342ec46a248ba340.json b/cedar-integration-tests/corpus_tests/86d842e37350ffc25126fd71342ec46a248ba340.json
index 108a8d4c4..25ec0b5fb 100644
--- a/cedar-integration-tests/corpus_tests/86d842e37350ffc25126fd71342ec46a248ba340.json
+++ b/cedar-integration-tests/corpus_tests/86d842e37350ffc25126fd71342ec46a248ba340.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::r::G::r::a::\":\"",
-      "action": "r::r::r::G::r::Action::\"action\"",
-      "resource": "r::r::r::G::r::a::\":\"",
+      "principal": {
+        "type": "r::r::r::G::r::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "r::r::r::G::r::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "r::r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::r::G::r::a::\":\"",
-      "action": "r::r::r::G::r::Action::\"action\"",
-      "resource": "r::r::r::G::r::a::\":\"",
+      "principal": {
+        "type": "r::r::r::G::r::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "r::r::r::G::r::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "r::r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::r::G::r::a::\":\"",
-      "action": "r::r::r::G::r::Action::\"action\"",
-      "resource": "r::r::r::G::r::a::\":\"",
+      "principal": {
+        "type": "r::r::r::G::r::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "r::r::r::G::r::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "r::r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::r::G::r::a::\":\"",
-      "action": "r::r::r::G::r::Action::\"action\"",
-      "resource": "r::r::r::G::r::a::\":\"",
+      "principal": {
+        "type": "r::r::r::G::r::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "r::r::r::G::r::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "r::r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::r::G::r::a::\":\"",
-      "action": "r::r::r::G::r::Action::\"action\"",
-      "resource": "r::r::r::G::r::a::\":\"",
+      "principal": {
+        "type": "r::r::r::G::r::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "r::r::r::G::r::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "r::r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::r::G::r::a::\":\"",
-      "action": "r::r::r::G::r::Action::\"action\"",
-      "resource": "r::r::r::G::r::a::\":\"",
+      "principal": {
+        "type": "r::r::r::G::r::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "r::r::r::G::r::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "r::r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::r::G::r::a::\":\"",
-      "action": "r::r::r::G::r::Action::\"action\"",
-      "resource": "r::r::r::G::r::a::\":\"",
+      "principal": {
+        "type": "r::r::r::G::r::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "r::r::r::G::r::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "r::r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::r::G::r::a::\":\"",
-      "action": "r::r::r::G::r::Action::\"action\"",
-      "resource": "r::r::r::G::r::a::\":\"",
+      "principal": {
+        "type": "r::r::r::G::r::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "r::r::r::G::r::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "r::r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/870c25a990be727397d9239cd5a34f904c341e77.json b/cedar-integration-tests/corpus_tests/870c25a990be727397d9239cd5a34f904c341e77.json
index 364db24e1..cad75cd57 100644
--- a/cedar-integration-tests/corpus_tests/870c25a990be727397d9239cd5a34f904c341e77.json
+++ b/cedar-integration-tests/corpus_tests/870c25a990be727397d9239cd5a34f904c341e77.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"0\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "0\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/87202e9c047a7bda9986e7b09c06b23dd02dedbd.json b/cedar-integration-tests/corpus_tests/87202e9c047a7bda9986e7b09c06b23dd02dedbd.json
index f35eff1ef..467f04774 100644
--- a/cedar-integration-tests/corpus_tests/87202e9c047a7bda9986e7b09c06b23dd02dedbd.json
+++ b/cedar-integration-tests/corpus_tests/87202e9c047a7bda9986e7b09c06b23dd02dedbd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "A",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "A",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "A",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "A",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "A",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "A",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "A",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "A",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "A",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "A",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "A",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "A",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "A",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "A",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "A",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "A",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/874bb70abee31a9fc92403d4e9d05ff5e9d216bb.json b/cedar-integration-tests/corpus_tests/874bb70abee31a9fc92403d4e9d05ff5e9d216bb.json
index e62208f40..960598db0 100644
--- a/cedar-integration-tests/corpus_tests/874bb70abee31a9fc92403d4e9d05ff5e9d216bb.json
+++ b/cedar-integration-tests/corpus_tests/874bb70abee31a9fc92403d4e9d05ff5e9d216bb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::r::r::V::\"\"",
-      "action": "r::r::r::r::Action::\"action\"",
-      "resource": "r::r::r::r::r3Y3333w3333::\"\"",
+      "principal": {
+        "type": "r::r::r::r::V",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r3Y3333w3333",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::r::r::V::\"\"",
-      "action": "r::r::r::r::Action::\"action\"",
-      "resource": "r::r::r::r::r3Y3333w3333::\"\"",
+      "principal": {
+        "type": "r::r::r::r::V",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r3Y3333w3333",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::r::r::V::\"\"",
-      "action": "r::r::r::r::Action::\"action\"",
-      "resource": "r::r::r::r::r3Y3333w3333::\"\"",
+      "principal": {
+        "type": "r::r::r::r::V",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r3Y3333w3333",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::r::r::V::\"\"",
-      "action": "r::r::r::r::Action::\"action\"",
-      "resource": "r::r::r::r::r3Y3333w3333::\"\"",
+      "principal": {
+        "type": "r::r::r::r::V",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r3Y3333w3333",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::r::r::V::\"\"",
-      "action": "r::r::r::r::Action::\"action\"",
-      "resource": "r::r::r::r::r3Y3333w3333::\"\"",
+      "principal": {
+        "type": "r::r::r::r::V",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r3Y3333w3333",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::r::r::V::\"\"",
-      "action": "r::r::r::r::Action::\"action\"",
-      "resource": "r::r::r::r::r3Y3333w3333::\"\"",
+      "principal": {
+        "type": "r::r::r::r::V",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r3Y3333w3333",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::r::r::V::\"\"",
-      "action": "r::r::r::r::Action::\"action\"",
-      "resource": "r::r::r::r::r3Y3333w3333::\"\"",
+      "principal": {
+        "type": "r::r::r::r::V",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r3Y3333w3333",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::r::r::V::\"\"",
-      "action": "r::r::r::r::Action::\"action\"",
-      "resource": "r::r::r::r::r3Y3333w3333::\"\"",
+      "principal": {
+        "type": "r::r::r::r::V",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r3Y3333w3333",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8755024362258be1b1485c414d7cb2d3a77bd3f4.json b/cedar-integration-tests/corpus_tests/8755024362258be1b1485c414d7cb2d3a77bd3f4.json
index 6c61312fe..c83439ea5 100644
--- a/cedar-integration-tests/corpus_tests/8755024362258be1b1485c414d7cb2d3a77bd3f4.json
+++ b/cedar-integration-tests/corpus_tests/8755024362258be1b1485c414d7cb2d3a77bd3f4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0@\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000@"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0@\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000@"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0@\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000@"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0@\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000@"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0@\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000@"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0@\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000@"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0@\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000@"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0@\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000@"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/8783bbac77ad98fca11a0df2f4d2ee266f0a465c.json b/cedar-integration-tests/corpus_tests/8783bbac77ad98fca11a0df2f4d2ee266f0a465c.json
index 0df76d2f1..c466ea0ed 100644
--- a/cedar-integration-tests/corpus_tests/8783bbac77ad98fca11a0df2f4d2ee266f0a465c.json
+++ b/cedar-integration-tests/corpus_tests/8783bbac77ad98fca11a0df2f4d2ee266f0a465c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Q::A::V::A::\"\"",
-      "action": "Q::A::V::Action::\"action\"",
-      "resource": "Q::A::V::A::\"\"",
+      "principal": {
+        "type": "Q::A::V::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q::A::V::A",
+        "id": ""
+      },
+      "action": {
+        "type": "Q::A::V::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Q::A::V::A::\"\"",
-      "action": "Q::A::V::Action::\"action\"",
-      "resource": "Q::A::V::A::\"\"",
+      "principal": {
+        "type": "Q::A::V::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q::A::V::A",
+        "id": ""
+      },
+      "action": {
+        "type": "Q::A::V::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Q::A::V::A::\"\"",
-      "action": "Q::A::V::Action::\"action\"",
-      "resource": "Q::A::V::A::\"\"",
+      "principal": {
+        "type": "Q::A::V::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q::A::V::A",
+        "id": ""
+      },
+      "action": {
+        "type": "Q::A::V::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Q::A::V::A::\"\"",
-      "action": "Q::A::V::Action::\"action\"",
-      "resource": "Q::A::V::A::\"\"",
+      "principal": {
+        "type": "Q::A::V::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q::A::V::A",
+        "id": ""
+      },
+      "action": {
+        "type": "Q::A::V::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Q::A::V::A::\"\"",
-      "action": "Q::A::V::Action::\"action\"",
-      "resource": "Q::A::V::A::\"\"",
+      "principal": {
+        "type": "Q::A::V::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q::A::V::A",
+        "id": ""
+      },
+      "action": {
+        "type": "Q::A::V::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Q::A::V::A::\"\"",
-      "action": "Q::A::V::Action::\"action\"",
-      "resource": "Q::A::V::A::\"\"",
+      "principal": {
+        "type": "Q::A::V::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q::A::V::A",
+        "id": ""
+      },
+      "action": {
+        "type": "Q::A::V::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Q::A::V::A::\"\"",
-      "action": "Q::A::V::Action::\"action\"",
-      "resource": "Q::A::V::A::\"\"",
+      "principal": {
+        "type": "Q::A::V::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q::A::V::A",
+        "id": ""
+      },
+      "action": {
+        "type": "Q::A::V::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Q::A::V::A::\"\"",
-      "action": "Q::A::V::Action::\"action\"",
-      "resource": "Q::A::V::A::\"\"",
+      "principal": {
+        "type": "Q::A::V::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q::A::V::A",
+        "id": ""
+      },
+      "action": {
+        "type": "Q::A::V::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/879f4020c41510daceeb3111f98ec1393c2a4106.json b/cedar-integration-tests/corpus_tests/879f4020c41510daceeb3111f98ec1393c2a4106.json
index e4cb34f56..aeaf3d3ff 100644
--- a/cedar-integration-tests/corpus_tests/879f4020c41510daceeb3111f98ec1393c2a4106.json
+++ b/cedar-integration-tests/corpus_tests/879f4020c41510daceeb3111f98ec1393c2a4106.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8862544c9190cd90ebfc98eeee8fc0482628730f.json b/cedar-integration-tests/corpus_tests/8862544c9190cd90ebfc98eeee8fc0482628730f.json
index 72d071abc..a2b11a9b1 100644
--- a/cedar-integration-tests/corpus_tests/8862544c9190cd90ebfc98eeee8fc0482628730f.json
+++ b/cedar-integration-tests/corpus_tests/8862544c9190cd90ebfc98eeee8fc0482628730f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/886716dc4d577af974592c0d379d18e2f2fc691b.json b/cedar-integration-tests/corpus_tests/886716dc4d577af974592c0d379d18e2f2fc691b.json
index a61b5a6a0..cb43ca0c2 100644
--- a/cedar-integration-tests/corpus_tests/886716dc4d577af974592c0d379d18e2f2fc691b.json
+++ b/cedar-integration-tests/corpus_tests/886716dc4d577af974592c0d379d18e2f2fc691b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/88854732ff8c1610ddd340cf53aeeae79e33d222.json b/cedar-integration-tests/corpus_tests/88854732ff8c1610ddd340cf53aeeae79e33d222.json
index a6d142839..5609a9425 100644
--- a/cedar-integration-tests/corpus_tests/88854732ff8c1610ddd340cf53aeeae79e33d222.json
+++ b/cedar-integration-tests/corpus_tests/88854732ff8c1610ddd340cf53aeeae79e33d222.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"/ja\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/ja"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/889a3dc86d3876f088f69277280cbad5283fd9d8.json b/cedar-integration-tests/corpus_tests/889a3dc86d3876f088f69277280cbad5283fd9d8.json
index 049ddd909..ef154bfb8 100644
--- a/cedar-integration-tests/corpus_tests/889a3dc86d3876f088f69277280cbad5283fd9d8.json
+++ b/cedar-integration-tests/corpus_tests/889a3dc86d3876f088f69277280cbad5283fd9d8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "sWqs::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqs::\"\"",
+      "principal": {
+        "type": "sWqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wqk00000000000000": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "sWqs::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqs::\"\"",
+      "principal": {
+        "type": "sWqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wqk00000000000000": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "sWqs::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqs::\"\"",
+      "principal": {
+        "type": "sWqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wqk00000000000000": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "sWqs::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqs::\"\"",
+      "principal": {
+        "type": "sWqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wqk00000000000000": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "sWqs::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqs::\"\"",
+      "principal": {
+        "type": "sWqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wqk00000000000000": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "sWqs::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqs::\"\"",
+      "principal": {
+        "type": "sWqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wqk00000000000000": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "sWqs::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqs::\"\"",
+      "principal": {
+        "type": "sWqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wqk00000000000000": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "sWqs::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "sWqs::\"\"",
+      "principal": {
+        "type": "sWqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "sWqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wqk00000000000000": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/88a7c7e768ffb56f9cbd17b64c9406503b7c514e.json b/cedar-integration-tests/corpus_tests/88a7c7e768ffb56f9cbd17b64c9406503b7c514e.json
index e3aa9f00f..2031884ad 100644
--- a/cedar-integration-tests/corpus_tests/88a7c7e768ffb56f9cbd17b64c9406503b7c514e.json
+++ b/cedar-integration-tests/corpus_tests/88a7c7e768ffb56f9cbd17b64c9406503b7c514e.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/88ae543a35ed13de3dc6e368575b1873114207bb.json b/cedar-integration-tests/corpus_tests/88ae543a35ed13de3dc6e368575b1873114207bb.json
index ecfb262ec..a39eece53 100644
--- a/cedar-integration-tests/corpus_tests/88ae543a35ed13de3dc6e368575b1873114207bb.json
+++ b/cedar-integration-tests/corpus_tests/88ae543a35ed13de3dc6e368575b1873114207bb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/88dfaaec78187b7e68e9ddd7ba4772e5786c89bd.json b/cedar-integration-tests/corpus_tests/88dfaaec78187b7e68e9ddd7ba4772e5786c89bd.json
index 2177dba3e..97fa06e93 100644
--- a/cedar-integration-tests/corpus_tests/88dfaaec78187b7e68e9ddd7ba4772e5786c89bd.json
+++ b/cedar-integration-tests/corpus_tests/88dfaaec78187b7e68e9ddd7ba4772e5786c89bd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/89127cdc11bcd048f4ca03485eabd7f6dbf18cb9.json b/cedar-integration-tests/corpus_tests/89127cdc11bcd048f4ca03485eabd7f6dbf18cb9.json
index 02eaab2c8..42209c87e 100644
--- a/cedar-integration-tests/corpus_tests/89127cdc11bcd048f4ca03485eabd7f6dbf18cb9.json
+++ b/cedar-integration-tests/corpus_tests/89127cdc11bcd048f4ca03485eabd7f6dbf18cb9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"PTL::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"PTL::\"",
+      "principal": {
+        "type": "a",
+        "id": "PTL::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "PTL::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"PTL::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"PTL::\"",
+      "principal": {
+        "type": "a",
+        "id": "PTL::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "PTL::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"PTL::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"PTL::\"",
+      "principal": {
+        "type": "a",
+        "id": "PTL::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "PTL::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"PTL::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"PTL::\"",
+      "principal": {
+        "type": "a",
+        "id": "PTL::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "PTL::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"PTL::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"PTL::\"",
+      "principal": {
+        "type": "a",
+        "id": "PTL::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "PTL::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"PTL::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"PTL::\"",
+      "principal": {
+        "type": "a",
+        "id": "PTL::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "PTL::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"PTL::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"PTL::\"",
+      "principal": {
+        "type": "a",
+        "id": "PTL::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "PTL::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"PTL::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"PTL::\"",
+      "principal": {
+        "type": "a",
+        "id": "PTL::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "PTL::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/899af85fdc4cc68f97e4bc481b4368e61d1ec35f.json b/cedar-integration-tests/corpus_tests/899af85fdc4cc68f97e4bc481b4368e61d1ec35f.json
index 13025cd14..76933fb8f 100644
--- a/cedar-integration-tests/corpus_tests/899af85fdc4cc68f97e4bc481b4368e61d1ec35f.json
+++ b/cedar-integration-tests/corpus_tests/899af85fdc4cc68f97e4bc481b4368e61d1ec35f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/89b555f9830641f8a81b973563f6a7a96ec9751f.json b/cedar-integration-tests/corpus_tests/89b555f9830641f8a81b973563f6a7a96ec9751f.json
index 932d19869..be9ae8037 100644
--- a/cedar-integration-tests/corpus_tests/89b555f9830641f8a81b973563f6a7a96ec9751f.json
+++ b/cedar-integration-tests/corpus_tests/89b555f9830641f8a81b973563f6a7a96ec9751f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "v::OMRR::Qx::\"\"",
-      "action": "v::OMRR::Action::\"action\"",
-      "resource": "v::OMRR::Qx::\"\"",
+      "principal": {
+        "type": "v::OMRR::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::OMRR::Qx",
+        "id": ""
+      },
+      "action": {
+        "type": "v::OMRR::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "v::OMRR::Qx::\"\"",
-      "action": "v::OMRR::Action::\"action\"",
-      "resource": "v::OMRR::Qx::\"\"",
+      "principal": {
+        "type": "v::OMRR::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::OMRR::Qx",
+        "id": ""
+      },
+      "action": {
+        "type": "v::OMRR::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "v::OMRR::Qx::\"\"",
-      "action": "v::OMRR::Action::\"action\"",
-      "resource": "v::OMRR::Qx::\"\"",
+      "principal": {
+        "type": "v::OMRR::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::OMRR::Qx",
+        "id": ""
+      },
+      "action": {
+        "type": "v::OMRR::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "v::OMRR::Qx::\"\"",
-      "action": "v::OMRR::Action::\"action\"",
-      "resource": "v::OMRR::Qx::\"\"",
+      "principal": {
+        "type": "v::OMRR::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::OMRR::Qx",
+        "id": ""
+      },
+      "action": {
+        "type": "v::OMRR::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "v::OMRR::Qx::\"\"",
-      "action": "v::OMRR::Action::\"action\"",
-      "resource": "v::OMRR::Qx::\"\"",
+      "principal": {
+        "type": "v::OMRR::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::OMRR::Qx",
+        "id": ""
+      },
+      "action": {
+        "type": "v::OMRR::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "v::OMRR::Qx::\"\"",
-      "action": "v::OMRR::Action::\"action\"",
-      "resource": "v::OMRR::Qx::\"\"",
+      "principal": {
+        "type": "v::OMRR::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::OMRR::Qx",
+        "id": ""
+      },
+      "action": {
+        "type": "v::OMRR::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "v::OMRR::Qx::\"\"",
-      "action": "v::OMRR::Action::\"action\"",
-      "resource": "v::OMRR::Qx::\"\"",
+      "principal": {
+        "type": "v::OMRR::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::OMRR::Qx",
+        "id": ""
+      },
+      "action": {
+        "type": "v::OMRR::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "v::OMRR::Qx::\"\"",
-      "action": "v::OMRR::Action::\"action\"",
-      "resource": "v::OMRR::Qx::\"\"",
+      "principal": {
+        "type": "v::OMRR::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "v::OMRR::Qx",
+        "id": ""
+      },
+      "action": {
+        "type": "v::OMRR::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/89d3fec3b348145d73322847f3cf3fd49189b925.json b/cedar-integration-tests/corpus_tests/89d3fec3b348145d73322847f3cf3fd49189b925.json
index fe9e63865..663ed5b26 100644
--- a/cedar-integration-tests/corpus_tests/89d3fec3b348145d73322847f3cf3fd49189b925.json
+++ b/cedar-integration-tests/corpus_tests/89d3fec3b348145d73322847f3cf3fd49189b925.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/89ea3966b3c49ea8d1c895941cae13c6f0a7fac6.json b/cedar-integration-tests/corpus_tests/89ea3966b3c49ea8d1c895941cae13c6f0a7fac6.json
index 3955ce36b..20f868864 100644
--- a/cedar-integration-tests/corpus_tests/89ea3966b3c49ea8d1c895941cae13c6f0a7fac6.json
+++ b/cedar-integration-tests/corpus_tests/89ea3966b3c49ea8d1c895941cae13c6f0a7fac6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "xYqs::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xYqs::\"\"",
+      "principal": {
+        "type": "xYqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "xYqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "xYqs::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xYqs::\"\"",
+      "principal": {
+        "type": "xYqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "xYqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "xYqs::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xYqs::\"\"",
+      "principal": {
+        "type": "xYqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "xYqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "xYqs::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xYqs::\"\"",
+      "principal": {
+        "type": "xYqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "xYqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "xYqs::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xYqs::\"\"",
+      "principal": {
+        "type": "xYqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "xYqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "xYqs::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xYqs::\"\"",
+      "principal": {
+        "type": "xYqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "xYqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "xYqs::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xYqs::\"\"",
+      "principal": {
+        "type": "xYqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "xYqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "xYqs::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "xYqs::\"\"",
+      "principal": {
+        "type": "xYqs",
+        "id": ""
+      },
+      "resource": {
+        "type": "xYqs",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8a03928d0b2ed43f8d66f0732e23554803e3c570.json b/cedar-integration-tests/corpus_tests/8a03928d0b2ed43f8d66f0732e23554803e3c570.json
index 396414466..223e5706e 100644
--- a/cedar-integration-tests/corpus_tests/8a03928d0b2ed43f8d66f0732e23554803e3c570.json
+++ b/cedar-integration-tests/corpus_tests/8a03928d0b2ed43f8d66f0732e23554803e3c570.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/8a4206baab5492fa446b2a91fc661c08b66f7470.json b/cedar-integration-tests/corpus_tests/8a4206baab5492fa446b2a91fc661c08b66f7470.json
index e6606f696..235076b05 100644
--- a/cedar-integration-tests/corpus_tests/8a4206baab5492fa446b2a91fc661c08b66f7470.json
+++ b/cedar-integration-tests/corpus_tests/8a4206baab5492fa446b2a91fc661c08b66f7470.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/8a4ff6d3e6a73a76952bb1fc2d3a599de9d94594.json b/cedar-integration-tests/corpus_tests/8a4ff6d3e6a73a76952bb1fc2d3a599de9d94594.json
index 03d2beb81..038ef06db 100644
--- a/cedar-integration-tests/corpus_tests/8a4ff6d3e6a73a76952bb1fc2d3a599de9d94594.json
+++ b/cedar-integration-tests/corpus_tests/8a4ff6d3e6a73a76952bb1fc2d3a599de9d94594.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +81,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\" \\0\\0\"",
-      "action": "Action::\"j\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": " \u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "j"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +103,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +118,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8a64bf3f47fc1c97d27efe16e9cf12d469ab65e3.json b/cedar-integration-tests/corpus_tests/8a64bf3f47fc1c97d27efe16e9cf12d469ab65e3.json
index ae6cb10f0..61c9df510 100644
--- a/cedar-integration-tests/corpus_tests/8a64bf3f47fc1c97d27efe16e9cf12d469ab65e3.json
+++ b/cedar-integration-tests/corpus_tests/8a64bf3f47fc1c97d27efe16e9cf12d469ab65e3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8a7f968982f6d5392e68021134740c39e0c45396.json b/cedar-integration-tests/corpus_tests/8a7f968982f6d5392e68021134740c39e0c45396.json
index 9127445ff..3d94f3124 100644
--- a/cedar-integration-tests/corpus_tests/8a7f968982f6d5392e68021134740c39e0c45396.json
+++ b/cedar-integration-tests/corpus_tests/8a7f968982f6d5392e68021134740c39e0c45396.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8a8125be5758ac323d48e23f26efec75cceae6b8.json b/cedar-integration-tests/corpus_tests/8a8125be5758ac323d48e23f26efec75cceae6b8.json
index b9e3e4125..54ff34eee 100644
--- a/cedar-integration-tests/corpus_tests/8a8125be5758ac323d48e23f26efec75cceae6b8.json
+++ b/cedar-integration-tests/corpus_tests/8a8125be5758ac323d48e23f26efec75cceae6b8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"7356322h\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "7356322h\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8aa4ebd47d7917bd7bbff21387a19e83c2c66c79.json b/cedar-integration-tests/corpus_tests/8aa4ebd47d7917bd7bbff21387a19e83c2c66c79.json
index 27e14c4bf..c1d2c489a 100644
--- a/cedar-integration-tests/corpus_tests/8aa4ebd47d7917bd7bbff21387a19e83c2c66c79.json
+++ b/cedar-integration-tests/corpus_tests/8aa4ebd47d7917bd7bbff21387a19e83c2c66c79.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"zzzzzzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"zzzzzzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"zzzzzzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"zzzzzzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"zzzzzzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"zzzzzzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"zzzzzzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"zzzzzzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8ab854fd364fa6b25df281d285211edf8e88b60c.json b/cedar-integration-tests/corpus_tests/8ab854fd364fa6b25df281d285211edf8e88b60c.json
index d581b9f5f..c5a8fd9c2 100644
--- a/cedar-integration-tests/corpus_tests/8ab854fd364fa6b25df281d285211edf8e88b60c.json
+++ b/cedar-integration-tests/corpus_tests/8ab854fd364fa6b25df281d285211edf8e88b60c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\'%\\'\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "'%'"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\'%\\'\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "'%'"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\'%\\'\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\'%\\'\"",
+      "principal": {
+        "type": "a",
+        "id": "'%'"
+      },
+      "resource": {
+        "type": "a",
+        "id": "'%'"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\'%\\'\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\'%\\'\"",
+      "principal": {
+        "type": "a",
+        "id": "'%'"
+      },
+      "resource": {
+        "type": "a",
+        "id": "'%'"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\'%\\'\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\'%\\'\"",
+      "principal": {
+        "type": "a",
+        "id": "'%'"
+      },
+      "resource": {
+        "type": "a",
+        "id": "'%'"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\'%\\'\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\'%\\'\"",
+      "principal": {
+        "type": "a",
+        "id": "'%'"
+      },
+      "resource": {
+        "type": "a",
+        "id": "'%'"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\'%\\'\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\'%\\'\"",
+      "principal": {
+        "type": "a",
+        "id": "'%'"
+      },
+      "resource": {
+        "type": "a",
+        "id": "'%'"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\'%\\'\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\'%\\'\"",
+      "principal": {
+        "type": "a",
+        "id": "'%'"
+      },
+      "resource": {
+        "type": "a",
+        "id": "'%'"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8ae73555cca905ef154d5b974b2882911b10c013.json b/cedar-integration-tests/corpus_tests/8ae73555cca905ef154d5b974b2882911b10c013.json
index f148bbd24..d3771ac52 100644
--- a/cedar-integration-tests/corpus_tests/8ae73555cca905ef154d5b974b2882911b10c013.json
+++ b/cedar-integration-tests/corpus_tests/8ae73555cca905ef154d5b974b2882911b10c013.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8ae9da22bf3e14fc5beacba0ca1d505943eb5282.json b/cedar-integration-tests/corpus_tests/8ae9da22bf3e14fc5beacba0ca1d505943eb5282.json
index d2b10662b..1601121f5 100644
--- a/cedar-integration-tests/corpus_tests/8ae9da22bf3e14fc5beacba0ca1d505943eb5282.json
+++ b/cedar-integration-tests/corpus_tests/8ae9da22bf3e14fc5beacba0ca1d505943eb5282.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/8b020ba7898af3bc24d8367ad128ab0fa1f2459b.json b/cedar-integration-tests/corpus_tests/8b020ba7898af3bc24d8367ad128ab0fa1f2459b.json
index 3877dd57b..777bf5c88 100644
--- a/cedar-integration-tests/corpus_tests/8b020ba7898af3bc24d8367ad128ab0fa1f2459b.json
+++ b/cedar-integration-tests/corpus_tests/8b020ba7898af3bc24d8367ad128ab0fa1f2459b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0F\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0F\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0F\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0F\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0F\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0F\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0F\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0F\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000F"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8b215be721bd036c5218e7540fc43a8b339e1254.json b/cedar-integration-tests/corpus_tests/8b215be721bd036c5218e7540fc43a8b339e1254.json
index ca3a7914b..1b6f1fdc5 100644
--- a/cedar-integration-tests/corpus_tests/8b215be721bd036c5218e7540fc43a8b339e1254.json
+++ b/cedar-integration-tests/corpus_tests/8b215be721bd036c5218e7540fc43a8b339e1254.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/8b4d407be8a95d636f719051caba1509fa2828f4.json b/cedar-integration-tests/corpus_tests/8b4d407be8a95d636f719051caba1509fa2828f4.json
index bac8fb15f..58ce8b9ba 100644
--- a/cedar-integration-tests/corpus_tests/8b4d407be8a95d636f719051caba1509fa2828f4.json
+++ b/cedar-integration-tests/corpus_tests/8b4d407be8a95d636f719051caba1509fa2828f4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\01\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\01\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\01\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\01\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\01\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\01\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\01\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\01\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\01\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\01\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\01\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\01\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\01\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\01\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\01\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\01\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8b6ca5e1fd6e3a0e977cddc8421b6566261e8147.json b/cedar-integration-tests/corpus_tests/8b6ca5e1fd6e3a0e977cddc8421b6566261e8147.json
index 4d7da447b..c4d8b4df1 100644
--- a/cedar-integration-tests/corpus_tests/8b6ca5e1fd6e3a0e977cddc8421b6566261e8147.json
+++ b/cedar-integration-tests/corpus_tests/8b6ca5e1fd6e3a0e977cddc8421b6566261e8147.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "nww_ww00000::a::\"\"",
-      "action": "nww_ww00000::Action::\"action\"",
-      "resource": "nww_ww00000::a::\"\"",
+      "principal": {
+        "type": "nww_ww00000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "nww_ww00000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "nww_ww00000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "nww_ww00000::a::\"\"",
-      "action": "nww_ww00000::Action::\"action\"",
-      "resource": "nww_ww00000::a::\"\"",
+      "principal": {
+        "type": "nww_ww00000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "nww_ww00000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "nww_ww00000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "nww_ww00000::a::\"\"",
-      "action": "nww_ww00000::Action::\"action\"",
-      "resource": "nww_ww00000::a::\"\"",
+      "principal": {
+        "type": "nww_ww00000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "nww_ww00000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "nww_ww00000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "nww_ww00000::a::\"\"",
-      "action": "nww_ww00000::Action::\"action\"",
-      "resource": "nww_ww00000::a::\"\"",
+      "principal": {
+        "type": "nww_ww00000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "nww_ww00000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "nww_ww00000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "nww_ww00000::a::\"\"",
-      "action": "nww_ww00000::Action::\"action\"",
-      "resource": "nww_ww00000::a::\"\"",
+      "principal": {
+        "type": "nww_ww00000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "nww_ww00000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "nww_ww00000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "nww_ww00000::a::\"\"",
-      "action": "nww_ww00000::Action::\"action\"",
-      "resource": "nww_ww00000::a::\"\"",
+      "principal": {
+        "type": "nww_ww00000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "nww_ww00000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "nww_ww00000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "nww_ww00000::a::\"\"",
-      "action": "nww_ww00000::Action::\"action\"",
-      "resource": "nww_ww00000::a::\"\"",
+      "principal": {
+        "type": "nww_ww00000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "nww_ww00000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "nww_ww00000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "nww_ww00000::a::\"\"",
-      "action": "nww_ww00000::Action::\"action\"",
-      "resource": "nww_ww00000::a::\"\"",
+      "principal": {
+        "type": "nww_ww00000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "nww_ww00000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "nww_ww00000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/8ba8fb47f07ac9b58b2763b1020e5a2e2e4acf79.json b/cedar-integration-tests/corpus_tests/8ba8fb47f07ac9b58b2763b1020e5a2e2e4acf79.json
index bc49de90d..09214d643 100644
--- a/cedar-integration-tests/corpus_tests/8ba8fb47f07ac9b58b2763b1020e5a2e2e4acf79.json
+++ b/cedar-integration-tests/corpus_tests/8ba8fb47f07ac9b58b2763b1020e5a2e2e4acf79.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "s::a::\"\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "s::a::\"\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "s::a::\"\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": ""
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "s::a::\"\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\"",
+      "principal": {
+        "type": "s::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "s::a",
+        "id": ""
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "s::a::\"\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\"",
+      "principal": {
+        "type": "s::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "s::a",
+        "id": ""
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "s::a::\"\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\"",
+      "principal": {
+        "type": "s::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "s::a",
+        "id": ""
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "s::a::\"\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\"",
+      "principal": {
+        "type": "s::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "s::a",
+        "id": ""
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "s::a::\"\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\"",
+      "principal": {
+        "type": "s::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "s::a",
+        "id": ""
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8c36035fd556368746cadc0f161f7b650cca9cd6.json b/cedar-integration-tests/corpus_tests/8c36035fd556368746cadc0f161f7b650cca9cd6.json
index 399bedc61..f76f82466 100644
--- a/cedar-integration-tests/corpus_tests/8c36035fd556368746cadc0f161f7b650cca9cd6.json
+++ b/cedar-integration-tests/corpus_tests/8c36035fd556368746cadc0f161f7b650cca9cd6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/8c3f6fc9d56cfe86b9834fcb950ceaea54a1aa18.json b/cedar-integration-tests/corpus_tests/8c3f6fc9d56cfe86b9834fcb950ceaea54a1aa18.json
index c9e4aa5c9..6c3439b7e 100644
--- a/cedar-integration-tests/corpus_tests/8c3f6fc9d56cfe86b9834fcb950ceaea54a1aa18.json
+++ b/cedar-integration-tests/corpus_tests/8c3f6fc9d56cfe86b9834fcb950ceaea54a1aa18.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\":\"",
-      "action": "Action::\":\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": ":"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":\"",
-      "action": "Action::\":\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": ":"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\":\"",
-      "action": "Action::\":\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": ":"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\":\"",
-      "action": "Action::\":\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": ":"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\":\"",
-      "action": "Action::\":\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": ":"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\":\"",
-      "action": "Action::\":\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": ":"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\":\"",
-      "action": "Action::\":\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": ":"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\":\"",
-      "action": "Action::\":\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": ":"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/8cbb4935a849167455195de3b9d6cababc61c05b.json b/cedar-integration-tests/corpus_tests/8cbb4935a849167455195de3b9d6cababc61c05b.json
index 485f374a6..162c168b7 100644
--- a/cedar-integration-tests/corpus_tests/8cbb4935a849167455195de3b9d6cababc61c05b.json
+++ b/cedar-integration-tests/corpus_tests/8cbb4935a849167455195de3b9d6cababc61c05b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8cd892c9f8a57554f1fc08c8ede88a9787f873e8.json b/cedar-integration-tests/corpus_tests/8cd892c9f8a57554f1fc08c8ede88a9787f873e8.json
index e1954bacd..8bf71c9e7 100644
--- a/cedar-integration-tests/corpus_tests/8cd892c9f8a57554f1fc08c8ede88a9787f873e8.json
+++ b/cedar-integration-tests/corpus_tests/8cd892c9f8a57554f1fc08c8ede88a9787f873e8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8ce9a85da746c9c606aa228be7b25a7639142db2.json b/cedar-integration-tests/corpus_tests/8ce9a85da746c9c606aa228be7b25a7639142db2.json
index 5f54572f0..deea98741 100644
--- a/cedar-integration-tests/corpus_tests/8ce9a85da746c9c606aa228be7b25a7639142db2.json
+++ b/cedar-integration-tests/corpus_tests/8ce9a85da746c9c606aa228be7b25a7639142db2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"z\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8d00ae5c9a5b26b2af81854b107fc75dfc3be492.json b/cedar-integration-tests/corpus_tests/8d00ae5c9a5b26b2af81854b107fc75dfc3be492.json
index a6b9dfbe2..92cdaec03 100644
--- a/cedar-integration-tests/corpus_tests/8d00ae5c9a5b26b2af81854b107fc75dfc3be492.json
+++ b/cedar-integration-tests/corpus_tests/8d00ae5c9a5b26b2af81854b107fc75dfc3be492.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "g": "",
         "AA000000": ""
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "g": "",
         "AA000000": ""
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "g": "",
         "AA000000": ""
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "g": "",
         "AA000000": ""
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "g": "",
         "AA000000": ""
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "g": "",
         "AA000000": ""
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "g": "",
         "AA000000": ""
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "g": "",
         "AA000000": ""
diff --git a/cedar-integration-tests/corpus_tests/8d048b9fcca970f83aaf76afb16a4c7ba2afa0e8.json b/cedar-integration-tests/corpus_tests/8d048b9fcca970f83aaf76afb16a4c7ba2afa0e8.json
index 3cad7782a..448d98ae8 100644
--- a/cedar-integration-tests/corpus_tests/8d048b9fcca970f83aaf76afb16a4c7ba2afa0e8.json
+++ b/cedar-integration-tests/corpus_tests/8d048b9fcca970f83aaf76afb16a4c7ba2afa0e8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "nww_ww000001::a::\"fff\"",
-      "action": "nww_ww000001::Action::\"action\"",
-      "resource": "nww_ww000001::a::\"fff\"",
+      "principal": {
+        "type": "nww_ww000001::a",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "nww_ww000001::a",
+        "id": "fff"
+      },
+      "action": {
+        "type": "nww_ww000001::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "nww_ww000001::a::\"fff\"",
-      "action": "nww_ww000001::Action::\"action\"",
-      "resource": "nww_ww000001::a::\"fff\"",
+      "principal": {
+        "type": "nww_ww000001::a",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "nww_ww000001::a",
+        "id": "fff"
+      },
+      "action": {
+        "type": "nww_ww000001::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "nww_ww000001::a::\"fff\"",
-      "action": "nww_ww000001::Action::\"action\"",
-      "resource": "nww_ww000001::a::\"fff\"",
+      "principal": {
+        "type": "nww_ww000001::a",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "nww_ww000001::a",
+        "id": "fff"
+      },
+      "action": {
+        "type": "nww_ww000001::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "nww_ww000001::a::\"fff\"",
-      "action": "nww_ww000001::Action::\"action\"",
-      "resource": "nww_ww000001::a::\"fff\"",
+      "principal": {
+        "type": "nww_ww000001::a",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "nww_ww000001::a",
+        "id": "fff"
+      },
+      "action": {
+        "type": "nww_ww000001::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "nww_ww000001::a::\"fff\"",
-      "action": "nww_ww000001::Action::\"action\"",
-      "resource": "nww_ww000001::a::\"fff\"",
+      "principal": {
+        "type": "nww_ww000001::a",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "nww_ww000001::a",
+        "id": "fff"
+      },
+      "action": {
+        "type": "nww_ww000001::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "nww_ww000001::a::\"fff\"",
-      "action": "nww_ww000001::Action::\"action\"",
-      "resource": "nww_ww000001::a::\"fff\"",
+      "principal": {
+        "type": "nww_ww000001::a",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "nww_ww000001::a",
+        "id": "fff"
+      },
+      "action": {
+        "type": "nww_ww000001::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "nww_ww000001::a::\"fff\"",
-      "action": "nww_ww000001::Action::\"action\"",
-      "resource": "nww_ww000001::a::\"fff\"",
+      "principal": {
+        "type": "nww_ww000001::a",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "nww_ww000001::a",
+        "id": "fff"
+      },
+      "action": {
+        "type": "nww_ww000001::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "nww_ww000001::a::\"fff\"",
-      "action": "nww_ww000001::Action::\"action\"",
-      "resource": "nww_ww000001::a::\"fff\"",
+      "principal": {
+        "type": "nww_ww000001::a",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "nww_ww000001::a",
+        "id": "fff"
+      },
+      "action": {
+        "type": "nww_ww000001::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8d633bca2c9c6d3ba3b0094c47a6e64372d84f59.json b/cedar-integration-tests/corpus_tests/8d633bca2c9c6d3ba3b0094c47a6e64372d84f59.json
index e1865872d..da7597b9a 100644
--- a/cedar-integration-tests/corpus_tests/8d633bca2c9c6d3ba3b0094c47a6e64372d84f59.json
+++ b/cedar-integration-tests/corpus_tests/8d633bca2c9c6d3ba3b0094c47a6e64372d84f59.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/8da9cb550ff0ef7473d1b148e9b7e8ee88f5908c.json b/cedar-integration-tests/corpus_tests/8da9cb550ff0ef7473d1b148e9b7e8ee88f5908c.json
index 84d0d3016..cec08b90c 100644
--- a/cedar-integration-tests/corpus_tests/8da9cb550ff0ef7473d1b148e9b7e8ee88f5908c.json
+++ b/cedar-integration-tests/corpus_tests/8da9cb550ff0ef7473d1b148e9b7e8ee88f5908c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sJRd3": 0,
         "r": {
@@ -26,9 +35,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sJRd3": 0,
         "r": {
@@ -46,9 +64,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sJRd3": 0,
         "r": {
@@ -66,9 +93,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sJRd3": 0,
         "r": {
@@ -86,9 +122,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sJRd3": 0,
         "r": {
@@ -106,9 +151,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sJRd3": 0,
         "r": {
@@ -126,9 +180,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sJRd3": 0,
         "r": {
@@ -146,9 +209,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sJRd3": 0,
         "r": {
diff --git a/cedar-integration-tests/corpus_tests/8dbbe63b2dfe8b0977f20105145fe5112b23aebf.json b/cedar-integration-tests/corpus_tests/8dbbe63b2dfe8b0977f20105145fe5112b23aebf.json
index b8b9eba2e..80bf2ab83 100644
--- a/cedar-integration-tests/corpus_tests/8dbbe63b2dfe8b0977f20105145fe5112b23aebf.json
+++ b/cedar-integration-tests/corpus_tests/8dbbe63b2dfe8b0977f20105145fe5112b23aebf.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}:\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -84,9 +147,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/8dcfa6e09d836dedaeb71e79585d2bf8e3ef8bcc.json b/cedar-integration-tests/corpus_tests/8dcfa6e09d836dedaeb71e79585d2bf8e3ef8bcc.json
index 97fbf84b2..1141b0491 100644
--- a/cedar-integration-tests/corpus_tests/8dcfa6e09d836dedaeb71e79585d2bf8e3ef8bcc.json
+++ b/cedar-integration-tests/corpus_tests/8dcfa6e09d836dedaeb71e79585d2bf8e3ef8bcc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/8e047f9870ea3a64bd67bc0ade488897d116a315.json b/cedar-integration-tests/corpus_tests/8e047f9870ea3a64bd67bc0ade488897d116a315.json
index 395961fd9..f9c8ed8f9 100644
--- a/cedar-integration-tests/corpus_tests/8e047f9870ea3a64bd67bc0ade488897d116a315.json
+++ b/cedar-integration-tests/corpus_tests/8e047f9870ea3a64bd67bc0ade488897d116a315.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{c}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8e63062b22cd9bcbfc3bcf31aefa150b54094b76.json b/cedar-integration-tests/corpus_tests/8e63062b22cd9bcbfc3bcf31aefa150b54094b76.json
index 57502f64c..44b4d12b2 100644
--- a/cedar-integration-tests/corpus_tests/8e63062b22cd9bcbfc3bcf31aefa150b54094b76.json
+++ b/cedar-integration-tests/corpus_tests/8e63062b22cd9bcbfc3bcf31aefa150b54094b76.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A97w::a::\"#:::\"",
-      "action": "A97w::Action::\"action\"",
-      "resource": "A97w::a::\"#:::\"",
+      "principal": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "resource": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "action": {
+        "type": "A97w::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A97w::a::\"#:::\"",
-      "action": "A97w::Action::\"action\"",
-      "resource": "A97w::a::\"#:::\"",
+      "principal": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "resource": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "action": {
+        "type": "A97w::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A97w::a::\"#:::\"",
-      "action": "A97w::Action::\"action\"",
-      "resource": "A97w::a::\"#:::\"",
+      "principal": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "resource": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "action": {
+        "type": "A97w::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A97w::a::\"#:::\"",
-      "action": "A97w::Action::\"action\"",
-      "resource": "A97w::a::\"#:::\"",
+      "principal": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "resource": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "action": {
+        "type": "A97w::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A97w::a::\"#:::\"",
-      "action": "A97w::Action::\"action\"",
-      "resource": "A97w::a::\"#:::\"",
+      "principal": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "resource": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "action": {
+        "type": "A97w::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A97w::a::\"#:::\"",
-      "action": "A97w::Action::\"action\"",
-      "resource": "A97w::a::\"#:::\"",
+      "principal": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "resource": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "action": {
+        "type": "A97w::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A97w::a::\"#:::\"",
-      "action": "A97w::Action::\"action\"",
-      "resource": "A97w::a::\"#:::\"",
+      "principal": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "resource": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "action": {
+        "type": "A97w::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A97w::a::\"#:::\"",
-      "action": "A97w::Action::\"action\"",
-      "resource": "A97w::a::\"#:::\"",
+      "principal": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "resource": {
+        "type": "A97w::a",
+        "id": "#:::"
+      },
+      "action": {
+        "type": "A97w::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8e9680ad7a0e2e82660c1615cb612d4330afcfc5.json b/cedar-integration-tests/corpus_tests/8e9680ad7a0e2e82660c1615cb612d4330afcfc5.json
index 93214c1eb..246afd4d7 100644
--- a/cedar-integration-tests/corpus_tests/8e9680ad7a0e2e82660c1615cb612d4330afcfc5.json
+++ b/cedar-integration-tests/corpus_tests/8e9680ad7a0e2e82660c1615cb612d4330afcfc5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -84,9 +147,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8ebe34f00d35e2e63a43eb79a561f416a9299039.json b/cedar-integration-tests/corpus_tests/8ebe34f00d35e2e63a43eb79a561f416a9299039.json
index 9021cedca..bad3ae7b7 100644
--- a/cedar-integration-tests/corpus_tests/8ebe34f00d35e2e63a43eb79a561f416a9299039.json
+++ b/cedar-integration-tests/corpus_tests/8ebe34f00d35e2e63a43eb79a561f416a9299039.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "VhhhhhhkkkkiJ00ki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "VhhhhhhkkkkiJ00ki",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "VhhhhhhkkkkiJ00ki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "VhhhhhhkkkkiJ00ki",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "VhhhhhhkkkkiJ00ki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "VhhhhhhkkkkiJ00ki",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "VhhhhhhkkkkiJ00ki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "VhhhhhhkkkkiJ00ki",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "VhhhhhhkkkkiJ00ki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "VhhhhhhkkkkiJ00ki",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "VhhhhhhkkkkiJ00ki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "VhhhhhhkkkkiJ00ki",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "VhhhhhhkkkkiJ00ki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "VhhhhhhkkkkiJ00ki",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "VhhhhhhkkkkiJ00ki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "VhhhhhhkkkkiJ00ki",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/8f1815ad76c410ffe775dd9f418c45a13df5d3ee.json b/cedar-integration-tests/corpus_tests/8f1815ad76c410ffe775dd9f418c45a13df5d3ee.json
index f2df88994..8089b7f96 100644
--- a/cedar-integration-tests/corpus_tests/8f1815ad76c410ffe775dd9f418c45a13df5d3ee.json
+++ b/cedar-integration-tests/corpus_tests/8f1815ad76c410ffe775dd9f418c45a13df5d3ee.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::F_w33w33::a::\"\"",
-      "action": "r::F_w33w33::Action::\"action\"",
-      "resource": "r::F_w33w33::a::\"\"",
+      "principal": {
+        "type": "r::F_w33w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::F_w33w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::F_w33w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::F_w33w33::a::\"\"",
-      "action": "r::F_w33w33::Action::\"action\"",
-      "resource": "r::F_w33w33::a::\"\"",
+      "principal": {
+        "type": "r::F_w33w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::F_w33w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::F_w33w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::F_w33w33::a::\"\"",
-      "action": "r::F_w33w33::Action::\"action\"",
-      "resource": "r::F_w33w33::a::\"\"",
+      "principal": {
+        "type": "r::F_w33w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::F_w33w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::F_w33w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::F_w33w33::a::\"\"",
-      "action": "r::F_w33w33::Action::\"action\"",
-      "resource": "r::F_w33w33::a::\"\"",
+      "principal": {
+        "type": "r::F_w33w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::F_w33w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::F_w33w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::F_w33w33::a::\"\"",
-      "action": "r::F_w33w33::Action::\"action\"",
-      "resource": "r::F_w33w33::a::\"\"",
+      "principal": {
+        "type": "r::F_w33w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::F_w33w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::F_w33w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::F_w33w33::a::\"\"",
-      "action": "r::F_w33w33::Action::\"action\"",
-      "resource": "r::F_w33w33::a::\"\"",
+      "principal": {
+        "type": "r::F_w33w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::F_w33w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::F_w33w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::F_w33w33::a::\"\"",
-      "action": "r::F_w33w33::Action::\"action\"",
-      "resource": "r::F_w33w33::a::\"\"",
+      "principal": {
+        "type": "r::F_w33w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::F_w33w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::F_w33w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::F_w33w33::a::\"\"",
-      "action": "r::F_w33w33::Action::\"action\"",
-      "resource": "r::F_w33w33::a::\"\"",
+      "principal": {
+        "type": "r::F_w33w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::F_w33w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::F_w33w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/8f4a8dd71968997861794d08fc5a32d135f848ee.json b/cedar-integration-tests/corpus_tests/8f4a8dd71968997861794d08fc5a32d135f848ee.json
index 67a6bb55c..e6b97bedf 100644
--- a/cedar-integration-tests/corpus_tests/8f4a8dd71968997861794d08fc5a32d135f848ee.json
+++ b/cedar-integration-tests/corpus_tests/8f4a8dd71968997861794d08fc5a32d135f848ee.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"j\\0\\u{8}\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\u{8}\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"j\\0\\u{8}\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\u{8}\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"j\\0\\u{8}\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\u{8}\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"j\\0\\u{8}\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\u{8}\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"j\\0\\u{8}\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\u{8}\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"j\\0\\u{8}\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\u{8}\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"j\\0\\u{8}\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\u{8}\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"j\\0\\u{8}\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\u{8}\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\b\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/8f90c7fe8af50938e13e7bef3d60bf4bc236c773.json b/cedar-integration-tests/corpus_tests/8f90c7fe8af50938e13e7bef3d60bf4bc236c773.json
index 51f8f4b09..919a1b6f5 100644
--- a/cedar-integration-tests/corpus_tests/8f90c7fe8af50938e13e7bef3d60bf4bc236c773.json
+++ b/cedar-integration-tests/corpus_tests/8f90c7fe8af50938e13e7bef3d60bf4bc236c773.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vh": []
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vh": []
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vh": []
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vh": []
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vh": []
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vh": []
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vh": []
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vh": []
       },
diff --git a/cedar-integration-tests/corpus_tests/8fb94680726921adf01d87fcef5aedc39e1ce6b1.json b/cedar-integration-tests/corpus_tests/8fb94680726921adf01d87fcef5aedc39e1ce6b1.json
index be6957c74..57acd6dbb 100644
--- a/cedar-integration-tests/corpus_tests/8fb94680726921adf01d87fcef5aedc39e1ce6b1.json
+++ b/cedar-integration-tests/corpus_tests/8fb94680726921adf01d87fcef5aedc39e1ce6b1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/8fcf6fb356e870b0ab44b3271cc76e30390be46a.json b/cedar-integration-tests/corpus_tests/8fcf6fb356e870b0ab44b3271cc76e30390be46a.json
index 2a541dce6..dbedd34a6 100644
--- a/cedar-integration-tests/corpus_tests/8fcf6fb356e870b0ab44b3271cc76e30390be46a.json
+++ b/cedar-integration-tests/corpus_tests/8fcf6fb356e870b0ab44b3271cc76e30390be46a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\";\"",
-      "action": "Action::\"\"",
-      "resource": "a::\";\"",
+      "principal": {
+        "type": "a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\";\"",
-      "action": "Action::\"\"",
-      "resource": "a::\";\"",
+      "principal": {
+        "type": "a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\";\"",
-      "action": "Action::\"\"",
-      "resource": "a::\";\"",
+      "principal": {
+        "type": "a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\";\"",
-      "action": "Action::\"\"",
-      "resource": "a::\";\"",
+      "principal": {
+        "type": "a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\";\"",
-      "action": "Action::\"\"",
-      "resource": "a::\";\"",
+      "principal": {
+        "type": "a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\";\"",
-      "action": "Action::\"\"",
-      "resource": "a::\";\"",
+      "principal": {
+        "type": "a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\";\"",
-      "action": "Action::\"\"",
-      "resource": "a::\";\"",
+      "principal": {
+        "type": "a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/8ffcf975e110df56490cb26f61917213f63d0936.json b/cedar-integration-tests/corpus_tests/8ffcf975e110df56490cb26f61917213f63d0936.json
index e4f4da842..b63ea0840 100644
--- a/cedar-integration-tests/corpus_tests/8ffcf975e110df56490cb26f61917213f63d0936.json
+++ b/cedar-integration-tests/corpus_tests/8ffcf975e110df56490cb26f61917213f63d0936.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r\\0\\0\\0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "r\u0000\u0000\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"r\\0\\0\\0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r\\0\\0\\0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "r\u0000\u0000\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r\u0000\u0000\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"r\\0\\0\\0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r\\0\\0\\0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "r\u0000\u0000\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r\u0000\u0000\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"r\\0\\0\\0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r\\0\\0\\0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "r\u0000\u0000\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r\u0000\u0000\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"r\\0\\0\\0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r\\0\\0\\0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "r\u0000\u0000\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r\u0000\u0000\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"r\\0\\0\\0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r\\0\\0\\0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "r\u0000\u0000\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r\u0000\u0000\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"r\\0\\0\\0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r\\0\\0\\0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "r\u0000\u0000\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r\u0000\u0000\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"r\\0\\0\\0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r\\0\\0\\0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "r\u0000\u0000\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r\u0000\u0000\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/901a02b422d65d6962af1bed755f5590ba94563b.json b/cedar-integration-tests/corpus_tests/901a02b422d65d6962af1bed755f5590ba94563b.json
index e1a8d55ae..68de64276 100644
--- a/cedar-integration-tests/corpus_tests/901a02b422d65d6962af1bed755f5590ba94563b.json
+++ b/cedar-integration-tests/corpus_tests/901a02b422d65d6962af1bed755f5590ba94563b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "K::a::\"\\0j\\0\\u{8}\"",
-      "action": "K::Action::\"action\"",
-      "resource": "K::a::\"\\0\"",
+      "principal": {
+        "type": "K::a",
+        "id": "\u0000j\u0000\b"
+      },
+      "resource": {
+        "type": "K::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "K::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "K::a::\"\\0\"",
-      "action": "K::Action::\"action\"",
-      "resource": "K::a::\"\\0\"",
+      "principal": {
+        "type": "K::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "K::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "K::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "K::a::\"\\0j\\0\\u{8}\"",
-      "action": "K::Action::\"action\"",
-      "resource": "K::a::\"\\0j\\0\\u{8}\"",
+      "principal": {
+        "type": "K::a",
+        "id": "\u0000j\u0000\b"
+      },
+      "resource": {
+        "type": "K::a",
+        "id": "\u0000j\u0000\b"
+      },
+      "action": {
+        "type": "K::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "K::a::\"\\0j\\0\\u{8}\"",
-      "action": "K::Action::\"action\"",
-      "resource": "K::a::\"\\0j\\0\\u{8}\"",
+      "principal": {
+        "type": "K::a",
+        "id": "\u0000j\u0000\b"
+      },
+      "resource": {
+        "type": "K::a",
+        "id": "\u0000j\u0000\b"
+      },
+      "action": {
+        "type": "K::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "K::a::\"\\0j\\0\\u{8}\"",
-      "action": "K::Action::\"action\"",
-      "resource": "K::a::\"\\0j\\0\\u{8}\"",
+      "principal": {
+        "type": "K::a",
+        "id": "\u0000j\u0000\b"
+      },
+      "resource": {
+        "type": "K::a",
+        "id": "\u0000j\u0000\b"
+      },
+      "action": {
+        "type": "K::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "K::a::\"\\0j\\0\\u{8}\"",
-      "action": "K::Action::\"action\"",
-      "resource": "K::a::\"\\0j\\0\\u{8}\"",
+      "principal": {
+        "type": "K::a",
+        "id": "\u0000j\u0000\b"
+      },
+      "resource": {
+        "type": "K::a",
+        "id": "\u0000j\u0000\b"
+      },
+      "action": {
+        "type": "K::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "K::a::\"\\0j\\0\\u{8}\"",
-      "action": "K::Action::\"action\"",
-      "resource": "K::a::\"\\0j\\0\\u{8}\"",
+      "principal": {
+        "type": "K::a",
+        "id": "\u0000j\u0000\b"
+      },
+      "resource": {
+        "type": "K::a",
+        "id": "\u0000j\u0000\b"
+      },
+      "action": {
+        "type": "K::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "K::a::\"\\0j\\0\\u{8}\"",
-      "action": "K::Action::\"action\"",
-      "resource": "K::a::\"\\0j\\0\\u{8}\"",
+      "principal": {
+        "type": "K::a",
+        "id": "\u0000j\u0000\b"
+      },
+      "resource": {
+        "type": "K::a",
+        "id": "\u0000j\u0000\b"
+      },
+      "action": {
+        "type": "K::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/906b5630c98aa1977ad6c2c490ef730b09ac1599.json b/cedar-integration-tests/corpus_tests/906b5630c98aa1977ad6c2c490ef730b09ac1599.json
index cd488421b..4b3c2275c 100644
--- a/cedar-integration-tests/corpus_tests/906b5630c98aa1977ad6c2c490ef730b09ac1599.json
+++ b/cedar-integration-tests/corpus_tests/906b5630c98aa1977ad6c2c490ef730b09ac1599.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/90ab10b8ca5fd556344310903fb0c83483339255.json b/cedar-integration-tests/corpus_tests/90ab10b8ca5fd556344310903fb0c83483339255.json
index 0bd741e6e..d5c27a910 100644
--- a/cedar-integration-tests/corpus_tests/90ab10b8ca5fd556344310903fb0c83483339255.json
+++ b/cedar-integration-tests/corpus_tests/90ab10b8ca5fd556344310903fb0c83483339255.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "F_wwwwww::\"ml\"",
-      "action": "Action::\"action\"",
-      "resource": "F_wwwwww::\"ml\"",
+      "principal": {
+        "type": "F_wwwwww",
+        "id": "ml"
+      },
+      "resource": {
+        "type": "F_wwwwww",
+        "id": "ml"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "F_wwwwww::\"ml\"",
-      "action": "Action::\"action\"",
-      "resource": "F_wwwwww::\"ml\"",
+      "principal": {
+        "type": "F_wwwwww",
+        "id": "ml"
+      },
+      "resource": {
+        "type": "F_wwwwww",
+        "id": "ml"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "F_wwwwww::\"ml\"",
-      "action": "Action::\"action\"",
-      "resource": "F_wwwwww::\"ml\"",
+      "principal": {
+        "type": "F_wwwwww",
+        "id": "ml"
+      },
+      "resource": {
+        "type": "F_wwwwww",
+        "id": "ml"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "F_wwwwww::\"ml\"",
-      "action": "Action::\"action\"",
-      "resource": "F_wwwwww::\"ml\"",
+      "principal": {
+        "type": "F_wwwwww",
+        "id": "ml"
+      },
+      "resource": {
+        "type": "F_wwwwww",
+        "id": "ml"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "F_wwwwww::\"ml\"",
-      "action": "Action::\"action\"",
-      "resource": "F_wwwwww::\"ml\"",
+      "principal": {
+        "type": "F_wwwwww",
+        "id": "ml"
+      },
+      "resource": {
+        "type": "F_wwwwww",
+        "id": "ml"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "F_wwwwww::\"ml\"",
-      "action": "Action::\"action\"",
-      "resource": "F_wwwwww::\"ml\"",
+      "principal": {
+        "type": "F_wwwwww",
+        "id": "ml"
+      },
+      "resource": {
+        "type": "F_wwwwww",
+        "id": "ml"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "F_wwwwww::\"ml\"",
-      "action": "Action::\"action\"",
-      "resource": "F_wwwwww::\"ml\"",
+      "principal": {
+        "type": "F_wwwwww",
+        "id": "ml"
+      },
+      "resource": {
+        "type": "F_wwwwww",
+        "id": "ml"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "F_wwwwww::\"ml\"",
-      "action": "Action::\"action\"",
-      "resource": "F_wwwwww::\"ml\"",
+      "principal": {
+        "type": "F_wwwwww",
+        "id": "ml"
+      },
+      "resource": {
+        "type": "F_wwwwww",
+        "id": "ml"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/90c47ecf52ca72be7bfb43c495de2616baf18731.json b/cedar-integration-tests/corpus_tests/90c47ecf52ca72be7bfb43c495de2616baf18731.json
index a1be67c7f..408cddc35 100644
--- a/cedar-integration-tests/corpus_tests/90c47ecf52ca72be7bfb43c495de2616baf18731.json
+++ b/cedar-integration-tests/corpus_tests/90c47ecf52ca72be7bfb43c495de2616baf18731.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/90f95922eb26aa4ff33a704449c5dca95cc9d0e8.json b/cedar-integration-tests/corpus_tests/90f95922eb26aa4ff33a704449c5dca95cc9d0e8.json
index a3d7ed132..bb52b31e1 100644
--- a/cedar-integration-tests/corpus_tests/90f95922eb26aa4ff33a704449c5dca95cc9d0e8.json
+++ b/cedar-integration-tests/corpus_tests/90f95922eb26aa4ff33a704449c5dca95cc9d0e8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/9121208cfdb1a32bc3faea9856ccdee0de923e7f.json b/cedar-integration-tests/corpus_tests/9121208cfdb1a32bc3faea9856ccdee0de923e7f.json
index 5b32094c2..c1254be4c 100644
--- a/cedar-integration-tests/corpus_tests/9121208cfdb1a32bc3faea9856ccdee0de923e7f.json
+++ b/cedar-integration-tests/corpus_tests/9121208cfdb1a32bc3faea9856ccdee0de923e7f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9157df8f4e7f9ad3421b8f5d6fd2e57babee7043.json b/cedar-integration-tests/corpus_tests/9157df8f4e7f9ad3421b8f5d6fd2e57babee7043.json
index 018fdd207..17ca79081 100644
--- a/cedar-integration-tests/corpus_tests/9157df8f4e7f9ad3421b8f5d6fd2e57babee7043.json
+++ b/cedar-integration-tests/corpus_tests/9157df8f4e7f9ad3421b8f5d6fd2e57babee7043.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0&\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0&\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0&\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0&\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0&\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0&\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9187dae0065e5a38cf03ed93e366f8e7de0f9393.json b/cedar-integration-tests/corpus_tests/9187dae0065e5a38cf03ed93e366f8e7de0f9393.json
index ef915ac6e..92d309dc2 100644
--- a/cedar-integration-tests/corpus_tests/9187dae0065e5a38cf03ed93e366f8e7de0f9393.json
+++ b/cedar-integration-tests/corpus_tests/9187dae0065e5a38cf03ed93e366f8e7de0f9393.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Khhhhhf::\"$\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhhhhf::\"$\"",
+      "principal": {
+        "type": "Khhhhhf",
+        "id": "$"
+      },
+      "resource": {
+        "type": "Khhhhhf",
+        "id": "$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Khhhhhf::\"$\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhhhhf::\"$\"",
+      "principal": {
+        "type": "Khhhhhf",
+        "id": "$"
+      },
+      "resource": {
+        "type": "Khhhhhf",
+        "id": "$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Khhhhhf::\"$\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhhhhf::\"$\"",
+      "principal": {
+        "type": "Khhhhhf",
+        "id": "$"
+      },
+      "resource": {
+        "type": "Khhhhhf",
+        "id": "$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Khhhhhf::\"$\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhhhhf::\"$\"",
+      "principal": {
+        "type": "Khhhhhf",
+        "id": "$"
+      },
+      "resource": {
+        "type": "Khhhhhf",
+        "id": "$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Khhhhhf::\"$\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhhhhf::\"$\"",
+      "principal": {
+        "type": "Khhhhhf",
+        "id": "$"
+      },
+      "resource": {
+        "type": "Khhhhhf",
+        "id": "$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Khhhhhf::\"$\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhhhhf::\"$\"",
+      "principal": {
+        "type": "Khhhhhf",
+        "id": "$"
+      },
+      "resource": {
+        "type": "Khhhhhf",
+        "id": "$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Khhhhhf::\"$\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhhhhf::\"$\"",
+      "principal": {
+        "type": "Khhhhhf",
+        "id": "$"
+      },
+      "resource": {
+        "type": "Khhhhhf",
+        "id": "$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Khhhhhf::\"$\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhhhhf::\"$\"",
+      "principal": {
+        "type": "Khhhhhf",
+        "id": "$"
+      },
+      "resource": {
+        "type": "Khhhhhf",
+        "id": "$"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9191cdaa82bc60fc9960379614d5fa0d5da113f2.json b/cedar-integration-tests/corpus_tests/9191cdaa82bc60fc9960379614d5fa0d5da113f2.json
index e753f789f..7156f0470 100644
--- a/cedar-integration-tests/corpus_tests/9191cdaa82bc60fc9960379614d5fa0d5da113f2.json
+++ b/cedar-integration-tests/corpus_tests/9191cdaa82bc60fc9960379614d5fa0d5da113f2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::G::\"::::\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::G::\"::::\"",
+      "principal": {
+        "type": "r::r::G",
+        "id": "::::"
+      },
+      "resource": {
+        "type": "r::r::G",
+        "id": "::::"
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::G::\"::::\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::G::\"::::\"",
+      "principal": {
+        "type": "r::r::G",
+        "id": "::::"
+      },
+      "resource": {
+        "type": "r::r::G",
+        "id": "::::"
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::G::\"::::\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::G::\"::::\"",
+      "principal": {
+        "type": "r::r::G",
+        "id": "::::"
+      },
+      "resource": {
+        "type": "r::r::G",
+        "id": "::::"
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::G::\"::::\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::G::\"::::\"",
+      "principal": {
+        "type": "r::r::G",
+        "id": "::::"
+      },
+      "resource": {
+        "type": "r::r::G",
+        "id": "::::"
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::G::\"::::\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::G::\"::::\"",
+      "principal": {
+        "type": "r::r::G",
+        "id": "::::"
+      },
+      "resource": {
+        "type": "r::r::G",
+        "id": "::::"
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::G::\"::::\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::G::\"::::\"",
+      "principal": {
+        "type": "r::r::G",
+        "id": "::::"
+      },
+      "resource": {
+        "type": "r::r::G",
+        "id": "::::"
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::G::\"::::\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::G::\"::::\"",
+      "principal": {
+        "type": "r::r::G",
+        "id": "::::"
+      },
+      "resource": {
+        "type": "r::r::G",
+        "id": "::::"
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::G::\"::::\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::G::\"::::\"",
+      "principal": {
+        "type": "r::r::G",
+        "id": "::::"
+      },
+      "resource": {
+        "type": "r::r::G",
+        "id": "::::"
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/91adf03cbe884e8fa30d82feb500d576e6488fcb.json b/cedar-integration-tests/corpus_tests/91adf03cbe884e8fa30d82feb500d576e6488fcb.json
index 47a5acf6d..5c6c6647c 100644
--- a/cedar-integration-tests/corpus_tests/91adf03cbe884e8fa30d82feb500d576e6488fcb.json
+++ b/cedar-integration-tests/corpus_tests/91adf03cbe884e8fa30d82feb500d576e6488fcb.json
@@ -7,8 +7,14 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"\"",
-      "resource": "a::\":\"",
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +25,14 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"\"",
-      "resource": "a::\":\"",
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +43,14 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"\"",
-      "resource": "a::\":\"",
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +61,14 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"\"",
-      "resource": "a::\":\"",
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +79,14 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"\"",
-      "resource": "a::\":\"",
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +97,14 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"\"",
-      "resource": "a::\":\"",
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +115,14 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"\"",
-      "resource": "a::\":\"",
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +133,14 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"\"",
-      "resource": "a::\":\"",
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/91d90806521341a9dab4b6e1c3b202e99375b498.json b/cedar-integration-tests/corpus_tests/91d90806521341a9dab4b6e1c3b202e99375b498.json
index febf9f5eb..8a0d7bc62 100644
--- a/cedar-integration-tests/corpus_tests/91d90806521341a9dab4b6e1c3b202e99375b498.json
+++ b/cedar-integration-tests/corpus_tests/91d90806521341a9dab4b6e1c3b202e99375b498.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "mxxv::mxxv::a::\"\"",
-      "action": "mxxv::mxxv::Action::\"action\"",
-      "resource": "mxxv::mxxv::a::\"\"",
+      "principal": {
+        "type": "mxxv::mxxv::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mxxv::mxxv::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mxxv::mxxv::Action",
+        "id": "action"
+      },
       "context": {
         "v": {},
         "fv": false
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "mxxv::mxxv::a::\"\"",
-      "action": "mxxv::mxxv::Action::\"action\"",
-      "resource": "mxxv::mxxv::a::\"\"",
+      "principal": {
+        "type": "mxxv::mxxv::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mxxv::mxxv::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mxxv::mxxv::Action",
+        "id": "action"
+      },
       "context": {
         "v": {},
         "fv": false
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "mxxv::mxxv::a::\"\"",
-      "action": "mxxv::mxxv::Action::\"action\"",
-      "resource": "mxxv::mxxv::a::\"\"",
+      "principal": {
+        "type": "mxxv::mxxv::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mxxv::mxxv::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mxxv::mxxv::Action",
+        "id": "action"
+      },
       "context": {
         "v": {},
         "fv": false
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "mxxv::mxxv::a::\"\"",
-      "action": "mxxv::mxxv::Action::\"action\"",
-      "resource": "mxxv::mxxv::a::\"\"",
+      "principal": {
+        "type": "mxxv::mxxv::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mxxv::mxxv::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mxxv::mxxv::Action",
+        "id": "action"
+      },
       "context": {
         "v": {},
         "fv": false
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "mxxv::mxxv::a::\"\"",
-      "action": "mxxv::mxxv::Action::\"action\"",
-      "resource": "mxxv::mxxv::a::\"\"",
+      "principal": {
+        "type": "mxxv::mxxv::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mxxv::mxxv::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mxxv::mxxv::Action",
+        "id": "action"
+      },
       "context": {
         "v": {},
         "fv": false
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "mxxv::mxxv::a::\"\"",
-      "action": "mxxv::mxxv::Action::\"action\"",
-      "resource": "mxxv::mxxv::a::\"\"",
+      "principal": {
+        "type": "mxxv::mxxv::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mxxv::mxxv::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mxxv::mxxv::Action",
+        "id": "action"
+      },
       "context": {
         "v": {},
         "fv": false
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "mxxv::mxxv::a::\"\"",
-      "action": "mxxv::mxxv::Action::\"action\"",
-      "resource": "mxxv::mxxv::a::\"\"",
+      "principal": {
+        "type": "mxxv::mxxv::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mxxv::mxxv::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mxxv::mxxv::Action",
+        "id": "action"
+      },
       "context": {
         "v": {},
         "fv": false
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "mxxv::mxxv::a::\"\"",
-      "action": "mxxv::mxxv::Action::\"action\"",
-      "resource": "mxxv::mxxv::a::\"\"",
+      "principal": {
+        "type": "mxxv::mxxv::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mxxv::mxxv::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mxxv::mxxv::Action",
+        "id": "action"
+      },
       "context": {
         "v": {},
         "fv": false
diff --git a/cedar-integration-tests/corpus_tests/91ecacebaa77afde6e1994e0cbd9ad9e8972dd8a.json b/cedar-integration-tests/corpus_tests/91ecacebaa77afde6e1994e0cbd9ad9e8972dd8a.json
index 2cc898d7c..a4e8e0076 100644
--- a/cedar-integration-tests/corpus_tests/91ecacebaa77afde6e1994e0cbd9ad9e8972dd8a.json
+++ b/cedar-integration-tests/corpus_tests/91ecacebaa77afde6e1994e0cbd9ad9e8972dd8a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{6}\\u{e}\\0\\u{6}:\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{e}\\0\\u{6}:\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000e\u0000\u0006:\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000e\u0000\u0006:\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{e}\\0\\u{6}:\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000e\u0000\u0006:\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{6}\\u{e}\\0\\u{6}:\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{e}\\0\\u{6}:\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000e\u0000\u0006:\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000e\u0000\u0006:\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}\\u{e}\\0\\u{6}:\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{e}\\0\\u{6}:\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000e\u0000\u0006:\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000e\u0000\u0006:\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}\\u{e}\\0\\u{6}:\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{e}\\0\\u{6}:\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000e\u0000\u0006:\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000e\u0000\u0006:\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}\\u{e}\\0\\u{6}:\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{e}\\0\\u{6}:\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000e\u0000\u0006:\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000e\u0000\u0006:\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}\\u{e}\\0\\u{6}:\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{e}\\0\\u{6}:\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000e\u0000\u0006:\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000e\u0000\u0006:\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}\\u{e}\\0\\u{6}:\\u{6}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{e}\\0\\u{6}:\\u{6}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000e\u0000\u0006:\u0006\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000e\u0000\u0006:\u0006\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/91f9c787d43b0c5facb2f8ec16ce02056fde8bc9.json b/cedar-integration-tests/corpus_tests/91f9c787d43b0c5facb2f8ec16ce02056fde8bc9.json
index 9dcd76a58..d28070bdb 100644
--- a/cedar-integration-tests/corpus_tests/91f9c787d43b0c5facb2f8ec16ce02056fde8bc9.json
+++ b/cedar-integration-tests/corpus_tests/91f9c787d43b0c5facb2f8ec16ce02056fde8bc9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"zzzz\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "zzzz"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +28,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -29,8 +41,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -39,8 +54,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -49,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -59,8 +80,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -69,8 +93,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -79,8 +106,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/920c746e731c3ace559a77d13f72dd3215c2611e.json b/cedar-integration-tests/corpus_tests/920c746e731c3ace559a77d13f72dd3215c2611e.json
index f120adf4b..8868121d3 100644
--- a/cedar-integration-tests/corpus_tests/920c746e731c3ace559a77d13f72dd3215c2611e.json
+++ b/cedar-integration-tests/corpus_tests/920c746e731c3ace559a77d13f72dd3215c2611e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"j\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9228e32f4fcb3799929299c061ef5bbf5e05877c.json b/cedar-integration-tests/corpus_tests/9228e32f4fcb3799929299c061ef5bbf5e05877c.json
index 693074549..0b5919ce9 100644
--- a/cedar-integration-tests/corpus_tests/9228e32f4fcb3799929299c061ef5bbf5e05877c.json
+++ b/cedar-integration-tests/corpus_tests/9228e32f4fcb3799929299c061ef5bbf5e05877c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"om/s\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "om/s"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"om/s\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "om/s"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"om/s\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "om/s"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"om/s\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "om/s"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"om/s\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "om/s"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"om/s\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "om/s"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"om/s\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "om/s"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"om/s\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "om/s"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/9250519ce2283cfeec18cbbd341db4bd9fc56423.json b/cedar-integration-tests/corpus_tests/9250519ce2283cfeec18cbbd341db4bd9fc56423.json
index aaa7046c7..590928aea 100644
--- a/cedar-integration-tests/corpus_tests/9250519ce2283cfeec18cbbd341db4bd9fc56423.json
+++ b/cedar-integration-tests/corpus_tests/9250519ce2283cfeec18cbbd341db4bd9fc56423.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"(0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": "(0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"(0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": "(0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"(0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": "(0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"(0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": "(0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"(0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": "(0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"(0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": "(0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"(0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": "(0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9261206b02b916d38f5e063947e24c57363a865b.json b/cedar-integration-tests/corpus_tests/9261206b02b916d38f5e063947e24c57363a865b.json
index fb5c1ec6c..65175db72 100644
--- a/cedar-integration-tests/corpus_tests/9261206b02b916d38f5e063947e24c57363a865b.json
+++ b/cedar-integration-tests/corpus_tests/9261206b02b916d38f5e063947e24c57363a865b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "K::n::p::r::r::r::r::a::\"\"",
-      "action": "K::n::p::r::r::r::r::Action::\"action\"",
-      "resource": "K::n::p::r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "K::n::p::r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "K::n::p::r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "K::n::p::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "K::n::p::r::r::r::r::a::\"\"",
-      "action": "K::n::p::r::r::r::r::Action::\"action\"",
-      "resource": "K::n::p::r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "K::n::p::r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "K::n::p::r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "K::n::p::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "K::n::p::r::r::r::r::a::\"\"",
-      "action": "K::n::p::r::r::r::r::Action::\"action\"",
-      "resource": "K::n::p::r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "K::n::p::r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "K::n::p::r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "K::n::p::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "K::n::p::r::r::r::r::a::\"\"",
-      "action": "K::n::p::r::r::r::r::Action::\"action\"",
-      "resource": "K::n::p::r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "K::n::p::r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "K::n::p::r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "K::n::p::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "K::n::p::r::r::r::r::a::\"\"",
-      "action": "K::n::p::r::r::r::r::Action::\"action\"",
-      "resource": "K::n::p::r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "K::n::p::r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "K::n::p::r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "K::n::p::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "K::n::p::r::r::r::r::a::\"\"",
-      "action": "K::n::p::r::r::r::r::Action::\"action\"",
-      "resource": "K::n::p::r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "K::n::p::r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "K::n::p::r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "K::n::p::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "K::n::p::r::r::r::r::a::\"\"",
-      "action": "K::n::p::r::r::r::r::Action::\"action\"",
-      "resource": "K::n::p::r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "K::n::p::r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "K::n::p::r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "K::n::p::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "K::n::p::r::r::r::r::a::\"\"",
-      "action": "K::n::p::r::r::r::r::Action::\"action\"",
-      "resource": "K::n::p::r::r::r::r::a::\"\"",
+      "principal": {
+        "type": "K::n::p::r::r::r::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "K::n::p::r::r::r::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "K::n::p::r::r::r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/92b3f452e8ee9c7482beaec7bd4a4f1bdc9f3f6e.json b/cedar-integration-tests/corpus_tests/92b3f452e8ee9c7482beaec7bd4a4f1bdc9f3f6e.json
index 01532ff7c..351eb77bc 100644
--- a/cedar-integration-tests/corpus_tests/92b3f452e8ee9c7482beaec7bd4a4f1bdc9f3f6e.json
+++ b/cedar-integration-tests/corpus_tests/92b3f452e8ee9c7482beaec7bd4a4f1bdc9f3f6e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Wjjhjjjjjjjjjj::a::\"\"",
-      "action": "Wjjhjjjjjjjjjj::Action::\"\"",
-      "resource": "Wjjhjjjjjjjjjj::a::\"\"",
+      "principal": {
+        "type": "Wjjhjjjjjjjjjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjhjjjjjjjjjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Wjjhjjjjjjjjjj::Action",
+        "id": ""
+      },
       "context": {
         "WamkldYj000000": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Wjjhjjjjjjjjjj::a::\"\"",
-      "action": "Wjjhjjjjjjjjjj::Action::\"\"",
-      "resource": "Wjjhjjjjjjjjjj::a::\"\"",
+      "principal": {
+        "type": "Wjjhjjjjjjjjjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjhjjjjjjjjjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Wjjhjjjjjjjjjj::Action",
+        "id": ""
+      },
       "context": {
         "WamkldYj000000": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Wjjhjjjjjjjjjj::a::\"\"",
-      "action": "Wjjhjjjjjjjjjj::Action::\"\"",
-      "resource": "Wjjhjjjjjjjjjj::a::\"\"",
+      "principal": {
+        "type": "Wjjhjjjjjjjjjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjhjjjjjjjjjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Wjjhjjjjjjjjjj::Action",
+        "id": ""
+      },
       "context": {
         "WamkldYj000000": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Wjjhjjjjjjjjjj::a::\"\"",
-      "action": "Wjjhjjjjjjjjjj::Action::\"\"",
-      "resource": "Wjjhjjjjjjjjjj::a::\"\"",
+      "principal": {
+        "type": "Wjjhjjjjjjjjjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjhjjjjjjjjjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Wjjhjjjjjjjjjj::Action",
+        "id": ""
+      },
       "context": {
         "WamkldYj000000": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Wjjhjjjjjjjjjj::a::\"\"",
-      "action": "Wjjhjjjjjjjjjj::Action::\"\"",
-      "resource": "Wjjhjjjjjjjjjj::a::\"\"",
+      "principal": {
+        "type": "Wjjhjjjjjjjjjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjhjjjjjjjjjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Wjjhjjjjjjjjjj::Action",
+        "id": ""
+      },
       "context": {
         "WamkldYj000000": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Wjjhjjjjjjjjjj::a::\"\"",
-      "action": "Wjjhjjjjjjjjjj::Action::\"\"",
-      "resource": "Wjjhjjjjjjjjjj::a::\"\"",
+      "principal": {
+        "type": "Wjjhjjjjjjjjjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjhjjjjjjjjjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Wjjhjjjjjjjjjj::Action",
+        "id": ""
+      },
       "context": {
         "WamkldYj000000": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Wjjhjjjjjjjjjj::a::\"\"",
-      "action": "Wjjhjjjjjjjjjj::Action::\"\"",
-      "resource": "Wjjhjjjjjjjjjj::a::\"\"",
+      "principal": {
+        "type": "Wjjhjjjjjjjjjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjhjjjjjjjjjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Wjjhjjjjjjjjjj::Action",
+        "id": ""
+      },
       "context": {
         "WamkldYj000000": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Wjjhjjjjjjjjjj::a::\"\"",
-      "action": "Wjjhjjjjjjjjjj::Action::\"\"",
-      "resource": "Wjjhjjjjjjjjjj::a::\"\"",
+      "principal": {
+        "type": "Wjjhjjjjjjjjjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjhjjjjjjjjjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Wjjhjjjjjjjjjj::Action",
+        "id": ""
+      },
       "context": {
         "WamkldYj000000": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/92fcaf60cd9ab6f3fd571755cb2c619d601bc8a1.json b/cedar-integration-tests/corpus_tests/92fcaf60cd9ab6f3fd571755cb2c619d601bc8a1.json
index 34c933796..75cfe8a74 100644
--- a/cedar-integration-tests/corpus_tests/92fcaf60cd9ab6f3fd571755cb2c619d601bc8a1.json
+++ b/cedar-integration-tests/corpus_tests/92fcaf60cd9ab6f3fd571755cb2c619d601bc8a1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0FFFFFFFI\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFFFFFI\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFFFFI"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFFFFI"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0FFFFFFFI\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFFFFFI\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFFFFI"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFFFFI"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0FFFFFFFI\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFFFFFI\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFFFFI"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFFFFI"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0FFFFFFFI\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFFFFFI\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFFFFI"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFFFFI"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0FFFFFFFI\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFFFFFI\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFFFFI"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFFFFI"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0FFFFFFFI\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFFFFFI\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFFFFI"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFFFFI"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0FFFFFFFI\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFFFFFI\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFFFFI"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFFFFI"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0FFFFFFFI\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFFFFFI\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFFFFI"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFFFFI"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/930830a6a4ef9e7673ff3c2b38e0f8195911a5ba.json b/cedar-integration-tests/corpus_tests/930830a6a4ef9e7673ff3c2b38e0f8195911a5ba.json
index 014e27b6e..536a02f87 100644
--- a/cedar-integration-tests/corpus_tests/930830a6a4ef9e7673ff3c2b38e0f8195911a5ba.json
+++ b/cedar-integration-tests/corpus_tests/930830a6a4ef9e7673ff3c2b38e0f8195911a5ba.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"БОwt\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "БОwt"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"БОwt\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "БОwt"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"БОwt\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "БОwt"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"БОwt\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "БОwt"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"БОwt\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "БОwt"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"БОwt\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "БОwt"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"БОwt\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "БОwt"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"БОwt\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "БОwt"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/9345bcfd444e81d0a54b9f46dac2a5b7cc2f3ded.json b/cedar-integration-tests/corpus_tests/9345bcfd444e81d0a54b9f46dac2a5b7cc2f3ded.json
index 647db71c5..911228ea7 100644
--- a/cedar-integration-tests/corpus_tests/9345bcfd444e81d0a54b9f46dac2a5b7cc2f3ded.json
+++ b/cedar-integration-tests/corpus_tests/9345bcfd444e81d0a54b9f46dac2a5b7cc2f3ded.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/934d6737130d9efa9f8a803b797118cac84e6b73.json b/cedar-integration-tests/corpus_tests/934d6737130d9efa9f8a803b797118cac84e6b73.json
index c31f75509..902c6e5a9 100644
--- a/cedar-integration-tests/corpus_tests/934d6737130d9efa9f8a803b797118cac84e6b73.json
+++ b/cedar-integration-tests/corpus_tests/934d6737130d9efa9f8a803b797118cac84e6b73.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "G::r::a::\"\\u{2}:\\u{1a}:+&6\"",
-      "action": "G::r::Action::\"action\"",
-      "resource": "G::r::a::\"\\u{2}:\\u{1a}:+&6\"",
+      "principal": {
+        "type": "G::r::a",
+        "id": "\u0002:\u001a:+&6"
+      },
+      "resource": {
+        "type": "G::r::a",
+        "id": "\u0002:\u001a:+&6"
+      },
+      "action": {
+        "type": "G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "G::r::a::\"\\u{2}:\\u{1a}:+&6\"",
-      "action": "G::r::Action::\"action\"",
-      "resource": "G::r::a::\"\\u{2}:\\u{1a}:+&6\"",
+      "principal": {
+        "type": "G::r::a",
+        "id": "\u0002:\u001a:+&6"
+      },
+      "resource": {
+        "type": "G::r::a",
+        "id": "\u0002:\u001a:+&6"
+      },
+      "action": {
+        "type": "G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "G::r::a::\"\\u{2}:\\u{1a}:+&6\"",
-      "action": "G::r::Action::\"action\"",
-      "resource": "G::r::a::\"\\u{2}:\\u{1a}:+&6\"",
+      "principal": {
+        "type": "G::r::a",
+        "id": "\u0002:\u001a:+&6"
+      },
+      "resource": {
+        "type": "G::r::a",
+        "id": "\u0002:\u001a:+&6"
+      },
+      "action": {
+        "type": "G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "G::r::a::\"\\u{2}:\\u{1a}:+&6\"",
-      "action": "G::r::Action::\"action\"",
-      "resource": "G::r::a::\"\\u{2}:\\u{1a}:+&6\"",
+      "principal": {
+        "type": "G::r::a",
+        "id": "\u0002:\u001a:+&6"
+      },
+      "resource": {
+        "type": "G::r::a",
+        "id": "\u0002:\u001a:+&6"
+      },
+      "action": {
+        "type": "G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "G::r::a::\"\\u{2}:\\u{1a}:+&6\"",
-      "action": "G::r::Action::\"action\"",
-      "resource": "G::r::a::\"\\u{2}:\\u{1a}:+&6\"",
+      "principal": {
+        "type": "G::r::a",
+        "id": "\u0002:\u001a:+&6"
+      },
+      "resource": {
+        "type": "G::r::a",
+        "id": "\u0002:\u001a:+&6"
+      },
+      "action": {
+        "type": "G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "G::r::a::\"\\u{2}:\\u{1a}:+&6\"",
-      "action": "G::r::Action::\"action\"",
-      "resource": "G::r::a::\"\\u{2}:\\u{1a}:+&6\"",
+      "principal": {
+        "type": "G::r::a",
+        "id": "\u0002:\u001a:+&6"
+      },
+      "resource": {
+        "type": "G::r::a",
+        "id": "\u0002:\u001a:+&6"
+      },
+      "action": {
+        "type": "G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "G::r::a::\"\\u{2}:\\u{1a}:+&6\"",
-      "action": "G::r::Action::\"action\"",
-      "resource": "G::r::a::\"\\u{2}:\\u{1a}:+&6\"",
+      "principal": {
+        "type": "G::r::a",
+        "id": "\u0002:\u001a:+&6"
+      },
+      "resource": {
+        "type": "G::r::a",
+        "id": "\u0002:\u001a:+&6"
+      },
+      "action": {
+        "type": "G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "G::r::a::\"\\u{2}:\\u{1a}:+&6\"",
-      "action": "G::r::Action::\"action\"",
-      "resource": "G::r::a::\"\\u{2}:\\u{1a}:+&6\"",
+      "principal": {
+        "type": "G::r::a",
+        "id": "\u0002:\u001a:+&6"
+      },
+      "resource": {
+        "type": "G::r::a",
+        "id": "\u0002:\u001a:+&6"
+      },
+      "action": {
+        "type": "G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/935ed181d5b21b08c88375d23f0ca2206aea2eb0.json b/cedar-integration-tests/corpus_tests/935ed181d5b21b08c88375d23f0ca2206aea2eb0.json
index 49015d076..b650ab87e 100644
--- a/cedar-integration-tests/corpus_tests/935ed181d5b21b08c88375d23f0ca2206aea2eb0.json
+++ b/cedar-integration-tests/corpus_tests/935ed181d5b21b08c88375d23f0ca2206aea2eb0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{1}\\u{7f}\\0\\u{8}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001\u0000\b\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9364062f6d09c68d2d9c28648af46c9e3827b006.json b/cedar-integration-tests/corpus_tests/9364062f6d09c68d2d9c28648af46c9e3827b006.json
index e09b7af58..199dffc03 100644
--- a/cedar-integration-tests/corpus_tests/9364062f6d09c68d2d9c28648af46c9e3827b006.json
+++ b/cedar-integration-tests/corpus_tests/9364062f6d09c68d2d9c28648af46c9e3827b006.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"zzzzzz\\u{1}zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzz\\u{1}zzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzz\u0001zzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzz\u0001zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"zzzzzz\\u{1}zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzz\\u{1}zzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzz\u0001zzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzz\u0001zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"zzzzzz\\u{1}zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzz\\u{1}zzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzz\u0001zzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzz\u0001zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"zzzzzz\\u{1}zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzz\\u{1}zzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzz\u0001zzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzz\u0001zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"zzzzzz\\u{1}zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzz\\u{1}zzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzz\u0001zzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzz\u0001zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"zzzzzz\\u{1}zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzz\\u{1}zzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzz\u0001zzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzz\u0001zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"zzzzzz\\u{1}zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzz\\u{1}zzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzz\u0001zzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzz\u0001zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"zzzzzz\\u{1}zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzz\\u{1}zzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzz\u0001zzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzz\u0001zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/936dfd337ccf0412600b478aeb2ec982ef624919.json b/cedar-integration-tests/corpus_tests/936dfd337ccf0412600b478aeb2ec982ef624919.json
index b50f96f39..b3d02a785 100644
--- a/cedar-integration-tests/corpus_tests/936dfd337ccf0412600b478aeb2ec982ef624919.json
+++ b/cedar-integration-tests/corpus_tests/936dfd337ccf0412600b478aeb2ec982ef624919.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"jj\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "jj"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"jj\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "jj"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"av\"",
-      "action": "Action::\"jj\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "av"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "jj"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"jj\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "jj"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"jj\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "jj"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"jj\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "jj"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"jj\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "jj"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"jj\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "jj"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/938ccf0f7d6daab0a55e3d8f7931e70abed0556a.json b/cedar-integration-tests/corpus_tests/938ccf0f7d6daab0a55e3d8f7931e70abed0556a.json
index 1d3422f9b..c42fb8cde 100644
--- a/cedar-integration-tests/corpus_tests/938ccf0f7d6daab0a55e3d8f7931e70abed0556a.json
+++ b/cedar-integration-tests/corpus_tests/938ccf0f7d6daab0a55e3d8f7931e70abed0556a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"@\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "@"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/93caa6f782faadb5a8a615325bf80d8d943d4e7f.json b/cedar-integration-tests/corpus_tests/93caa6f782faadb5a8a615325bf80d8d943d4e7f.json
index 5b4958fa7..675ca76ef 100644
--- a/cedar-integration-tests/corpus_tests/93caa6f782faadb5a8a615325bf80d8d943d4e7f.json
+++ b/cedar-integration-tests/corpus_tests/93caa6f782faadb5a8a615325bf80d8d943d4e7f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/93e58b7017a37b573f8a205f08b7077d6587c640.json b/cedar-integration-tests/corpus_tests/93e58b7017a37b573f8a205f08b7077d6587c640.json
index 2bded41a5..48fbff6ed 100644
--- a/cedar-integration-tests/corpus_tests/93e58b7017a37b573f8a205f08b7077d6587c640.json
+++ b/cedar-integration-tests/corpus_tests/93e58b7017a37b573f8a205f08b7077d6587c640.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -84,9 +147,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/93fad044ad6b5540b4c877e68c4a6e802b36a01a.json b/cedar-integration-tests/corpus_tests/93fad044ad6b5540b4c877e68c4a6e802b36a01a.json
index 8e279fbfa..21b4d81fd 100644
--- a/cedar-integration-tests/corpus_tests/93fad044ad6b5540b4c877e68c4a6e802b36a01a.json
+++ b/cedar-integration-tests/corpus_tests/93fad044ad6b5540b4c877e68c4a6e802b36a01a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::C::A::B::a::\"\"",
-      "action": "r::r::C::A::B::Action::\"\"",
-      "resource": "r::r::C::A::B::a::\"\"",
+      "principal": {
+        "type": "r::r::C::A::B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::C::A::B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::C::A::B::Action",
+        "id": ""
+      },
       "context": {
         "Wjjjjjux2": {
           "__entity": {
@@ -25,9 +34,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::C::A::B::a::\"\"",
-      "action": "r::r::C::A::B::Action::\"\"",
-      "resource": "r::r::C::A::B::a::\"\"",
+      "principal": {
+        "type": "r::r::C::A::B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::C::A::B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::C::A::B::Action",
+        "id": ""
+      },
       "context": {
         "Wjjjjjux2": {
           "__entity": {
@@ -44,9 +62,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::C::A::B::a::\"\"",
-      "action": "r::r::C::A::B::Action::\"\"",
-      "resource": "r::r::C::A::B::a::\"\"",
+      "principal": {
+        "type": "r::r::C::A::B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::C::A::B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::C::A::B::Action",
+        "id": ""
+      },
       "context": {
         "Wjjjjjux2": {
           "__entity": {
@@ -63,9 +90,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::C::A::B::a::\"\"",
-      "action": "r::r::C::A::B::Action::\"\"",
-      "resource": "r::r::C::A::B::a::\"\"",
+      "principal": {
+        "type": "r::r::C::A::B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::C::A::B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::C::A::B::Action",
+        "id": ""
+      },
       "context": {
         "Wjjjjjux2": {
           "__entity": {
@@ -82,9 +118,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::C::A::B::a::\"\"",
-      "action": "r::r::C::A::B::Action::\"\"",
-      "resource": "r::r::C::A::B::a::\"\"",
+      "principal": {
+        "type": "r::r::C::A::B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::C::A::B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::C::A::B::Action",
+        "id": ""
+      },
       "context": {
         "Wjjjjjux2": {
           "__entity": {
@@ -101,9 +146,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::C::A::B::a::\"\"",
-      "action": "r::r::C::A::B::Action::\"\"",
-      "resource": "r::r::C::A::B::a::\"\"",
+      "principal": {
+        "type": "r::r::C::A::B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::C::A::B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::C::A::B::Action",
+        "id": ""
+      },
       "context": {
         "Wjjjjjux2": {
           "__entity": {
@@ -120,9 +174,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::C::A::B::a::\"\"",
-      "action": "r::r::C::A::B::Action::\"\"",
-      "resource": "r::r::C::A::B::a::\"\"",
+      "principal": {
+        "type": "r::r::C::A::B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::C::A::B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::C::A::B::Action",
+        "id": ""
+      },
       "context": {
         "Wjjjjjux2": {
           "__entity": {
@@ -139,9 +202,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::C::A::B::a::\"\"",
-      "action": "r::r::C::A::B::Action::\"\"",
-      "resource": "r::r::C::A::B::a::\"\"",
+      "principal": {
+        "type": "r::r::C::A::B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::C::A::B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::C::A::B::Action",
+        "id": ""
+      },
       "context": {
         "Wjjjjjux2": {
           "__entity": {
diff --git a/cedar-integration-tests/corpus_tests/940fb9372732615d0416270b347ca5f732c17dd1.json b/cedar-integration-tests/corpus_tests/940fb9372732615d0416270b347ca5f732c17dd1.json
index 0677137df..123666952 100644
--- a/cedar-integration-tests/corpus_tests/940fb9372732615d0416270b347ca5f732c17dd1.json
+++ b/cedar-integration-tests/corpus_tests/940fb9372732615d0416270b347ca5f732c17dd1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"[\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"[\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "[\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "[\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"[\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"[\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "[\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "[\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"[\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"[\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "[\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "[\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"[\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"[\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "[\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "[\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"[\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"[\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "[\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "[\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"[\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"[\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "[\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "[\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"[\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"[\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "[\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "[\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"[\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"[\\n\"",
+      "principal": {
+        "type": "a",
+        "id": "[\n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "[\n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/942be69eda5e79fd772b447f062a7d9d543097c3.json b/cedar-integration-tests/corpus_tests/942be69eda5e79fd772b447f062a7d9d543097c3.json
index 1fdb7f90b..727e2b1b5 100644
--- a/cedar-integration-tests/corpus_tests/942be69eda5e79fd772b447f062a7d9d543097c3.json
+++ b/cedar-integration-tests/corpus_tests/942be69eda5e79fd772b447f062a7d9d543097c3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/947f3f01090424768ca035ac35c1040d5e460756.json b/cedar-integration-tests/corpus_tests/947f3f01090424768ca035ac35c1040d5e460756.json
index 0a45cb40b..2cf7fc3d3 100644
--- a/cedar-integration-tests/corpus_tests/947f3f01090424768ca035ac35c1040d5e460756.json
+++ b/cedar-integration-tests/corpus_tests/947f3f01090424768ca035ac35c1040d5e460756.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/94c0be79f2fdbf7665d653e48e8c770bed3d74df.json b/cedar-integration-tests/corpus_tests/94c0be79f2fdbf7665d653e48e8c770bed3d74df.json
index 639ab6b63..da8d54a2d 100644
--- a/cedar-integration-tests/corpus_tests/94c0be79f2fdbf7665d653e48e8c770bed3d74df.json
+++ b/cedar-integration-tests/corpus_tests/94c0be79f2fdbf7665d653e48e8c770bed3d74df.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"k\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "k"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/94c7107a5e0ad11e0193f726ad3ba85db64beac0.json b/cedar-integration-tests/corpus_tests/94c7107a5e0ad11e0193f726ad3ba85db64beac0.json
index 74b7808f3..77cef7911 100644
--- a/cedar-integration-tests/corpus_tests/94c7107a5e0ad11e0193f726ad3ba85db64beac0.json
+++ b/cedar-integration-tests/corpus_tests/94c7107a5e0ad11e0193f726ad3ba85db64beac0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Khhkkhk::a::\"\\r\"",
-      "action": "Khhkkhk::Action::\"action\"",
-      "resource": "Khhkkhk::a::\"\\r\"",
+      "principal": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "resource": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Khhkkhk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Khhkkhk::a::\"\\r\"",
-      "action": "Khhkkhk::Action::\"action\"",
-      "resource": "Khhkkhk::a::\"\\r\"",
+      "principal": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "resource": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Khhkkhk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Khhkkhk::a::\".\"",
-      "action": "Khhkkhk::Action::\"action\"",
-      "resource": "Khhkkhk::a::\"\\r\"",
+      "principal": {
+        "type": "Khhkkhk::a",
+        "id": "."
+      },
+      "resource": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Khhkkhk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Khhkkhk::a::\"\\r\"",
-      "action": "Khhkkhk::Action::\"action\"",
-      "resource": "Khhkkhk::a::\"\\r\"",
+      "principal": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "resource": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Khhkkhk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Khhkkhk::a::\"\\r\"",
-      "action": "Khhkkhk::Action::\"action\"",
-      "resource": "Khhkkhk::a::\"\\r\"",
+      "principal": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "resource": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Khhkkhk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Khhkkhk::a::\"\\r\"",
-      "action": "Khhkkhk::Action::\"action\"",
-      "resource": "Khhkkhk::a::\"\\r\"",
+      "principal": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "resource": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Khhkkhk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Khhkkhk::a::\"\\r\"",
-      "action": "Khhkkhk::Action::\"action\"",
-      "resource": "Khhkkhk::a::\"\\r\"",
+      "principal": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "resource": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Khhkkhk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Khhkkhk::a::\"\\r\"",
-      "action": "Khhkkhk::Action::\"action\"",
-      "resource": "Khhkkhk::a::\"\\r\"",
+      "principal": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "resource": {
+        "type": "Khhkkhk::a",
+        "id": "\r"
+      },
+      "action": {
+        "type": "Khhkkhk::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/94d1ab0699264fbb5eafc162905fb5200072fe87.json b/cedar-integration-tests/corpus_tests/94d1ab0699264fbb5eafc162905fb5200072fe87.json
index 4171c3a69..872761f64 100644
--- a/cedar-integration-tests/corpus_tests/94d1ab0699264fbb5eafc162905fb5200072fe87.json
+++ b/cedar-integration-tests/corpus_tests/94d1ab0699264fbb5eafc162905fb5200072fe87.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/95022c341ce992d2f23bd1594f5fafbd01ce6fd5.json b/cedar-integration-tests/corpus_tests/95022c341ce992d2f23bd1594f5fafbd01ce6fd5.json
index 56d62fd7b..33cdc53e5 100644
--- a/cedar-integration-tests/corpus_tests/95022c341ce992d2f23bd1594f5fafbd01ce6fd5.json
+++ b/cedar-integration-tests/corpus_tests/95022c341ce992d2f23bd1594f5fafbd01ce6fd5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/95bd608355e635217808896e538df0697c0d0d53.json b/cedar-integration-tests/corpus_tests/95bd608355e635217808896e538df0697c0d0d53.json
index 4f445e523..6d716c136 100644
--- a/cedar-integration-tests/corpus_tests/95bd608355e635217808896e538df0697c0d0d53.json
+++ b/cedar-integration-tests/corpus_tests/95bd608355e635217808896e538df0697c0d0d53.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/95c80734934226e0a88cb165c51cac873b366c06.json b/cedar-integration-tests/corpus_tests/95c80734934226e0a88cb165c51cac873b366c06.json
index 9547d976e..53c6f63ad 100644
--- a/cedar-integration-tests/corpus_tests/95c80734934226e0a88cb165c51cac873b366c06.json
+++ b/cedar-integration-tests/corpus_tests/95c80734934226e0a88cb165c51cac873b366c06.json
@@ -6,9 +6,15 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"0)\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "0)"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +22,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"0\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "0"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -28,9 +43,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"0\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "0"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -40,9 +64,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"0\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "0"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -52,9 +85,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"0\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "0"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -64,9 +106,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"0\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "0"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -76,9 +127,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"0\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "0"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -88,9 +148,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"0\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "0"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/95d6efb049d43923e0dc8fba8f48168cf6dd1e52.json b/cedar-integration-tests/corpus_tests/95d6efb049d43923e0dc8fba8f48168cf6dd1e52.json
index 29a7b386a..f50aa783b 100644
--- a/cedar-integration-tests/corpus_tests/95d6efb049d43923e0dc8fba8f48168cf6dd1e52.json
+++ b/cedar-integration-tests/corpus_tests/95d6efb049d43923e0dc8fba8f48168cf6dd1e52.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffF\\0f\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffF\u0000f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ffffF\\0f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffF\\0f\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffF\u0000f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffF\u0000f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"ffffF\\0f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffF\\0f\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffF\u0000f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffF\u0000f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ffffF\\0f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffF\\0f\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffF\u0000f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffF\u0000f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ffffF\\0f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffF\\0f\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffF\u0000f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffF\u0000f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ffffF\\0f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffF\\0f\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffF\u0000f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffF\u0000f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ffffF\\0f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffF\\0f\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffF\u0000f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffF\u0000f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ffffF\\0f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffF\\0f\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffF\u0000f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffF\u0000f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/95f3134308565c39162f625f739243a86608c8b0.json b/cedar-integration-tests/corpus_tests/95f3134308565c39162f625f739243a86608c8b0.json
index d1758c517..ac9ad0802 100644
--- a/cedar-integration-tests/corpus_tests/95f3134308565c39162f625f739243a86608c8b0.json
+++ b/cedar-integration-tests/corpus_tests/95f3134308565c39162f625f739243a86608c8b0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::n::r::r::r::r::j::u::u::u::r::a::\"\"",
-      "action": "r::n::r::r::r::r::j::u::u::u::r::Action::\"action\"",
-      "resource": "r::n::r::r::r::r::j::u::u::u::r::a::\"\"",
+      "principal": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::n::r::r::r::r::j::u::u::u::r::a::\"\"",
-      "action": "r::n::r::r::r::r::j::u::u::u::r::Action::\"action\"",
-      "resource": "r::n::r::r::r::r::j::u::u::u::r::a::\"\"",
+      "principal": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::n::r::r::r::r::j::u::u::u::r::a::\"\"",
-      "action": "r::n::r::r::r::r::j::u::u::u::r::Action::\"action\"",
-      "resource": "r::n::r::r::r::r::j::u::u::u::r::a::\"\"",
+      "principal": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::n::r::r::r::r::j::u::u::u::r::a::\"\"",
-      "action": "r::n::r::r::r::r::j::u::u::u::r::Action::\"action\"",
-      "resource": "r::n::r::r::r::r::j::u::u::u::r::a::\"\"",
+      "principal": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::n::r::r::r::r::j::u::u::u::r::a::\"\"",
-      "action": "r::n::r::r::r::r::j::u::u::u::r::Action::\"action\"",
-      "resource": "r::n::r::r::r::r::j::u::u::u::r::a::\"\"",
+      "principal": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::n::r::r::r::r::j::u::u::u::r::a::\"\"",
-      "action": "r::n::r::r::r::r::j::u::u::u::r::Action::\"action\"",
-      "resource": "r::n::r::r::r::r::j::u::u::u::r::a::\"\"",
+      "principal": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::n::r::r::r::r::j::u::u::u::r::a::\"\"",
-      "action": "r::n::r::r::r::r::j::u::u::u::r::Action::\"action\"",
-      "resource": "r::n::r::r::r::r::j::u::u::u::r::a::\"\"",
+      "principal": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::n::r::r::r::r::j::u::u::u::r::a::\"\"",
-      "action": "r::n::r::r::r::r::j::u::u::u::r::Action::\"action\"",
-      "resource": "r::n::r::r::r::r::j::u::u::u::r::a::\"\"",
+      "principal": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::n::r::r::r::r::j::u::u::u::r::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/960d3e9de3aa8f15b17f855ffd831ac8c1b9632f.json b/cedar-integration-tests/corpus_tests/960d3e9de3aa8f15b17f855ffd831ac8c1b9632f.json
index 3d1feed07..cce053e51 100644
--- a/cedar-integration-tests/corpus_tests/960d3e9de3aa8f15b17f855ffd831ac8c1b9632f.json
+++ b/cedar-integration-tests/corpus_tests/960d3e9de3aa8f15b17f855ffd831ac8c1b9632f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/961eec7160aaf77e2c58eb965a43edf371548d71.json b/cedar-integration-tests/corpus_tests/961eec7160aaf77e2c58eb965a43edf371548d71.json
index 091eeed12..25528f5a6 100644
--- a/cedar-integration-tests/corpus_tests/961eec7160aaf77e2c58eb965a43edf371548d71.json
+++ b/cedar-integration-tests/corpus_tests/961eec7160aaf77e2c58eb965a43edf371548d71.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\")\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\")\"",
+      "principal": {
+        "type": "a",
+        "id": ")"
+      },
+      "resource": {
+        "type": "a",
+        "id": ")"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9643313cfd96e483bd43192c666fb381bc00b9b7.json b/cedar-integration-tests/corpus_tests/9643313cfd96e483bd43192c666fb381bc00b9b7.json
index c3c1606e5..482731cea 100644
--- a/cedar-integration-tests/corpus_tests/9643313cfd96e483bd43192c666fb381bc00b9b7.json
+++ b/cedar-integration-tests/corpus_tests/9643313cfd96e483bd43192c666fb381bc00b9b7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/96645b568adfcefb4b35e422bad25902d71b49f9.json b/cedar-integration-tests/corpus_tests/96645b568adfcefb4b35e422bad25902d71b49f9.json
index 478377fe4..80590d973 100644
--- a/cedar-integration-tests/corpus_tests/96645b568adfcefb4b35e422bad25902d71b49f9.json
+++ b/cedar-integration-tests/corpus_tests/96645b568adfcefb4b35e422bad25902d71b49f9.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -17,8 +20,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -27,8 +33,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -37,8 +46,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -47,8 +59,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -57,8 +72,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -67,8 +85,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -77,8 +98,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/968e29828c432b49c8f1e6e96292f4aa1d28964d.json b/cedar-integration-tests/corpus_tests/968e29828c432b49c8f1e6e96292f4aa1d28964d.json
index ecf11567c..efa7a0133 100644
--- a/cedar-integration-tests/corpus_tests/968e29828c432b49c8f1e6e96292f4aa1d28964d.json
+++ b/cedar-integration-tests/corpus_tests/968e29828c432b49c8f1e6e96292f4aa1d28964d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9693f3116d0a2863b0014b2760b84ae20555f640.json b/cedar-integration-tests/corpus_tests/9693f3116d0a2863b0014b2760b84ae20555f640.json
index 2fc1abbe9..620ee56b8 100644
--- a/cedar-integration-tests/corpus_tests/9693f3116d0a2863b0014b2760b84ae20555f640.json
+++ b/cedar-integration-tests/corpus_tests/9693f3116d0a2863b0014b2760b84ae20555f640.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F5540z": false
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F5540z": false
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F5540z": false
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F5540z": false
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F5540z": false
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F5540z": false
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F5540z": false
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F5540z": false
       },
diff --git a/cedar-integration-tests/corpus_tests/969daad086b33aad22548eea44163eb2895861f6.json b/cedar-integration-tests/corpus_tests/969daad086b33aad22548eea44163eb2895861f6.json
index af20a403f..8fd1c9bca 100644
--- a/cedar-integration-tests/corpus_tests/969daad086b33aad22548eea44163eb2895861f6.json
+++ b/cedar-integration-tests/corpus_tests/969daad086b33aad22548eea44163eb2895861f6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}+\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005+\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}+\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}+\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005+\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005+\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}+\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}+\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005+\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005+\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}+\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}+\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005+\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005+\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}+\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}+\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005+\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005+\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}+\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}+\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005+\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005+\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}+\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}+\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005+\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005+\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}+\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{b}\\u{5}\\u{5}\\u{5}\\u{5}+\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005+\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u000b\u0005\u0005\u0005\u0005+\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/96f3ecf641a15ca829ea2ebe4e789148bf1d0cfa.json b/cedar-integration-tests/corpus_tests/96f3ecf641a15ca829ea2ebe4e789148bf1d0cfa.json
index 24ffb642f..5ddd23ade 100644
--- a/cedar-integration-tests/corpus_tests/96f3ecf641a15ca829ea2ebe4e789148bf1d0cfa.json
+++ b/cedar-integration-tests/corpus_tests/96f3ecf641a15ca829ea2ebe4e789148bf1d0cfa.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -82,9 +145,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/972f4782b62c480d9b818d7641eeaa41c81ef5a6.json b/cedar-integration-tests/corpus_tests/972f4782b62c480d9b818d7641eeaa41c81ef5a6.json
index 491e4467a..eaf260095 100644
--- a/cedar-integration-tests/corpus_tests/972f4782b62c480d9b818d7641eeaa41c81ef5a6.json
+++ b/cedar-integration-tests/corpus_tests/972f4782b62c480d9b818d7641eeaa41c81ef5a6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{8}]\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\b]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\u{8}]\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{8}]\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\b]"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\b]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\u{8}]\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{8}]\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\b]"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\b]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\u{8}]\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{8}]\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\b]"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\b]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\u{8}]\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{8}]\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\b]"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\b]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\u{8}]\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{8}]\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\b]"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\b]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\u{8}]\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{8}]\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\b]"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\b]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9749df77416bd7412963a4f13fe64a9f282adc77.json b/cedar-integration-tests/corpus_tests/9749df77416bd7412963a4f13fe64a9f282adc77.json
index a06ac5c1f..56c70b3d8 100644
--- a/cedar-integration-tests/corpus_tests/9749df77416bd7412963a4f13fe64a9f282adc77.json
+++ b/cedar-integration-tests/corpus_tests/9749df77416bd7412963a4f13fe64a9f282adc77.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/97848837a6cfe6fcf5837958fb701bc558be2db9.json b/cedar-integration-tests/corpus_tests/97848837a6cfe6fcf5837958fb701bc558be2db9.json
index 3f653ed9e..73c87a3f5 100644
--- a/cedar-integration-tests/corpus_tests/97848837a6cfe6fcf5837958fb701bc558be2db9.json
+++ b/cedar-integration-tests/corpus_tests/97848837a6cfe6fcf5837958fb701bc558be2db9.json
@@ -7,8 +7,14 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"..\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ".."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +25,14 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"..\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ".."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +43,14 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"..\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ".."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +61,14 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"..\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ".."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +79,14 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"..\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ".."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +97,14 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"..\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ".."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +115,14 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"..\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ".."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +133,14 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"..\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ".."
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/97d5107ff92205097024e3179e70162e2140609e.json b/cedar-integration-tests/corpus_tests/97d5107ff92205097024e3179e70162e2140609e.json
index ca26467c1..ea1e2070a 100644
--- a/cedar-integration-tests/corpus_tests/97d5107ff92205097024e3179e70162e2140609e.json
+++ b/cedar-integration-tests/corpus_tests/97d5107ff92205097024e3179e70162e2140609e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "mx7dx77::r::a::\"\"",
-      "action": "mx7dx77::r::Action::\"action\"",
-      "resource": "mx7dx77::r::a::\"\"",
+      "principal": {
+        "type": "mx7dx77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mx7dx77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mx7dx77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "mx7dx77::r::a::\"\"",
-      "action": "mx7dx77::r::Action::\"action\"",
-      "resource": "mx7dx77::r::a::\"\"",
+      "principal": {
+        "type": "mx7dx77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mx7dx77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mx7dx77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "mx7dx77::r::a::\"\"",
-      "action": "mx7dx77::r::Action::\"action\"",
-      "resource": "mx7dx77::r::a::\"\"",
+      "principal": {
+        "type": "mx7dx77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mx7dx77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mx7dx77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "mx7dx77::r::a::\"\"",
-      "action": "mx7dx77::r::Action::\"action\"",
-      "resource": "mx7dx77::r::a::\"\"",
+      "principal": {
+        "type": "mx7dx77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mx7dx77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mx7dx77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "mx7dx77::r::a::\"\"",
-      "action": "mx7dx77::r::Action::\"action\"",
-      "resource": "mx7dx77::r::a::\"\"",
+      "principal": {
+        "type": "mx7dx77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mx7dx77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mx7dx77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "mx7dx77::r::a::\"\"",
-      "action": "mx7dx77::r::Action::\"action\"",
-      "resource": "mx7dx77::r::a::\"\"",
+      "principal": {
+        "type": "mx7dx77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mx7dx77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mx7dx77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "mx7dx77::r::a::\"\"",
-      "action": "mx7dx77::r::Action::\"action\"",
-      "resource": "mx7dx77::r::a::\"\"",
+      "principal": {
+        "type": "mx7dx77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mx7dx77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mx7dx77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "mx7dx77::r::a::\"\"",
-      "action": "mx7dx77::r::Action::\"action\"",
-      "resource": "mx7dx77::r::a::\"\"",
+      "principal": {
+        "type": "mx7dx77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mx7dx77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mx7dx77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/97e5ea8110fd942a8aff42be1e4b8d1f7ad9e98b.json b/cedar-integration-tests/corpus_tests/97e5ea8110fd942a8aff42be1e4b8d1f7ad9e98b.json
index 03d3dd8ce..a135ea907 100644
--- a/cedar-integration-tests/corpus_tests/97e5ea8110fd942a8aff42be1e4b8d1f7ad9e98b.json
+++ b/cedar-integration-tests/corpus_tests/97e5ea8110fd942a8aff42be1e4b8d1f7ad9e98b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/97ecdb5a989451af145fda48ed60b28661bf1130.json b/cedar-integration-tests/corpus_tests/97ecdb5a989451af145fda48ed60b28661bf1130.json
index ab20567b4..dbe6cc037 100644
--- a/cedar-integration-tests/corpus_tests/97ecdb5a989451af145fda48ed60b28661bf1130.json
+++ b/cedar-integration-tests/corpus_tests/97ecdb5a989451af145fda48ed60b28661bf1130.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0]\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0]\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000]"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0]\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0]\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000]"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0]\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0]\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000]"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0]\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0]\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000]"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0]\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0]\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000]"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0]\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0]\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000]"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0]\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0]\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000]"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0]\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0]\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000]"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000]"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/981cee9e86297375f8bca3b9b1e9b4fc7124dfd0.json b/cedar-integration-tests/corpus_tests/981cee9e86297375f8bca3b9b1e9b4fc7124dfd0.json
index 96f5a7845..5f7ba50f8 100644
--- a/cedar-integration-tests/corpus_tests/981cee9e86297375f8bca3b9b1e9b4fc7124dfd0.json
+++ b/cedar-integration-tests/corpus_tests/981cee9e86297375f8bca3b9b1e9b4fc7124dfd0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\0\\0+\\0\\0\\0\\0\\0\\0\\0\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0000\u0000+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/9868018f65ba67ab04238d0cd84e657bcfd2e4c2.json b/cedar-integration-tests/corpus_tests/9868018f65ba67ab04238d0cd84e657bcfd2e4c2.json
index b9fa83223..dcaca0011 100644
--- a/cedar-integration-tests/corpus_tests/9868018f65ba67ab04238d0cd84e657bcfd2e4c2.json
+++ b/cedar-integration-tests/corpus_tests/9868018f65ba67ab04238d0cd84e657bcfd2e4c2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/98982aa2b2130d3ad1060fd3b7d2a541064bc614.json b/cedar-integration-tests/corpus_tests/98982aa2b2130d3ad1060fd3b7d2a541064bc614.json
index a1a9134b7..e6d481175 100644
--- a/cedar-integration-tests/corpus_tests/98982aa2b2130d3ad1060fd3b7d2a541064bc614.json
+++ b/cedar-integration-tests/corpus_tests/98982aa2b2130d3ad1060fd3b7d2a541064bc614.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -17,8 +20,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -27,8 +33,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -37,8 +46,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -47,8 +59,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -57,8 +72,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -67,8 +85,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -77,8 +98,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/98e6e486d0a985498b74fb69703ff9dbe397e965.json b/cedar-integration-tests/corpus_tests/98e6e486d0a985498b74fb69703ff9dbe397e965.json
index ff1120ece..345482bc8 100644
--- a/cedar-integration-tests/corpus_tests/98e6e486d0a985498b74fb69703ff9dbe397e965.json
+++ b/cedar-integration-tests/corpus_tests/98e6e486d0a985498b74fb69703ff9dbe397e965.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"/gqrcJ[\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "/gqrcJ["
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/98f3835b005fb616280bc6d6e1e2c62fed2655af.json b/cedar-integration-tests/corpus_tests/98f3835b005fb616280bc6d6e1e2c62fed2655af.json
index 94af0e443..d5787132c 100644
--- a/cedar-integration-tests/corpus_tests/98f3835b005fb616280bc6d6e1e2c62fed2655af.json
+++ b/cedar-integration-tests/corpus_tests/98f3835b005fb616280bc6d6e1e2c62fed2655af.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::r::r::r::r::r::F_w33w33::a::\"\"",
-      "action": "r::r::r::r::r::r::r::F_w33w33::Action::\"action\"",
-      "resource": "r::r::r::r::r::r::r::F_w33w33::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::r::r::r::r::r::F_w33w33::a::\"\"",
-      "action": "r::r::r::r::r::r::r::F_w33w33::Action::\"action\"",
-      "resource": "r::r::r::r::r::r::r::F_w33w33::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::r::r::r::r::r::F_w33w33::a::\"\"",
-      "action": "r::r::r::r::r::r::r::F_w33w33::Action::\"action\"",
-      "resource": "r::r::r::r::r::r::r::F_w33w33::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::r::r::r::r::r::F_w33w33::a::\"\"",
-      "action": "r::r::r::r::r::r::r::F_w33w33::Action::\"action\"",
-      "resource": "r::r::r::r::r::r::r::F_w33w33::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::r::r::r::r::r::F_w33w33::a::\"\"",
-      "action": "r::r::r::r::r::r::r::F_w33w33::Action::\"action\"",
-      "resource": "r::r::r::r::r::r::r::F_w33w33::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::r::r::r::r::r::F_w33w33::a::\"\"",
-      "action": "r::r::r::r::r::r::r::F_w33w33::Action::\"action\"",
-      "resource": "r::r::r::r::r::r::r::F_w33w33::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::r::r::r::r::r::F_w33w33::a::\"\"",
-      "action": "r::r::r::r::r::r::r::F_w33w33::Action::\"action\"",
-      "resource": "r::r::r::r::r::r::r::F_w33w33::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::r::r::r::r::r::F_w33w33::a::\"\"",
-      "action": "r::r::r::r::r::r::r::F_w33w33::Action::\"action\"",
-      "resource": "r::r::r::r::r::r::r::F_w33w33::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r::r::r::F_w33w33::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/998e5a35bee62922f12dbacd1a07dd34007dddb7.json b/cedar-integration-tests/corpus_tests/998e5a35bee62922f12dbacd1a07dd34007dddb7.json
index 7569e0490..67967bd6b 100644
--- a/cedar-integration-tests/corpus_tests/998e5a35bee62922f12dbacd1a07dd34007dddb7.json
+++ b/cedar-integration-tests/corpus_tests/998e5a35bee62922f12dbacd1a07dd34007dddb7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{12}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{12}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0012\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0012\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{12}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{12}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0012\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0012\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{12}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{12}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0012\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0012\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{12}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{12}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0012\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0012\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{12}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{12}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0012\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0012\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{12}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{12}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0012\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0012\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{12}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{12}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0012\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0012\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{12}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{12}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0012\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0012\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/99a86fcf921d0ab33f03b7f1e0f2d5c383cde36c.json b/cedar-integration-tests/corpus_tests/99a86fcf921d0ab33f03b7f1e0f2d5c383cde36c.json
index de230bc80..79405b276 100644
--- a/cedar-integration-tests/corpus_tests/99a86fcf921d0ab33f03b7f1e0f2d5c383cde36c.json
+++ b/cedar-integration-tests/corpus_tests/99a86fcf921d0ab33f03b7f1e0f2d5c383cde36c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"a\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"a\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "a\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "a\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"a\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"a\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "a\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "a\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"a\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"a\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "a\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "a\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"a\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"a\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "a\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "a\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"a\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"a\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "a\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "a\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"a\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"a\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "a\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "a\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"a\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"a\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "a\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "a\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"a\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"a\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "a\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "a\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/99ce7b14b784766a659aab7a7a49ac3ca2dfdf54.json b/cedar-integration-tests/corpus_tests/99ce7b14b784766a659aab7a7a49ac3ca2dfdf54.json
index e7dc60f8a..f0f3493eb 100644
--- a/cedar-integration-tests/corpus_tests/99ce7b14b784766a659aab7a7a49ac3ca2dfdf54.json
+++ b/cedar-integration-tests/corpus_tests/99ce7b14b784766a659aab7a7a49ac3ca2dfdf54.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Gtxxx10g0::a::\";\"",
-      "action": "Gtxxx10g0::Action::\"action\"",
-      "resource": "Gtxxx10g0::a::\";\"",
+      "principal": {
+        "type": "Gtxxx10g0::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "Gtxxx10g0::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Gtxxx10g0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Gtxxx10g0::a::\"\"",
-      "action": "Gtxxx10g0::Action::\"action\"",
-      "resource": "Gtxxx10g0::a::\";\"",
+      "principal": {
+        "type": "Gtxxx10g0::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gtxxx10g0::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Gtxxx10g0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Gtxxx10g0::a::\";\"",
-      "action": "Gtxxx10g0::Action::\"action\"",
-      "resource": "Gtxxx10g0::a::\";\"",
+      "principal": {
+        "type": "Gtxxx10g0::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "Gtxxx10g0::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Gtxxx10g0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Gtxxx10g0::a::\";\"",
-      "action": "Gtxxx10g0::Action::\"action\"",
-      "resource": "Gtxxx10g0::a::\";\"",
+      "principal": {
+        "type": "Gtxxx10g0::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "Gtxxx10g0::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Gtxxx10g0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Gtxxx10g0::a::\";\"",
-      "action": "Gtxxx10g0::Action::\"action\"",
-      "resource": "Gtxxx10g0::a::\";\"",
+      "principal": {
+        "type": "Gtxxx10g0::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "Gtxxx10g0::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Gtxxx10g0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Gtxxx10g0::a::\";\"",
-      "action": "Gtxxx10g0::Action::\"action\"",
-      "resource": "Gtxxx10g0::a::\";\"",
+      "principal": {
+        "type": "Gtxxx10g0::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "Gtxxx10g0::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Gtxxx10g0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Gtxxx10g0::a::\";\"",
-      "action": "Gtxxx10g0::Action::\"action\"",
-      "resource": "Gtxxx10g0::a::\";\"",
+      "principal": {
+        "type": "Gtxxx10g0::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "Gtxxx10g0::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Gtxxx10g0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Gtxxx10g0::a::\";\"",
-      "action": "Gtxxx10g0::Action::\"action\"",
-      "resource": "Gtxxx10g0::a::\";\"",
+      "principal": {
+        "type": "Gtxxx10g0::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "Gtxxx10g0::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Gtxxx10g0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/99d7bbfdb6e920b94e2f5940ae498c088336d67f.json b/cedar-integration-tests/corpus_tests/99d7bbfdb6e920b94e2f5940ae498c088336d67f.json
index 008292789..40a088ce6 100644
--- a/cedar-integration-tests/corpus_tests/99d7bbfdb6e920b94e2f5940ae498c088336d67f.json
+++ b/cedar-integration-tests/corpus_tests/99d7bbfdb6e920b94e2f5940ae498c088336d67f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9a40d7aee36713f1a63f2b91c444e013949f1cf0.json b/cedar-integration-tests/corpus_tests/9a40d7aee36713f1a63f2b91c444e013949f1cf0.json
index 62e5fccb4..a34efbfeb 100644
--- a/cedar-integration-tests/corpus_tests/9a40d7aee36713f1a63f2b91c444e013949f1cf0.json
+++ b/cedar-integration-tests/corpus_tests/9a40d7aee36713f1a63f2b91c444e013949f1cf0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r333AJJJNJ::a::\"R\"",
-      "action": "r333AJJJNJ::Action::\"action\"",
-      "resource": "r333AJJJNJ::a::\"R\"",
+      "principal": {
+        "type": "r333AJJJNJ::a",
+        "id": "R"
+      },
+      "resource": {
+        "type": "r333AJJJNJ::a",
+        "id": "R"
+      },
+      "action": {
+        "type": "r333AJJJNJ::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r333AJJJNJ::a::\"R\"",
-      "action": "r333AJJJNJ::Action::\"action\"",
-      "resource": "r333AJJJNJ::a::\"R\"",
+      "principal": {
+        "type": "r333AJJJNJ::a",
+        "id": "R"
+      },
+      "resource": {
+        "type": "r333AJJJNJ::a",
+        "id": "R"
+      },
+      "action": {
+        "type": "r333AJJJNJ::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r333AJJJNJ::a::\"R\"",
-      "action": "r333AJJJNJ::Action::\"action\"",
-      "resource": "r333AJJJNJ::a::\"R\"",
+      "principal": {
+        "type": "r333AJJJNJ::a",
+        "id": "R"
+      },
+      "resource": {
+        "type": "r333AJJJNJ::a",
+        "id": "R"
+      },
+      "action": {
+        "type": "r333AJJJNJ::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r333AJJJNJ::a::\"R\"",
-      "action": "r333AJJJNJ::Action::\"action\"",
-      "resource": "r333AJJJNJ::a::\"R\"",
+      "principal": {
+        "type": "r333AJJJNJ::a",
+        "id": "R"
+      },
+      "resource": {
+        "type": "r333AJJJNJ::a",
+        "id": "R"
+      },
+      "action": {
+        "type": "r333AJJJNJ::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r333AJJJNJ::a::\"R\"",
-      "action": "r333AJJJNJ::Action::\"action\"",
-      "resource": "r333AJJJNJ::a::\"R\"",
+      "principal": {
+        "type": "r333AJJJNJ::a",
+        "id": "R"
+      },
+      "resource": {
+        "type": "r333AJJJNJ::a",
+        "id": "R"
+      },
+      "action": {
+        "type": "r333AJJJNJ::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r333AJJJNJ::a::\"R\"",
-      "action": "r333AJJJNJ::Action::\"action\"",
-      "resource": "r333AJJJNJ::a::\"R\"",
+      "principal": {
+        "type": "r333AJJJNJ::a",
+        "id": "R"
+      },
+      "resource": {
+        "type": "r333AJJJNJ::a",
+        "id": "R"
+      },
+      "action": {
+        "type": "r333AJJJNJ::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r333AJJJNJ::a::\"R\"",
-      "action": "r333AJJJNJ::Action::\"action\"",
-      "resource": "r333AJJJNJ::a::\"R\"",
+      "principal": {
+        "type": "r333AJJJNJ::a",
+        "id": "R"
+      },
+      "resource": {
+        "type": "r333AJJJNJ::a",
+        "id": "R"
+      },
+      "action": {
+        "type": "r333AJJJNJ::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r333AJJJNJ::a::\"R\"",
-      "action": "r333AJJJNJ::Action::\"action\"",
-      "resource": "r333AJJJNJ::a::\"R\"",
+      "principal": {
+        "type": "r333AJJJNJ::a",
+        "id": "R"
+      },
+      "resource": {
+        "type": "r333AJJJNJ::a",
+        "id": "R"
+      },
+      "action": {
+        "type": "r333AJJJNJ::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/9a4ddcb2e4023e402af8cfe7ca253b756bccffa4.json b/cedar-integration-tests/corpus_tests/9a4ddcb2e4023e402af8cfe7ca253b756bccffa4.json
index 039287911..c80d226fa 100644
--- a/cedar-integration-tests/corpus_tests/9a4ddcb2e4023e402af8cfe7ca253b756bccffa4.json
+++ b/cedar-integration-tests/corpus_tests/9a4ddcb2e4023e402af8cfe7ca253b756bccffa4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlqsllkYlY": "",
         "Dclrl000zzzzzz000": ""
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlqsllkYlY": "",
         "Dclrl000zzzzzz000": ""
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlqsllkYlY": "",
         "Dclrl000zzzzzz000": ""
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlqsllkYlY": "",
         "Dclrl000zzzzzz000": ""
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlqsllkYlY": "",
         "Dclrl000zzzzzz000": ""
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlqsllkYlY": "",
         "Dclrl000zzzzzz000": ""
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlqsllkYlY": "",
         "Dclrl000zzzzzz000": ""
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlqsllkYlY": "",
         "Dclrl000zzzzzz000": ""
diff --git a/cedar-integration-tests/corpus_tests/9a616543bd8998923ac6f94a910800990ab0ecb8.json b/cedar-integration-tests/corpus_tests/9a616543bd8998923ac6f94a910800990ab0ecb8.json
index 81ba377d2..01eb02adc 100644
--- a/cedar-integration-tests/corpus_tests/9a616543bd8998923ac6f94a910800990ab0ecb8.json
+++ b/cedar-integration-tests/corpus_tests/9a616543bd8998923ac6f94a910800990ab0ecb8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"b600\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b600\"",
+      "principal": {
+        "type": "a",
+        "id": "b600"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b600"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A00": "0"
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"b600\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b600\"",
+      "principal": {
+        "type": "a",
+        "id": "b600"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b600"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A00": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"b600\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b600\"",
+      "principal": {
+        "type": "a",
+        "id": "b600"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b600"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A00": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"b600\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b600\"",
+      "principal": {
+        "type": "a",
+        "id": "b600"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b600"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A00": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"b600\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b600\"",
+      "principal": {
+        "type": "a",
+        "id": "b600"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b600"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A00": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"b600\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b600\"",
+      "principal": {
+        "type": "a",
+        "id": "b600"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b600"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A00": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"b600\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b600\"",
+      "principal": {
+        "type": "a",
+        "id": "b600"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b600"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A00": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"b600\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b600\"",
+      "principal": {
+        "type": "a",
+        "id": "b600"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b600"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A00": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/9a6a17759f9a7ae0dbe084623918cbcb1325b548.json b/cedar-integration-tests/corpus_tests/9a6a17759f9a7ae0dbe084623918cbcb1325b548.json
index 8ca5ebdb7..8faad3b61 100644
--- a/cedar-integration-tests/corpus_tests/9a6a17759f9a7ae0dbe084623918cbcb1325b548.json
+++ b/cedar-integration-tests/corpus_tests/9a6a17759f9a7ae0dbe084623918cbcb1325b548.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{13}\"",
-      "action": "Action::\"\\u{11}\\u{11}\\u{11}\\u{11}\\u{1}\"",
-      "resource": "a::\"\\u{13}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0013"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0013"
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0011\u0011\u0011\u0011\u0001"
+      },
       "context": {
         "VSjj0": false
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{13}\"",
-      "action": "Action::\"\\u{11}\\u{11}\\u{11}\\u{11}\\u{1}\"",
-      "resource": "a::\"\\u{13}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0013"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0013"
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0011\u0011\u0011\u0011\u0001"
+      },
       "context": {
         "VSjj0": false
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{13}\"",
-      "action": "Action::\"\\u{11}\\u{11}\\u{11}\\u{11}\\u{1}\"",
-      "resource": "a::\"\\u{13}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0013"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0013"
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0011\u0011\u0011\u0011\u0001"
+      },
       "context": {
         "VSjj0": false
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{13}\"",
-      "action": "Action::\"\\u{11}\\u{11}\\u{11}\\u{11}\\u{1}\"",
-      "resource": "a::\"\\u{13}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0013"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0013"
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0011\u0011\u0011\u0011\u0001"
+      },
       "context": {
         "VSjj0": false
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{13}\"",
-      "action": "Action::\"\\u{11}\\u{11}\\u{11}\\u{11}\\u{1}\"",
-      "resource": "a::\"\\u{13}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0013"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0013"
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0011\u0011\u0011\u0011\u0001"
+      },
       "context": {
         "VSjj0": false
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{13}\"",
-      "action": "Action::\"\\u{11}\\u{11}\\u{11}\\u{11}\\u{1}\"",
-      "resource": "a::\"\\u{13}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0013"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0013"
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0011\u0011\u0011\u0011\u0001"
+      },
       "context": {
         "VSjj0": false
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{13}\"",
-      "action": "Action::\"\\u{11}\\u{11}\\u{11}\\u{11}\\u{1}\"",
-      "resource": "a::\"\\u{13}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0013"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0013"
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0011\u0011\u0011\u0011\u0001"
+      },
       "context": {
         "VSjj0": false
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{13}\"",
-      "action": "Action::\"\\u{11}\\u{11}\\u{11}\\u{11}\\u{1}\"",
-      "resource": "a::\"\\u{13}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0013"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0013"
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0011\u0011\u0011\u0011\u0001"
+      },
       "context": {
         "VSjj0": false
       },
diff --git a/cedar-integration-tests/corpus_tests/9a7d899ba65717065b83bce346b0c53e57fdc164.json b/cedar-integration-tests/corpus_tests/9a7d899ba65717065b83bce346b0c53e57fdc164.json
index 2f1288299..2da3d5b20 100644
--- a/cedar-integration-tests/corpus_tests/9a7d899ba65717065b83bce346b0c53e57fdc164.json
+++ b/cedar-integration-tests/corpus_tests/9a7d899ba65717065b83bce346b0c53e57fdc164.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"K\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"K\"",
+      "principal": {
+        "type": "a",
+        "id": "K"
+      },
+      "resource": {
+        "type": "a",
+        "id": "K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"K\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"K\"",
+      "principal": {
+        "type": "a",
+        "id": "K"
+      },
+      "resource": {
+        "type": "a",
+        "id": "K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"K\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"K\"",
+      "principal": {
+        "type": "a",
+        "id": "K"
+      },
+      "resource": {
+        "type": "a",
+        "id": "K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"K\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"K\"",
+      "principal": {
+        "type": "a",
+        "id": "K"
+      },
+      "resource": {
+        "type": "a",
+        "id": "K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"K\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"K\"",
+      "principal": {
+        "type": "a",
+        "id": "K"
+      },
+      "resource": {
+        "type": "a",
+        "id": "K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"K\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"K\"",
+      "principal": {
+        "type": "a",
+        "id": "K"
+      },
+      "resource": {
+        "type": "a",
+        "id": "K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"K\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"K\"",
+      "principal": {
+        "type": "a",
+        "id": "K"
+      },
+      "resource": {
+        "type": "a",
+        "id": "K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"K\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"K\"",
+      "principal": {
+        "type": "a",
+        "id": "K"
+      },
+      "resource": {
+        "type": "a",
+        "id": "K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/9ae2a4802b9d0889173964d21b2a63126f31d94f.json b/cedar-integration-tests/corpus_tests/9ae2a4802b9d0889173964d21b2a63126f31d94f.json
index a15dcfae3..907a2e69e 100644
--- a/cedar-integration-tests/corpus_tests/9ae2a4802b9d0889173964d21b2a63126f31d94f.json
+++ b/cedar-integration-tests/corpus_tests/9ae2a4802b9d0889173964d21b2a63126f31d94f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9af390b61a62b2ee11318ec317eb252b6ee223f9.json b/cedar-integration-tests/corpus_tests/9af390b61a62b2ee11318ec317eb252b6ee223f9.json
index 797179095..cd23a4b8c 100644
--- a/cedar-integration-tests/corpus_tests/9af390b61a62b2ee11318ec317eb252b6ee223f9.json
+++ b/cedar-integration-tests/corpus_tests/9af390b61a62b2ee11318ec317eb252b6ee223f9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0010\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{10}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0010\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0010\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{10}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0010\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0010\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{10}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0010\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0010\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{10}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0010\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0010\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{10}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0010\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0010\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{10}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0010\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0010\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{10}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0010\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0010\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9b0014bb61edcb995cd44da5fd160c6639fa0ccb.json b/cedar-integration-tests/corpus_tests/9b0014bb61edcb995cd44da5fd160c6639fa0ccb.json
index 4c034858b..b3f59bdf9 100644
--- a/cedar-integration-tests/corpus_tests/9b0014bb61edcb995cd44da5fd160c6639fa0ccb.json
+++ b/cedar-integration-tests/corpus_tests/9b0014bb61edcb995cd44da5fd160c6639fa0ccb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/9b036e2436000e32c831a68ab5e8ab38102b910b.json b/cedar-integration-tests/corpus_tests/9b036e2436000e32c831a68ab5e8ab38102b910b.json
index ebccbbc0a..40214873a 100644
--- a/cedar-integration-tests/corpus_tests/9b036e2436000e32c831a68ab5e8ab38102b910b.json
+++ b/cedar-integration-tests/corpus_tests/9b036e2436000e32c831a68ab5e8ab38102b910b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0::\\0:::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0::\\0:::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000::\u0000:::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000::\u0000:::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0::\\0:::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0::\\0:::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000::\u0000:::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000::\u0000:::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0::\\0:::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0::\\0:::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000::\u0000:::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000::\u0000:::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0::\\0:::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0::\\0:::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000::\u0000:::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000::\u0000:::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0::\\0:::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0::\\0:::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000::\u0000:::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000::\u0000:::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0::\\0:::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0::\\0:::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000::\u0000:::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000::\u0000:::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0::\\0:::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0::\\0:::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000::\u0000:::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000::\u0000:::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0::\\0:::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0::\\0:::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000::\u0000:::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000::\u0000:::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/9b55589e73bf3330a31b529138b4a61a0a5918e0.json b/cedar-integration-tests/corpus_tests/9b55589e73bf3330a31b529138b4a61a0a5918e0.json
index c3e7b4438..ab494ab43 100644
--- a/cedar-integration-tests/corpus_tests/9b55589e73bf3330a31b529138b4a61a0a5918e0.json
+++ b/cedar-integration-tests/corpus_tests/9b55589e73bf3330a31b529138b4a61a0a5918e0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000j"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9b5808be68fa4ade27c2dd719d8d3bed024c0efb.json b/cedar-integration-tests/corpus_tests/9b5808be68fa4ade27c2dd719d8d3bed024c0efb.json
index 71fc10f1c..fc38c7d10 100644
--- a/cedar-integration-tests/corpus_tests/9b5808be68fa4ade27c2dd719d8d3bed024c0efb.json
+++ b/cedar-integration-tests/corpus_tests/9b5808be68fa4ade27c2dd719d8d3bed024c0efb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vYh": {
           "__entity": {
@@ -31,9 +40,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vYh": {
           "__entity": {
@@ -56,9 +74,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vYh": {
           "__entity": {
@@ -81,9 +108,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vYh": {
           "__entity": {
@@ -106,9 +142,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vYh": {
           "__entity": {
@@ -131,9 +176,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vYh": {
           "__entity": {
@@ -156,9 +210,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vYh": {
           "__entity": {
@@ -181,9 +244,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "vYh": {
           "__entity": {
diff --git a/cedar-integration-tests/corpus_tests/9bc9b8dc68881102f184363b5b6df6153a2ff5fe.json b/cedar-integration-tests/corpus_tests/9bc9b8dc68881102f184363b5b6df6153a2ff5fe.json
index e8c5de023..fc7542d74 100644
--- a/cedar-integration-tests/corpus_tests/9bc9b8dc68881102f184363b5b6df6153a2ff5fe.json
+++ b/cedar-integration-tests/corpus_tests/9bc9b8dc68881102f184363b5b6df6153a2ff5fe.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "m85www::a::\":cʌto\"",
-      "action": "m85www::Action::\"action\"",
-      "resource": "m85www::a::\":cʌto\"",
+      "principal": {
+        "type": "m85www::a",
+        "id": ":cʌto"
+      },
+      "resource": {
+        "type": "m85www::a",
+        "id": ":cʌto"
+      },
+      "action": {
+        "type": "m85www::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "m85www::a::\":cʌto\"",
-      "action": "m85www::Action::\"action\"",
-      "resource": "m85www::a::\":cʌto\"",
+      "principal": {
+        "type": "m85www::a",
+        "id": ":cʌto"
+      },
+      "resource": {
+        "type": "m85www::a",
+        "id": ":cʌto"
+      },
+      "action": {
+        "type": "m85www::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "m85www::a::\":cʌto\"",
-      "action": "m85www::Action::\"action\"",
-      "resource": "m85www::a::\":cʌto\"",
+      "principal": {
+        "type": "m85www::a",
+        "id": ":cʌto"
+      },
+      "resource": {
+        "type": "m85www::a",
+        "id": ":cʌto"
+      },
+      "action": {
+        "type": "m85www::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "m85www::a::\":cʌto\"",
-      "action": "m85www::Action::\"action\"",
-      "resource": "m85www::a::\":cʌto\"",
+      "principal": {
+        "type": "m85www::a",
+        "id": ":cʌto"
+      },
+      "resource": {
+        "type": "m85www::a",
+        "id": ":cʌto"
+      },
+      "action": {
+        "type": "m85www::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "m85www::a::\":cʌto\"",
-      "action": "m85www::Action::\"action\"",
-      "resource": "m85www::a::\":cʌto\"",
+      "principal": {
+        "type": "m85www::a",
+        "id": ":cʌto"
+      },
+      "resource": {
+        "type": "m85www::a",
+        "id": ":cʌto"
+      },
+      "action": {
+        "type": "m85www::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "m85www::a::\":cʌto\"",
-      "action": "m85www::Action::\"action\"",
-      "resource": "m85www::a::\":cʌto\"",
+      "principal": {
+        "type": "m85www::a",
+        "id": ":cʌto"
+      },
+      "resource": {
+        "type": "m85www::a",
+        "id": ":cʌto"
+      },
+      "action": {
+        "type": "m85www::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "m85www::a::\":cʌto\"",
-      "action": "m85www::Action::\"action\"",
-      "resource": "m85www::a::\":cʌto\"",
+      "principal": {
+        "type": "m85www::a",
+        "id": ":cʌto"
+      },
+      "resource": {
+        "type": "m85www::a",
+        "id": ":cʌto"
+      },
+      "action": {
+        "type": "m85www::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "m85www::a::\":cʌto\"",
-      "action": "m85www::Action::\"action\"",
-      "resource": "m85www::a::\":cʌto\"",
+      "principal": {
+        "type": "m85www::a",
+        "id": ":cʌto"
+      },
+      "resource": {
+        "type": "m85www::a",
+        "id": ":cʌto"
+      },
+      "action": {
+        "type": "m85www::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/9c21d76e68dfe77e5d919f373e1ca270092f0b14.json b/cedar-integration-tests/corpus_tests/9c21d76e68dfe77e5d919f373e1ca270092f0b14.json
index 85c25cb63..671d6eb4f 100644
--- a/cedar-integration-tests/corpus_tests/9c21d76e68dfe77e5d919f373e1ca270092f0b14.json
+++ b/cedar-integration-tests/corpus_tests/9c21d76e68dfe77e5d919f373e1ca270092f0b14.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -17,8 +20,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -27,8 +33,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +45,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\" \\0\\0\"",
-      "action": "Action::\"j\"",
-      "resource": "a::\" \\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": " \u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": " \u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "j"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -49,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +79,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\" \\0\\0\"",
-      "action": "Action::\"j\"",
-      "resource": "a::\" \\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": " \u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": " \u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "j"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -70,9 +100,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\" \\0\\0\"",
-      "action": "Action::\"j\"",
-      "resource": "a::\" \\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": " \u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": " \u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "j"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -82,9 +121,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\" \\0\\0\"",
-      "action": "Action::\"j\"",
-      "resource": "a::\" \\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": " \u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": " \u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "j"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/9c3735b65cac7bbeb208a71005493bc36f3c3dbb.json b/cedar-integration-tests/corpus_tests/9c3735b65cac7bbeb208a71005493bc36f3c3dbb.json
index f2af682fc..62aa3208f 100644
--- a/cedar-integration-tests/corpus_tests/9c3735b65cac7bbeb208a71005493bc36f3c3dbb.json
+++ b/cedar-integration-tests/corpus_tests/9c3735b65cac7bbeb208a71005493bc36f3c3dbb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"l\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "l"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/9cad48f121661b1f12380de738bb9e52d98c5f6a.json b/cedar-integration-tests/corpus_tests/9cad48f121661b1f12380de738bb9e52d98c5f6a.json
index ed80dc7b6..b644e1972 100644
--- a/cedar-integration-tests/corpus_tests/9cad48f121661b1f12380de738bb9e52d98c5f6a.json
+++ b/cedar-integration-tests/corpus_tests/9cad48f121661b1f12380de738bb9e52d98c5f6a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"/ja\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/ja"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9cbfe496d6bf481368f0dc5de0a9992f17276db2.json b/cedar-integration-tests/corpus_tests/9cbfe496d6bf481368f0dc5de0a9992f17276db2.json
index 32f3c17ef..e08427455 100644
--- a/cedar-integration-tests/corpus_tests/9cbfe496d6bf481368f0dc5de0a9992f17276db2.json
+++ b/cedar-integration-tests/corpus_tests/9cbfe496d6bf481368f0dc5de0a9992f17276db2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9ce497ef6011984bdf055e29fad4bfe660e82bd9.json b/cedar-integration-tests/corpus_tests/9ce497ef6011984bdf055e29fad4bfe660e82bd9.json
index faf2dde9b..a04286af3 100644
--- a/cedar-integration-tests/corpus_tests/9ce497ef6011984bdf055e29fad4bfe660e82bd9.json
+++ b/cedar-integration-tests/corpus_tests/9ce497ef6011984bdf055e29fad4bfe660e82bd9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "B00Rw": {
           "": "",
@@ -27,9 +36,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "B00Rw": {
           "": "",
@@ -48,9 +66,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "B00Rw": {
           "": "",
@@ -69,9 +96,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "B00Rw": {
           "": "",
@@ -90,9 +126,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "B00Rw": {
           "": "",
@@ -111,9 +156,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "B00Rw": {
           "": "",
@@ -132,9 +186,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "B00Rw": {
           "": "",
@@ -153,9 +216,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "n::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "n::\"\"",
+      "principal": {
+        "type": "n",
+        "id": ""
+      },
+      "resource": {
+        "type": "n",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "B00Rw": {
           "": "",
diff --git a/cedar-integration-tests/corpus_tests/9d055ffb9a194011c48662c8392cb91f0b1c4fc2.json b/cedar-integration-tests/corpus_tests/9d055ffb9a194011c48662c8392cb91f0b1c4fc2.json
index 2084e7a43..ec5e577e9 100644
--- a/cedar-integration-tests/corpus_tests/9d055ffb9a194011c48662c8392cb91f0b1c4fc2.json
+++ b/cedar-integration-tests/corpus_tests/9d055ffb9a194011c48662c8392cb91f0b1c4fc2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"fff:::::::::ffff\\u{3}\\0\\0\\0\\0r\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fff:::::::::ffff\\u{3}\\0\\0\\0\\0r\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "fff:::::::::ffff\u0003\u0000\u0000\u0000\u0000r\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fff:::::::::ffff\u0003\u0000\u0000\u0000\u0000r\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"fff:::::::::ffff\\u{3}\\0\\0\\0\\0r\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fff:::::::::ffff\\u{3}\\0\\0\\0\\0r\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "fff:::::::::ffff\u0003\u0000\u0000\u0000\u0000r\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fff:::::::::ffff\u0003\u0000\u0000\u0000\u0000r\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"fff:::::::::ffff\\u{3}\\0\\0\\0\\0r\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fff:::::::::ffff\\u{3}\\0\\0\\0\\0r\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "fff:::::::::ffff\u0003\u0000\u0000\u0000\u0000r\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fff:::::::::ffff\u0003\u0000\u0000\u0000\u0000r\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"fff:::::::::ffff\\u{3}\\0\\0\\0\\0r\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fff:::::::::ffff\\u{3}\\0\\0\\0\\0r\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "fff:::::::::ffff\u0003\u0000\u0000\u0000\u0000r\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fff:::::::::ffff\u0003\u0000\u0000\u0000\u0000r\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"fff:::::::::ffff\\u{3}\\0\\0\\0\\0r\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fff:::::::::ffff\\u{3}\\0\\0\\0\\0r\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "fff:::::::::ffff\u0003\u0000\u0000\u0000\u0000r\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fff:::::::::ffff\u0003\u0000\u0000\u0000\u0000r\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"fff:::::::::ffff\\u{3}\\0\\0\\0\\0r\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fff:::::::::ffff\\u{3}\\0\\0\\0\\0r\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "fff:::::::::ffff\u0003\u0000\u0000\u0000\u0000r\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fff:::::::::ffff\u0003\u0000\u0000\u0000\u0000r\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"fff:::::::::ffff\\u{3}\\0\\0\\0\\0r\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fff:::::::::ffff\\u{3}\\0\\0\\0\\0r\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "fff:::::::::ffff\u0003\u0000\u0000\u0000\u0000r\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fff:::::::::ffff\u0003\u0000\u0000\u0000\u0000r\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"fff:::::::::ffff\\u{3}\\0\\0\\0\\0r\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fff:::::::::ffff\\u{3}\\0\\0\\0\\0r\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "fff:::::::::ffff\u0003\u0000\u0000\u0000\u0000r\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fff:::::::::ffff\u0003\u0000\u0000\u0000\u0000r\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/9d0a212b70378bf1433d4b49c52df64c1398b8cd.json b/cedar-integration-tests/corpus_tests/9d0a212b70378bf1433d4b49c52df64c1398b8cd.json
index 48b708661..f29b7dbc0 100644
--- a/cedar-integration-tests/corpus_tests/9d0a212b70378bf1433d4b49c52df64c1398b8cd.json
+++ b/cedar-integration-tests/corpus_tests/9d0a212b70378bf1433d4b49c52df64c1398b8cd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9d1dac4b5e28cc86db794732f1a2db6be9e18a0e.json b/cedar-integration-tests/corpus_tests/9d1dac4b5e28cc86db794732f1a2db6be9e18a0e.json
index 0c89e69df..c9b78ced7 100644
--- a/cedar-integration-tests/corpus_tests/9d1dac4b5e28cc86db794732f1a2db6be9e18a0e.json
+++ b/cedar-integration-tests/corpus_tests/9d1dac4b5e28cc86db794732f1a2db6be9e18a0e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9d404dc752902d853fcb2b9491ea8943edaad795.json b/cedar-integration-tests/corpus_tests/9d404dc752902d853fcb2b9491ea8943edaad795.json
index e8e7b5bcb..28ced24f8 100644
--- a/cedar-integration-tests/corpus_tests/9d404dc752902d853fcb2b9491ea8943edaad795.json
+++ b/cedar-integration-tests/corpus_tests/9d404dc752902d853fcb2b9491ea8943edaad795.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9d4ca98f581b4ef94b815572be787be546d99ce9.json b/cedar-integration-tests/corpus_tests/9d4ca98f581b4ef94b815572be787be546d99ce9.json
index 5ca980df7..5bfd392c1 100644
--- a/cedar-integration-tests/corpus_tests/9d4ca98f581b4ef94b815572be787be546d99ce9.json
+++ b/cedar-integration-tests/corpus_tests/9d4ca98f581b4ef94b815572be787be546d99ce9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9d64c8d70fd82c5552208d45ae72c69f11f598d8.json b/cedar-integration-tests/corpus_tests/9d64c8d70fd82c5552208d45ae72c69f11f598d8.json
index 9b05f9e80..56e0f150e 100644
--- a/cedar-integration-tests/corpus_tests/9d64c8d70fd82c5552208d45ae72c69f11f598d8.json
+++ b/cedar-integration-tests/corpus_tests/9d64c8d70fd82c5552208d45ae72c69f11f598d8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "FwwSw7::\":::b::\"",
-      "action": "Action::\"action\"",
-      "resource": "FwwSw7::\":::b::\"",
+      "principal": {
+        "type": "FwwSw7",
+        "id": ":::b::"
+      },
+      "resource": {
+        "type": "FwwSw7",
+        "id": ":::b::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "FwwSw7::\":::b::\"",
-      "action": "Action::\"action\"",
-      "resource": "FwwSw7::\":::b::\"",
+      "principal": {
+        "type": "FwwSw7",
+        "id": ":::b::"
+      },
+      "resource": {
+        "type": "FwwSw7",
+        "id": ":::b::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "FwwSw7::\":::b::\"",
-      "action": "Action::\"action\"",
-      "resource": "FwwSw7::\":::b::\"",
+      "principal": {
+        "type": "FwwSw7",
+        "id": ":::b::"
+      },
+      "resource": {
+        "type": "FwwSw7",
+        "id": ":::b::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "FwwSw7::\":::b::\"",
-      "action": "Action::\"action\"",
-      "resource": "FwwSw7::\":::b::\"",
+      "principal": {
+        "type": "FwwSw7",
+        "id": ":::b::"
+      },
+      "resource": {
+        "type": "FwwSw7",
+        "id": ":::b::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "FwwSw7::\":::b::\"",
-      "action": "Action::\"action\"",
-      "resource": "FwwSw7::\":::b::\"",
+      "principal": {
+        "type": "FwwSw7",
+        "id": ":::b::"
+      },
+      "resource": {
+        "type": "FwwSw7",
+        "id": ":::b::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "FwwSw7::\":::b::\"",
-      "action": "Action::\"action\"",
-      "resource": "FwwSw7::\":::b::\"",
+      "principal": {
+        "type": "FwwSw7",
+        "id": ":::b::"
+      },
+      "resource": {
+        "type": "FwwSw7",
+        "id": ":::b::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "FwwSw7::\":::b::\"",
-      "action": "Action::\"action\"",
-      "resource": "FwwSw7::\":::b::\"",
+      "principal": {
+        "type": "FwwSw7",
+        "id": ":::b::"
+      },
+      "resource": {
+        "type": "FwwSw7",
+        "id": ":::b::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "FwwSw7::\":::b::\"",
-      "action": "Action::\"action\"",
-      "resource": "FwwSw7::\":::b::\"",
+      "principal": {
+        "type": "FwwSw7",
+        "id": ":::b::"
+      },
+      "resource": {
+        "type": "FwwSw7",
+        "id": ":::b::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/9d708a846df604daa636403c267203ff2284d091.json b/cedar-integration-tests/corpus_tests/9d708a846df604daa636403c267203ff2284d091.json
index fa6589ce4..d15b4da54 100644
--- a/cedar-integration-tests/corpus_tests/9d708a846df604daa636403c267203ff2284d091.json
+++ b/cedar-integration-tests/corpus_tests/9d708a846df604daa636403c267203ff2284d091.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9d9c579f9c3a81af0f81f4fc66fa8164ff39a0b6.json b/cedar-integration-tests/corpus_tests/9d9c579f9c3a81af0f81f4fc66fa8164ff39a0b6.json
index d751f6729..27035d34b 100644
--- a/cedar-integration-tests/corpus_tests/9d9c579f9c3a81af0f81f4fc66fa8164ff39a0b6.json
+++ b/cedar-integration-tests/corpus_tests/9d9c579f9c3a81af0f81f4fc66fa8164ff39a0b6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9da24d85bb124c72cb65fa6d849d057ea3e59436.json b/cedar-integration-tests/corpus_tests/9da24d85bb124c72cb65fa6d849d057ea3e59436.json
index 05a164efb..c002c04e0 100644
--- a/cedar-integration-tests/corpus_tests/9da24d85bb124c72cb65fa6d849d057ea3e59436.json
+++ b/cedar-integration-tests/corpus_tests/9da24d85bb124c72cb65fa6d849d057ea3e59436.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "": "",
@@ -27,9 +36,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "": "",
@@ -48,9 +66,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "": "",
@@ -69,9 +96,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "": "",
@@ -90,9 +126,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "": "",
@@ -111,9 +156,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "": "",
@@ -132,9 +186,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "": "",
@@ -153,9 +216,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "": "",
diff --git a/cedar-integration-tests/corpus_tests/9dc2422955c9d8ead1676ef13b0a28980cd27eed.json b/cedar-integration-tests/corpus_tests/9dc2422955c9d8ead1676ef13b0a28980cd27eed.json
index b92abaf5b..fccc2f350 100644
--- a/cedar-integration-tests/corpus_tests/9dc2422955c9d8ead1676ef13b0a28980cd27eed.json
+++ b/cedar-integration-tests/corpus_tests/9dc2422955c9d8ead1676ef13b0a28980cd27eed.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Gxxxxxjju::a::\";\"",
-      "action": "Gxxxxxjju::Action::\"action\"",
-      "resource": "Gxxxxxjju::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxjju::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxjju::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Gxxxxxjju::a::\"\"",
-      "action": "Gxxxxxjju::Action::\"action\"",
-      "resource": "Gxxxxxjju::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxjju::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Gxxxxxjju::a::\"\"",
-      "action": "Gxxxxxjju::Action::\"action\"",
-      "resource": "Gxxxxxjju::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxjju::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Gxxxxxjju::a::\"\"",
-      "action": "Gxxxxxjju::Action::\"action\"",
-      "resource": "Gxxxxxjju::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxjju::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Gxxxxxjju::a::\"\"",
-      "action": "Gxxxxxjju::Action::\"action\"",
-      "resource": "Gxxxxxjju::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxjju::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Gxxxxxjju::a::\"\"",
-      "action": "Gxxxxxjju::Action::\"action\"",
-      "resource": "Gxxxxxjju::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxjju::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Gxxxxxjju::a::\"\"",
-      "action": "Gxxxxxjju::Action::\"action\"",
-      "resource": "Gxxxxxjju::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxjju::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Gxxxxxjju::a::\"\"",
-      "action": "Gxxxxxjju::Action::\"action\"",
-      "resource": "Gxxxxxjju::a::\"\"",
+      "principal": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxxxjju::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxxxjju::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9deac7d6cae0d5e05635469c985c01f9a22e0d1b.json b/cedar-integration-tests/corpus_tests/9deac7d6cae0d5e05635469c985c01f9a22e0d1b.json
index f8df336da..348f95077 100644
--- a/cedar-integration-tests/corpus_tests/9deac7d6cae0d5e05635469c985c01f9a22e0d1b.json
+++ b/cedar-integration-tests/corpus_tests/9deac7d6cae0d5e05635469c985c01f9a22e0d1b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"_q\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "_q"
+      },
       "context": {
         "f": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"_q\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "_q"
+      },
       "context": {
         "f": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"_q\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "_q"
+      },
       "context": {
         "f": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"_q\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "_q"
+      },
       "context": {
         "f": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"_q\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "_q"
+      },
       "context": {
         "f": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"_q\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "_q"
+      },
       "context": {
         "f": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"_q\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "_q"
+      },
       "context": {
         "f": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"_q\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "_q"
+      },
       "context": {
         "f": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/9df18b254afe6ee11295e6076bcdffef907e2f57.json b/cedar-integration-tests/corpus_tests/9df18b254afe6ee11295e6076bcdffef907e2f57.json
index 547b937bf..102c8f9d6 100644
--- a/cedar-integration-tests/corpus_tests/9df18b254afe6ee11295e6076bcdffef907e2f57.json
+++ b/cedar-integration-tests/corpus_tests/9df18b254afe6ee11295e6076bcdffef907e2f57.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"f\\0@f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0@f\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0000@f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000@f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"f\\0@f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0@f\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0000@f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000@f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"f\\0@f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0@f\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0000@f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000@f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"f\\0@f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0@f\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0000@f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000@f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"f\\0@f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0@f\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0000@f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000@f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"f\\0@f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0@f\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0000@f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000@f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"f\\0@f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0@f\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0000@f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000@f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"f\\0@f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0@f\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0000@f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000@f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9dfb0e9489663d11ba0b18dc6c295586054d890f.json b/cedar-integration-tests/corpus_tests/9dfb0e9489663d11ba0b18dc6c295586054d890f.json
index c389d05f6..39737e786 100644
--- a/cedar-integration-tests/corpus_tests/9dfb0e9489663d11ba0b18dc6c295586054d890f.json
+++ b/cedar-integration-tests/corpus_tests/9dfb0e9489663d11ba0b18dc6c295586054d890f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9e383d82ba301840ca5735f1cd71479507f1be99.json b/cedar-integration-tests/corpus_tests/9e383d82ba301840ca5735f1cd71479507f1be99.json
index 6b1474121..f3347eed5 100644
--- a/cedar-integration-tests/corpus_tests/9e383d82ba301840ca5735f1cd71479507f1be99.json
+++ b/cedar-integration-tests/corpus_tests/9e383d82ba301840ca5735f1cd71479507f1be99.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9e4215d3d845b1c2c2ed582e46dd53c55c74b1ec.json b/cedar-integration-tests/corpus_tests/9e4215d3d845b1c2c2ed582e46dd53c55c74b1ec.json
index 4b18dcb4d..996dd3d1f 100644
--- a/cedar-integration-tests/corpus_tests/9e4215d3d845b1c2c2ed582e46dd53c55c74b1ec.json
+++ b/cedar-integration-tests/corpus_tests/9e4215d3d845b1c2c2ed582e46dd53c55c74b1ec.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "A",
+        "id": "."
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "A",
+        "id": "."
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "A",
+        "id": "."
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "A",
+        "id": "."
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "A",
+        "id": "."
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "A",
+        "id": "."
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "A",
+        "id": "."
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "A",
+        "id": "."
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/9e708896b94e41d9f73b740298285c0caa6cff9d.json b/cedar-integration-tests/corpus_tests/9e708896b94e41d9f73b740298285c0caa6cff9d.json
index d1d6ae230..0bcc5cf91 100644
--- a/cedar-integration-tests/corpus_tests/9e708896b94e41d9f73b740298285c0caa6cff9d.json
+++ b/cedar-integration-tests/corpus_tests/9e708896b94e41d9f73b740298285c0caa6cff9d.json
@@ -7,8 +7,14 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"vaYlang/\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "vaYlang/"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +25,14 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"vaYlang/\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "vaYlang/"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +43,14 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"vaYlang/\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "vaYlang/"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +61,14 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"vaYlang/\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "vaYlang/"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +79,14 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"vaYlang/\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "vaYlang/"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +97,14 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"vaYlang/\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "vaYlang/"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +115,14 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"vaYlang/\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "vaYlang/"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +133,14 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"vaYlang/\"",
-      "resource": "a::\"\"",
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "vaYlang/"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/9e78370f0df2823e97e385eba2a8ae7106f923dd.json b/cedar-integration-tests/corpus_tests/9e78370f0df2823e97e385eba2a8ae7106f923dd.json
index cd3a99ce9..732785c6d 100644
--- a/cedar-integration-tests/corpus_tests/9e78370f0df2823e97e385eba2a8ae7106f923dd.json
+++ b/cedar-integration-tests/corpus_tests/9e78370f0df2823e97e385eba2a8ae7106f923dd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9e9dffc95a866861e43df9e9012d6be10996ed36.json b/cedar-integration-tests/corpus_tests/9e9dffc95a866861e43df9e9012d6be10996ed36.json
index dc52923e6..c7969da46 100644
--- a/cedar-integration-tests/corpus_tests/9e9dffc95a866861e43df9e9012d6be10996ed36.json
+++ b/cedar-integration-tests/corpus_tests/9e9dffc95a866861e43df9e9012d6be10996ed36.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9ea64672e3bdac32c20bff3b3a0bfa8da2d9e8ba.json b/cedar-integration-tests/corpus_tests/9ea64672e3bdac32c20bff3b3a0bfa8da2d9e8ba.json
index 2855343d5..ea954ffcc 100644
--- a/cedar-integration-tests/corpus_tests/9ea64672e3bdac32c20bff3b3a0bfa8da2d9e8ba.json
+++ b/cedar-integration-tests/corpus_tests/9ea64672e3bdac32c20bff3b3a0bfa8da2d9e8ba.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\n\\u{5}\\u{5}ت\\0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{5}\\u{5}ت\\0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0005\u0005ت\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0005\u0005ت\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\n\\u{5}\\u{5}ت\\0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{5}\\u{5}ت\\0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0005\u0005ت\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0005\u0005ت\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\n\\u{5}\\u{5}ت\\0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0005\u0005ت\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/9ebea5ee4c2e11650b673b3de9b6923a9c2b4d6a.json b/cedar-integration-tests/corpus_tests/9ebea5ee4c2e11650b673b3de9b6923a9c2b4d6a.json
index dac5df172..99528c377 100644
--- a/cedar-integration-tests/corpus_tests/9ebea5ee4c2e11650b673b3de9b6923a9c2b4d6a.json
+++ b/cedar-integration-tests/corpus_tests/9ebea5ee4c2e11650b673b3de9b6923a9c2b4d6a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "B::a::\"::fffd\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"::fffd\"",
+      "principal": {
+        "type": "B::a",
+        "id": "::fffd"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "::fffd"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "B::a::\"::fffd\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"::fffd\"",
+      "principal": {
+        "type": "B::a",
+        "id": "::fffd"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "::fffd"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "B::a::\"::fffd\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"::fffd\"",
+      "principal": {
+        "type": "B::a",
+        "id": "::fffd"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "::fffd"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "B::a::\"::fffd\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"::fffd\"",
+      "principal": {
+        "type": "B::a",
+        "id": "::fffd"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "::fffd"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "B::a::\"::fffd\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"::fffd\"",
+      "principal": {
+        "type": "B::a",
+        "id": "::fffd"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "::fffd"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "B::a::\"::fffd\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"::fffd\"",
+      "principal": {
+        "type": "B::a",
+        "id": "::fffd"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "::fffd"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "B::a::\"::fffd\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"::fffd\"",
+      "principal": {
+        "type": "B::a",
+        "id": "::fffd"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "::fffd"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "B::a::\"::fffd\"",
-      "action": "B::Action::\"action\"",
-      "resource": "B::a::\"::fffd\"",
+      "principal": {
+        "type": "B::a",
+        "id": "::fffd"
+      },
+      "resource": {
+        "type": "B::a",
+        "id": "::fffd"
+      },
+      "action": {
+        "type": "B::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/9f00013fd364d25be4f6d50fd14e97c39ad600c2.json b/cedar-integration-tests/corpus_tests/9f00013fd364d25be4f6d50fd14e97c39ad600c2.json
index 8a1649dab..5d84ebfd6 100644
--- a/cedar-integration-tests/corpus_tests/9f00013fd364d25be4f6d50fd14e97c39ad600c2.json
+++ b/cedar-integration-tests/corpus_tests/9f00013fd364d25be4f6d50fd14e97c39ad600c2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{6}F\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}F\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006F\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006F\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}F\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006F\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}F\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}F\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006F\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006F\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}F\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}F\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006F\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006F\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}F\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}F\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006F\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006F\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}F\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}F\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006F\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006F\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}F\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}F\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006F\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006F\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/9f19abed6ce7d188a287c308ab84a60d2abee4a8.json b/cedar-integration-tests/corpus_tests/9f19abed6ce7d188a287c308ab84a60d2abee4a8.json
index ba999a882..abd2f1016 100644
--- a/cedar-integration-tests/corpus_tests/9f19abed6ce7d188a287c308ab84a60d2abee4a8.json
+++ b/cedar-integration-tests/corpus_tests/9f19abed6ce7d188a287c308ab84a60d2abee4a8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9f1c21662ae11397c3676997c668326235093b42.json b/cedar-integration-tests/corpus_tests/9f1c21662ae11397c3676997c668326235093b42.json
index deff50048..86f5b8606 100644
--- a/cedar-integration-tests/corpus_tests/9f1c21662ae11397c3676997c668326235093b42.json
+++ b/cedar-integration-tests/corpus_tests/9f1c21662ae11397c3676997c668326235093b42.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9f4d739955479dd973a11169342840d58c77101f.json b/cedar-integration-tests/corpus_tests/9f4d739955479dd973a11169342840d58c77101f.json
index 9ec50e268..ac2c90db8 100644
--- a/cedar-integration-tests/corpus_tests/9f4d739955479dd973a11169342840d58c77101f.json
+++ b/cedar-integration-tests/corpus_tests/9f4d739955479dd973a11169342840d58c77101f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0zzz\\u{11}z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0zzz\\u{11}z\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0zzz\\u{11}z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0zzz\\u{11}z\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0zzz\\u{11}z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0zzz\\u{11}z\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0zzz\\u{11}z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0zzz\\u{11}z\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0zzz\\u{11}z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0zzz\\u{11}z\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0zzz\\u{11}z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0zzz\\u{11}z\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0zzz\\u{11}z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0zzz\\u{11}z\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0zzz\\u{11}z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0zzz\\u{11}z\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000zzz\u0011z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9f5522350d3834fa1f5ff8c9513993a027eec041.json b/cedar-integration-tests/corpus_tests/9f5522350d3834fa1f5ff8c9513993a027eec041.json
index 132f213db..80bc9720d 100644
--- a/cedar-integration-tests/corpus_tests/9f5522350d3834fa1f5ff8c9513993a027eec041.json
+++ b/cedar-integration-tests/corpus_tests/9f5522350d3834fa1f5ff8c9513993a027eec041.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/9f80e2d1ff1ec2f341027f22fe929ac8d1bbf1bf.json b/cedar-integration-tests/corpus_tests/9f80e2d1ff1ec2f341027f22fe929ac8d1bbf1bf.json
index c52489685..fa899e717 100644
--- a/cedar-integration-tests/corpus_tests/9f80e2d1ff1ec2f341027f22fe929ac8d1bbf1bf.json
+++ b/cedar-integration-tests/corpus_tests/9f80e2d1ff1ec2f341027f22fe929ac8d1bbf1bf.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffff\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"ffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9fd7413265eab443e94605d8084ce2e5d68f80b6.json b/cedar-integration-tests/corpus_tests/9fd7413265eab443e94605d8084ce2e5d68f80b6.json
index 4821f558d..060bb9404 100644
--- a/cedar-integration-tests/corpus_tests/9fd7413265eab443e94605d8084ce2e5d68f80b6.json
+++ b/cedar-integration-tests/corpus_tests/9fd7413265eab443e94605d8084ce2e5d68f80b6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Q120": 2407168634
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Q120": 0
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Q120": 0
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Q120": 0
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Q120": 0
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Q120": 0
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Q120": 0
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Q120": 0
       },
diff --git a/cedar-integration-tests/corpus_tests/9fdb5ebfe43720d72298b5a5bc00dba586d0f996.json b/cedar-integration-tests/corpus_tests/9fdb5ebfe43720d72298b5a5bc00dba586d0f996.json
index 69a7d5ab9..593f12d28 100644
--- a/cedar-integration-tests/corpus_tests/9fdb5ebfe43720d72298b5a5bc00dba586d0f996.json
+++ b/cedar-integration-tests/corpus_tests/9fdb5ebfe43720d72298b5a5bc00dba586d0f996.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"?\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"?\"",
+      "principal": {
+        "type": "a",
+        "id": "?"
+      },
+      "resource": {
+        "type": "a",
+        "id": "?"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"?\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"?\"",
+      "principal": {
+        "type": "a",
+        "id": "?"
+      },
+      "resource": {
+        "type": "a",
+        "id": "?"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"?\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"?\"",
+      "principal": {
+        "type": "a",
+        "id": "?"
+      },
+      "resource": {
+        "type": "a",
+        "id": "?"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"?\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"?\"",
+      "principal": {
+        "type": "a",
+        "id": "?"
+      },
+      "resource": {
+        "type": "a",
+        "id": "?"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"?\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"?\"",
+      "principal": {
+        "type": "a",
+        "id": "?"
+      },
+      "resource": {
+        "type": "a",
+        "id": "?"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"?\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"?\"",
+      "principal": {
+        "type": "a",
+        "id": "?"
+      },
+      "resource": {
+        "type": "a",
+        "id": "?"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"?\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"?\"",
+      "principal": {
+        "type": "a",
+        "id": "?"
+      },
+      "resource": {
+        "type": "a",
+        "id": "?"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"?\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"?\"",
+      "principal": {
+        "type": "a",
+        "id": "?"
+      },
+      "resource": {
+        "type": "a",
+        "id": "?"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/9fe2561a4f8f6c04814be2e41154a1c8b516d1dc.json b/cedar-integration-tests/corpus_tests/9fe2561a4f8f6c04814be2e41154a1c8b516d1dc.json
index 7311347aa..0c8dc4af5 100644
--- a/cedar-integration-tests/corpus_tests/9fe2561a4f8f6c04814be2e41154a1c8b516d1dc.json
+++ b/cedar-integration-tests/corpus_tests/9fe2561a4f8f6c04814be2e41154a1c8b516d1dc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Q0xx::Qxxx1fARxzI222III::\"\"",
-      "action": "Q0xx::Action::\"action\"",
-      "resource": "Q0xx::Qxxx1fARxzI222III::\"\"",
+      "principal": {
+        "type": "Q0xx::Qxxx1fARxzI222III",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q0xx::Qxxx1fARxzI222III",
+        "id": ""
+      },
+      "action": {
+        "type": "Q0xx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Q0xx::Qxxx1fARxzI222III::\"\"",
-      "action": "Q0xx::Action::\"action\"",
-      "resource": "Q0xx::Qxxx1fARxzI222III::\"\"",
+      "principal": {
+        "type": "Q0xx::Qxxx1fARxzI222III",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q0xx::Qxxx1fARxzI222III",
+        "id": ""
+      },
+      "action": {
+        "type": "Q0xx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Q0xx::Qxxx1fARxzI222III::\"\"",
-      "action": "Q0xx::Action::\"action\"",
-      "resource": "Q0xx::Qxxx1fARxzI222III::\"\"",
+      "principal": {
+        "type": "Q0xx::Qxxx1fARxzI222III",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q0xx::Qxxx1fARxzI222III",
+        "id": ""
+      },
+      "action": {
+        "type": "Q0xx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Q0xx::Qxxx1fARxzI222III::\"\"",
-      "action": "Q0xx::Action::\"action\"",
-      "resource": "Q0xx::Qxxx1fARxzI222III::\"\"",
+      "principal": {
+        "type": "Q0xx::Qxxx1fARxzI222III",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q0xx::Qxxx1fARxzI222III",
+        "id": ""
+      },
+      "action": {
+        "type": "Q0xx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Q0xx::Qxxx1fARxzI222III::\"\"",
-      "action": "Q0xx::Action::\"action\"",
-      "resource": "Q0xx::Qxxx1fARxzI222III::\"\"",
+      "principal": {
+        "type": "Q0xx::Qxxx1fARxzI222III",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q0xx::Qxxx1fARxzI222III",
+        "id": ""
+      },
+      "action": {
+        "type": "Q0xx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Q0xx::Qxxx1fARxzI222III::\"\"",
-      "action": "Q0xx::Action::\"action\"",
-      "resource": "Q0xx::Qxxx1fARxzI222III::\"\"",
+      "principal": {
+        "type": "Q0xx::Qxxx1fARxzI222III",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q0xx::Qxxx1fARxzI222III",
+        "id": ""
+      },
+      "action": {
+        "type": "Q0xx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Q0xx::Qxxx1fARxzI222III::\"\"",
-      "action": "Q0xx::Action::\"action\"",
-      "resource": "Q0xx::Qxxx1fARxzI222III::\"\"",
+      "principal": {
+        "type": "Q0xx::Qxxx1fARxzI222III",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q0xx::Qxxx1fARxzI222III",
+        "id": ""
+      },
+      "action": {
+        "type": "Q0xx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Q0xx::Qxxx1fARxzI222III::\"\"",
-      "action": "Q0xx::Action::\"action\"",
-      "resource": "Q0xx::Qxxx1fARxzI222III::\"\"",
+      "principal": {
+        "type": "Q0xx::Qxxx1fARxzI222III",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q0xx::Qxxx1fARxzI222III",
+        "id": ""
+      },
+      "action": {
+        "type": "Q0xx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/9ffbdd023a6b54e27b4680eedfd01333a57319fd.json b/cedar-integration-tests/corpus_tests/9ffbdd023a6b54e27b4680eedfd01333a57319fd.json
index 621716caf..36fa7b4a8 100644
--- a/cedar-integration-tests/corpus_tests/9ffbdd023a6b54e27b4680eedfd01333a57319fd.json
+++ b/cedar-integration-tests/corpus_tests/9ffbdd023a6b54e27b4680eedfd01333a57319fd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"f:\\0\\066\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f:\\0\\066\"",
+      "principal": {
+        "type": "a",
+        "id": "f:\u0000\u000066"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f:\u0000\u000066"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"f:\\0\\066\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f:\\0\\066\"",
+      "principal": {
+        "type": "a",
+        "id": "f:\u0000\u000066"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f:\u0000\u000066"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f:\\0\\066\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "f:\u0000\u000066"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"f:\\0\\066\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f:\\0\\066\"",
+      "principal": {
+        "type": "a",
+        "id": "f:\u0000\u000066"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f:\u0000\u000066"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"f:\\0\\066\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f:\\0\\066\"",
+      "principal": {
+        "type": "a",
+        "id": "f:\u0000\u000066"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f:\u0000\u000066"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"f:\\0\\066\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f:\\0\\066\"",
+      "principal": {
+        "type": "a",
+        "id": "f:\u0000\u000066"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f:\u0000\u000066"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"f:\\0\\066\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f:\\0\\066\"",
+      "principal": {
+        "type": "a",
+        "id": "f:\u0000\u000066"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f:\u0000\u000066"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"f:\\0\\066\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f:\\0\\066\"",
+      "principal": {
+        "type": "a",
+        "id": "f:\u0000\u000066"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f:\u0000\u000066"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a0151867c4cc2ac509c85a2bd56dbeed7cc3855f.json b/cedar-integration-tests/corpus_tests/a0151867c4cc2ac509c85a2bd56dbeed7cc3855f.json
index 97e7d3927..6fd4c7326 100644
--- a/cedar-integration-tests/corpus_tests/a0151867c4cc2ac509c85a2bd56dbeed7cc3855f.json
+++ b/cedar-integration-tests/corpus_tests/a0151867c4cc2ac509c85a2bd56dbeed7cc3855f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "LYY::Qml::Edxl::Kxx0xxx::a::\"zz\"",
-      "action": "LYY::Qml::Edxl::Kxx0xxx::Action::\"action\"",
-      "resource": "LYY::Qml::Edxl::Kxx0xxx::a::\"zz\"",
+      "principal": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "LYY::Qml::Edxl::Kxx0xxx::a::\"zz\"",
-      "action": "LYY::Qml::Edxl::Kxx0xxx::Action::\"action\"",
-      "resource": "LYY::Qml::Edxl::Kxx0xxx::a::\"zz\"",
+      "principal": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "LYY::Qml::Edxl::Kxx0xxx::a::\"zz\"",
-      "action": "LYY::Qml::Edxl::Kxx0xxx::Action::\"action\"",
-      "resource": "LYY::Qml::Edxl::Kxx0xxx::a::\"zz\"",
+      "principal": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "LYY::Qml::Edxl::Kxx0xxx::a::\"zz\"",
-      "action": "LYY::Qml::Edxl::Kxx0xxx::Action::\"action\"",
-      "resource": "LYY::Qml::Edxl::Kxx0xxx::a::\"zz\"",
+      "principal": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "LYY::Qml::Edxl::Kxx0xxx::a::\"zz\"",
-      "action": "LYY::Qml::Edxl::Kxx0xxx::Action::\"action\"",
-      "resource": "LYY::Qml::Edxl::Kxx0xxx::a::\"zz\"",
+      "principal": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "LYY::Qml::Edxl::Kxx0xxx::a::\"zz\"",
-      "action": "LYY::Qml::Edxl::Kxx0xxx::Action::\"action\"",
-      "resource": "LYY::Qml::Edxl::Kxx0xxx::a::\"zz\"",
+      "principal": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "LYY::Qml::Edxl::Kxx0xxx::a::\"zz\"",
-      "action": "LYY::Qml::Edxl::Kxx0xxx::Action::\"action\"",
-      "resource": "LYY::Qml::Edxl::Kxx0xxx::a::\"zz\"",
+      "principal": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "LYY::Qml::Edxl::Kxx0xxx::a::\"zz\"",
-      "action": "LYY::Qml::Edxl::Kxx0xxx::Action::\"action\"",
-      "resource": "LYY::Qml::Edxl::Kxx0xxx::a::\"zz\"",
+      "principal": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "LYY::Qml::Edxl::Kxx0xxx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a09b589b0d4e870cb47c3280f1de5ec2264829ca.json b/cedar-integration-tests/corpus_tests/a09b589b0d4e870cb47c3280f1de5ec2264829ca.json
index 7fdd086ae..93550fe47 100644
--- a/cedar-integration-tests/corpus_tests/a09b589b0d4e870cb47c3280f1de5ec2264829ca.json
+++ b/cedar-integration-tests/corpus_tests/a09b589b0d4e870cb47c3280f1de5ec2264829ca.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a10348d2b02de73347a50d257afe7947d0b0b8ac.json b/cedar-integration-tests/corpus_tests/a10348d2b02de73347a50d257afe7947d0b0b8ac.json
index d21997063..baad76f33 100644
--- a/cedar-integration-tests/corpus_tests/a10348d2b02de73347a50d257afe7947d0b0b8ac.json
+++ b/cedar-integration-tests/corpus_tests/a10348d2b02de73347a50d257afe7947d0b0b8ac.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{8}\\u{8}\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{8}\\u{8}\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\b\b\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\b\b\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{8}\\u{8}\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{8}\\u{8}\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\b\b\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\b\b\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{8}\\u{8}\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{8}\\u{8}\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\b\b\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\b\b\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{8}\\u{8}\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{8}\\u{8}\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\b\b\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\b\b\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{8}\\u{8}\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{8}\\u{8}\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\b\b\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\b\b\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{8}\\u{8}\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{8}\\u{8}\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\b\b\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\b\b\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{8}\\u{8}\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{8}\\u{8}\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\b\b\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\b\b\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{8}\\u{8}\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{8}\\u{8}\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\b\b\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\b\b\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/a15680bd683336a6602a2981a21b7d49bd4e9aae.json b/cedar-integration-tests/corpus_tests/a15680bd683336a6602a2981a21b7d49bd4e9aae.json
index be360dbfb..35852fe50 100644
--- a/cedar-integration-tests/corpus_tests/a15680bd683336a6602a2981a21b7d49bd4e9aae.json
+++ b/cedar-integration-tests/corpus_tests/a15680bd683336a6602a2981a21b7d49bd4e9aae.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r33338330::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Vh::\"\"",
+      "principal": {
+        "type": "r33338330",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Vh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r33338330::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Vh::\"\"",
+      "principal": {
+        "type": "r33338330",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Vh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r33338330::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Vh::\"\"",
+      "principal": {
+        "type": "r33338330",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Vh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r33338330::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Vh::\"\"",
+      "principal": {
+        "type": "r33338330",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Vh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r33338330::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Vh::\"\"",
+      "principal": {
+        "type": "r33338330",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Vh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r33338330::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Vh::\"\"",
+      "principal": {
+        "type": "r33338330",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Vh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r33338330::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Vh::\"\"",
+      "principal": {
+        "type": "r33338330",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Vh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r33338330::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Vh::\"\"",
+      "principal": {
+        "type": "r33338330",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Vh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a15e7c71d9a369baeeae438e37491867ebe8f706.json b/cedar-integration-tests/corpus_tests/a15e7c71d9a369baeeae438e37491867ebe8f706.json
index 7b889e2e8..2475216fc 100644
--- a/cedar-integration-tests/corpus_tests/a15e7c71d9a369baeeae438e37491867ebe8f706.json
+++ b/cedar-integration-tests/corpus_tests/a15e7c71d9a369baeeae438e37491867ebe8f706.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "u::\":B::\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "u",
+        "id": ":B::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "u::\":B::\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "u",
+        "id": ":B::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "u::\":B::\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "u",
+        "id": ":B::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "u::\":B::\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "u",
+        "id": ":B::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "u::\":B::\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "u",
+        "id": ":B::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "u::\":B::\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "u",
+        "id": ":B::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "u::\":B::\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "u",
+        "id": ":B::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "u::\":B::\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "u",
+        "id": ":B::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a1ea88b1403530e6065abbeb59bbe1b3ca879fcf.json b/cedar-integration-tests/corpus_tests/a1ea88b1403530e6065abbeb59bbe1b3ca879fcf.json
index abbbef2b5..a23a3b9f3 100644
--- a/cedar-integration-tests/corpus_tests/a1ea88b1403530e6065abbeb59bbe1b3ca879fcf.json
+++ b/cedar-integration-tests/corpus_tests/a1ea88b1403530e6065abbeb59bbe1b3ca879fcf.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "VhhhhhhkkkkkkkkDk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhhhhhhkkkkkkkkDk::\"\"",
+      "principal": {
+        "type": "VhhhhhhkkkkkkkkDk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhhhhhhkkkkkkkkDk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "u": 0
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "VhhhhhhkkkkkkkkDk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhhhhhhkkkkkkkkDk::\"\"",
+      "principal": {
+        "type": "VhhhhhhkkkkkkkkDk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhhhhhhkkkkkkkkDk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "u": 0
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "VhhhhhhkkkkkkkkDk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhhhhhhkkkkkkkkDk::\"\"",
+      "principal": {
+        "type": "VhhhhhhkkkkkkkkDk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhhhhhhkkkkkkkkDk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "u": 0
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "VhhhhhhkkkkkkkkDk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhhhhhhkkkkkkkkDk::\"\"",
+      "principal": {
+        "type": "VhhhhhhkkkkkkkkDk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhhhhhhkkkkkkkkDk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "u": 0
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "VhhhhhhkkkkkkkkDk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhhhhhhkkkkkkkkDk::\"\"",
+      "principal": {
+        "type": "VhhhhhhkkkkkkkkDk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhhhhhhkkkkkkkkDk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "u": 0
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "VhhhhhhkkkkkkkkDk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhhhhhhkkkkkkkkDk::\"\"",
+      "principal": {
+        "type": "VhhhhhhkkkkkkkkDk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhhhhhhkkkkkkkkDk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "u": 0
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "VhhhhhhkkkkkkkkDk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhhhhhhkkkkkkkkDk::\"\"",
+      "principal": {
+        "type": "VhhhhhhkkkkkkkkDk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhhhhhhkkkkkkkkDk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "u": 0
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "VhhhhhhkkkkkkkkDk::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VhhhhhhkkkkkkkkDk::\"\"",
+      "principal": {
+        "type": "VhhhhhhkkkkkkkkDk",
+        "id": ""
+      },
+      "resource": {
+        "type": "VhhhhhhkkkkkkkkDk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "u": 0
diff --git a/cedar-integration-tests/corpus_tests/a22b826eb029b8cbbd35458232473d4b0a03313f.json b/cedar-integration-tests/corpus_tests/a22b826eb029b8cbbd35458232473d4b0a03313f.json
index 1d5883cdc..e18962d8e 100644
--- a/cedar-integration-tests/corpus_tests/a22b826eb029b8cbbd35458232473d4b0a03313f.json
+++ b/cedar-integration-tests/corpus_tests/a22b826eb029b8cbbd35458232473d4b0a03313f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "L::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww3::\"\"",
+      "principal": {
+        "type": "L",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwwwww3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "L::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww3::\"\"",
+      "principal": {
+        "type": "L",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwwwww3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "L::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww3::\"\"",
+      "principal": {
+        "type": "L",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwwwww3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "L::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww3::\"\"",
+      "principal": {
+        "type": "L",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwwwww3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "L::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww3::\"\"",
+      "principal": {
+        "type": "L",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwwwww3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "L::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww3::\"\"",
+      "principal": {
+        "type": "L",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwwwww3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "L::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww3::\"\"",
+      "principal": {
+        "type": "L",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwwwww3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "L::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwwwww3::\"\"",
+      "principal": {
+        "type": "L",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwwwww3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a23157ddf99a2985c5adf4af031f93dc34037e74.json b/cedar-integration-tests/corpus_tests/a23157ddf99a2985c5adf4af031f93dc34037e74.json
index a65aeb2e2..2a2ac5479 100644
--- a/cedar-integration-tests/corpus_tests/a23157ddf99a2985c5adf4af031f93dc34037e74.json
+++ b/cedar-integration-tests/corpus_tests/a23157ddf99a2985c5adf4af031f93dc34037e74.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/a255f02c579a54eb5b951054c68bd1b66010ed82.json b/cedar-integration-tests/corpus_tests/a255f02c579a54eb5b951054c68bd1b66010ed82.json
index 6a6c53a67..9264792a8 100644
--- a/cedar-integration-tests/corpus_tests/a255f02c579a54eb5b951054c68bd1b66010ed82.json
+++ b/cedar-integration-tests/corpus_tests/a255f02c579a54eb5b951054c68bd1b66010ed82.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a25640f8d20b7b2676cb78e50d30a58a8d984c3a.json b/cedar-integration-tests/corpus_tests/a25640f8d20b7b2676cb78e50d30a58a8d984c3a.json
index 5f000e84a..6834860e3 100644
--- a/cedar-integration-tests/corpus_tests/a25640f8d20b7b2676cb78e50d30a58a8d984c3a.json
+++ b/cedar-integration-tests/corpus_tests/a25640f8d20b7b2676cb78e50d30a58a8d984c3a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a2ab8e58a33c17557a7a5ca81a40528b91f12127.json b/cedar-integration-tests/corpus_tests/a2ab8e58a33c17557a7a5ca81a40528b91f12127.json
index 65b9467a7..476f9fa44 100644
--- a/cedar-integration-tests/corpus_tests/a2ab8e58a33c17557a7a5ca81a40528b91f12127.json
+++ b/cedar-integration-tests/corpus_tests/a2ab8e58a33c17557a7a5ca81a40528b91f12127.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "LfhhhhKx::\"\"",
-      "action": "Action::\"\\t\"",
-      "resource": "LfhhhhKx::\"\"",
+      "principal": {
+        "type": "LfhhhhKx",
+        "id": ""
+      },
+      "resource": {
+        "type": "LfhhhhKx",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\t"
+      },
       "context": {
         "ukkkJ002J002kk000": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "LfhhhhKx::\"\"",
-      "action": "Action::\"\\t\"",
-      "resource": "LfhhhhKx::\"\"",
+      "principal": {
+        "type": "LfhhhhKx",
+        "id": ""
+      },
+      "resource": {
+        "type": "LfhhhhKx",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\t"
+      },
       "context": {
         "ukkkJ002J002kk000": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "LfhhhhKx::\"\"",
-      "action": "Action::\"\\t\"",
-      "resource": "LfhhhhKx::\"\"",
+      "principal": {
+        "type": "LfhhhhKx",
+        "id": ""
+      },
+      "resource": {
+        "type": "LfhhhhKx",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\t"
+      },
       "context": {
         "ukkkJ002J002kk000": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "LfhhhhKx::\"\"",
-      "action": "Action::\"\\t\"",
-      "resource": "LfhhhhKx::\"\"",
+      "principal": {
+        "type": "LfhhhhKx",
+        "id": ""
+      },
+      "resource": {
+        "type": "LfhhhhKx",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\t"
+      },
       "context": {
         "ukkkJ002J002kk000": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "LfhhhhKx::\"\"",
-      "action": "Action::\"\\t\"",
-      "resource": "LfhhhhKx::\"\"",
+      "principal": {
+        "type": "LfhhhhKx",
+        "id": ""
+      },
+      "resource": {
+        "type": "LfhhhhKx",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\t"
+      },
       "context": {
         "ukkkJ002J002kk000": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "LfhhhhKx::\"\"",
-      "action": "Action::\"\\t\"",
-      "resource": "LfhhhhKx::\"\"",
+      "principal": {
+        "type": "LfhhhhKx",
+        "id": ""
+      },
+      "resource": {
+        "type": "LfhhhhKx",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\t"
+      },
       "context": {
         "ukkkJ002J002kk000": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "LfhhhhKx::\"\"",
-      "action": "Action::\"\\t\"",
-      "resource": "LfhhhhKx::\"\"",
+      "principal": {
+        "type": "LfhhhhKx",
+        "id": ""
+      },
+      "resource": {
+        "type": "LfhhhhKx",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\t"
+      },
       "context": {
         "ukkkJ002J002kk000": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "LfhhhhKx::\"\"",
-      "action": "Action::\"\\t\"",
-      "resource": "LfhhhhKx::\"\"",
+      "principal": {
+        "type": "LfhhhhKx",
+        "id": ""
+      },
+      "resource": {
+        "type": "LfhhhhKx",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\t"
+      },
       "context": {
         "ukkkJ002J002kk000": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/a3505e1b24db821f7a9a7672918d58a4c6d7d532.json b/cedar-integration-tests/corpus_tests/a3505e1b24db821f7a9a7672918d58a4c6d7d532.json
index df3766a88..8af926685 100644
--- a/cedar-integration-tests/corpus_tests/a3505e1b24db821f7a9a7672918d58a4c6d7d532.json
+++ b/cedar-integration-tests/corpus_tests/a3505e1b24db821f7a9a7672918d58a4c6d7d532.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Ov::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Ov::\"\"",
+      "principal": {
+        "type": "Ov",
+        "id": ""
+      },
+      "resource": {
+        "type": "Ov",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Ov::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Ov::\"\"",
+      "principal": {
+        "type": "Ov",
+        "id": ""
+      },
+      "resource": {
+        "type": "Ov",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Ov::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Ov::\"\"",
+      "principal": {
+        "type": "Ov",
+        "id": ""
+      },
+      "resource": {
+        "type": "Ov",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Ov::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Ov::\"\"",
+      "principal": {
+        "type": "Ov",
+        "id": ""
+      },
+      "resource": {
+        "type": "Ov",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Ov::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Ov::\"\"",
+      "principal": {
+        "type": "Ov",
+        "id": ""
+      },
+      "resource": {
+        "type": "Ov",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Ov::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Ov::\"\"",
+      "principal": {
+        "type": "Ov",
+        "id": ""
+      },
+      "resource": {
+        "type": "Ov",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Ov::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Ov::\"\"",
+      "principal": {
+        "type": "Ov",
+        "id": ""
+      },
+      "resource": {
+        "type": "Ov",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Ov::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Ov::\"\"",
+      "principal": {
+        "type": "Ov",
+        "id": ""
+      },
+      "resource": {
+        "type": "Ov",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a3635f0fed60bfe960a1a01dd3bacb35531e2dbe.json b/cedar-integration-tests/corpus_tests/a3635f0fed60bfe960a1a01dd3bacb35531e2dbe.json
index cddb3cee8..d85848479 100644
--- a/cedar-integration-tests/corpus_tests/a3635f0fed60bfe960a1a01dd3bacb35531e2dbe.json
+++ b/cedar-integration-tests/corpus_tests/a3635f0fed60bfe960a1a01dd3bacb35531e2dbe.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/a3b257185fb23a9c0a90adde68f13406ecb679e1.json b/cedar-integration-tests/corpus_tests/a3b257185fb23a9c0a90adde68f13406ecb679e1.json
index 6df6d4c67..1e9d8d1fb 100644
--- a/cedar-integration-tests/corpus_tests/a3b257185fb23a9c0a90adde68f13406ecb679e1.json
+++ b/cedar-integration-tests/corpus_tests/a3b257185fb23a9c0a90adde68f13406ecb679e1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/a3e131e67b54ee0f2967a76c2bea2fa49bb4442d.json b/cedar-integration-tests/corpus_tests/a3e131e67b54ee0f2967a76c2bea2fa49bb4442d.json
index 685f6330d..ad5e09cbb 100644
--- a/cedar-integration-tests/corpus_tests/a3e131e67b54ee0f2967a76c2bea2fa49bb4442d.json
+++ b/cedar-integration-tests/corpus_tests/a3e131e67b54ee0f2967a76c2bea2fa49bb4442d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "JpmmmXmsgtvtmm": "",
         "Ielujxx000": ""
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "JpmmmXmsgtvtmm": "",
         "Ielujxx000": ""
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "JpmmmXmsgtvtmm": "",
         "Ielujxx000": ""
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "JpmmmXmsgtvtmm": "",
         "Ielujxx000": ""
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "JpmmmXmsgtvtmm": "",
         "Ielujxx000": ""
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "JpmmmXmsgtvtmm": "",
         "Ielujxx000": ""
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "JpmmmXmsgtvtmm": "",
         "Ielujxx000": ""
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "JpmmmXmsgtvtmm": "",
         "Ielujxx000": ""
diff --git a/cedar-integration-tests/corpus_tests/a3e25c38d3d45cf512b9e1553fa857ce9adafd6b.json b/cedar-integration-tests/corpus_tests/a3e25c38d3d45cf512b9e1553fa857ce9adafd6b.json
index e88358070..b4b1fb97c 100644
--- a/cedar-integration-tests/corpus_tests/a3e25c38d3d45cf512b9e1553fa857ce9adafd6b.json
+++ b/cedar-integration-tests/corpus_tests/a3e25c38d3d45cf512b9e1553fa857ce9adafd6b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"jj\\u{1}\\0\\0\\0r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "jj\u0001\u0000\u0000\u0000r"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"jj\\u{1}\\0\\0\\0r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"jj\\u{1}\\0\\0\\0r\"",
+      "principal": {
+        "type": "a",
+        "id": "jj\u0001\u0000\u0000\u0000r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "jj\u0001\u0000\u0000\u0000r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"jj\\u{1}\\0\\0\\0r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"jj\\u{1}\\0\\0\\0r\"",
+      "principal": {
+        "type": "a",
+        "id": "jj\u0001\u0000\u0000\u0000r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "jj\u0001\u0000\u0000\u0000r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"jj\\u{1}\\0\\0\\0r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"jj\\u{1}\\0\\0\\0r\"",
+      "principal": {
+        "type": "a",
+        "id": "jj\u0001\u0000\u0000\u0000r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "jj\u0001\u0000\u0000\u0000r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"jj\\u{1}\\0\\0\\0r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"jj\\u{1}\\0\\0\\0r\"",
+      "principal": {
+        "type": "a",
+        "id": "jj\u0001\u0000\u0000\u0000r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "jj\u0001\u0000\u0000\u0000r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"jj\\u{1}\\0\\0\\0r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"jj\\u{1}\\0\\0\\0r\"",
+      "principal": {
+        "type": "a",
+        "id": "jj\u0001\u0000\u0000\u0000r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "jj\u0001\u0000\u0000\u0000r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"jj\\u{1}\\0\\0\\0r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"jj\\u{1}\\0\\0\\0r\"",
+      "principal": {
+        "type": "a",
+        "id": "jj\u0001\u0000\u0000\u0000r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "jj\u0001\u0000\u0000\u0000r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"jj\\u{1}\\0\\0\\0r\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"jj\\u{1}\\0\\0\\0r\"",
+      "principal": {
+        "type": "a",
+        "id": "jj\u0001\u0000\u0000\u0000r"
+      },
+      "resource": {
+        "type": "a",
+        "id": "jj\u0001\u0000\u0000\u0000r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
diff --git a/cedar-integration-tests/corpus_tests/a43afb80f7885cbfef046a3a9afeacecb85354d3.json b/cedar-integration-tests/corpus_tests/a43afb80f7885cbfef046a3a9afeacecb85354d3.json
index 0c29ea54d..978c9d51f 100644
--- a/cedar-integration-tests/corpus_tests/a43afb80f7885cbfef046a3a9afeacecb85354d3.json
+++ b/cedar-integration-tests/corpus_tests/a43afb80f7885cbfef046a3a9afeacecb85354d3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "W::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "W",
+        "id": ""
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "W::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "W",
+        "id": ""
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "W::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "W",
+        "id": ""
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "W::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "W",
+        "id": ""
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "W::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "W",
+        "id": ""
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "W::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "W",
+        "id": ""
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "W::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "W",
+        "id": ""
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "W::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "W",
+        "id": ""
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a446f4aa49485035973a6d5cb9514a9d4cc996b3.json b/cedar-integration-tests/corpus_tests/a446f4aa49485035973a6d5cb9514a9d4cc996b3.json
index e594d5ce8..f34753223 100644
--- a/cedar-integration-tests/corpus_tests/a446f4aa49485035973a6d5cb9514a9d4cc996b3.json
+++ b/cedar-integration-tests/corpus_tests/a446f4aa49485035973a6d5cb9514a9d4cc996b3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/a48aaab8c65092eccb2f7549b8cf267a73e35a50.json b/cedar-integration-tests/corpus_tests/a48aaab8c65092eccb2f7549b8cf267a73e35a50.json
index 9dc204c55..6bb05a67f 100644
--- a/cedar-integration-tests/corpus_tests/a48aaab8c65092eccb2f7549b8cf267a73e35a50.json
+++ b/cedar-integration-tests/corpus_tests/a48aaab8c65092eccb2f7549b8cf267a73e35a50.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "GXjxxjjjj::a::\"\"",
-      "action": "GXjxxjjjj::Action::\"\"",
-      "resource": "GXjxxjjjj::a::\"\"",
+      "principal": {
+        "type": "GXjxxjjjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "GXjxxjjjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "GXjxxjjjj::Action",
+        "id": ""
+      },
       "context": {
         "Gxxjjjjej": "",
         "Wjj00000000000": ""
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "GXjxxjjjj::a::\"\"",
-      "action": "GXjxxjjjj::Action::\"\"",
-      "resource": "GXjxxjjjj::a::\"\"",
+      "principal": {
+        "type": "GXjxxjjjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "GXjxxjjjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "GXjxxjjjj::Action",
+        "id": ""
+      },
       "context": {
         "Gxxjjjjej": "",
         "Wjj00000000000": ""
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "GXjxxjjjj::a::\"\"",
-      "action": "GXjxxjjjj::Action::\"\"",
-      "resource": "GXjxxjjjj::a::\"\"",
+      "principal": {
+        "type": "GXjxxjjjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "GXjxxjjjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "GXjxxjjjj::Action",
+        "id": ""
+      },
       "context": {
         "Gxxjjjjej": "",
         "Wjj00000000000": ""
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "GXjxxjjjj::a::\"\"",
-      "action": "GXjxxjjjj::Action::\"\"",
-      "resource": "GXjxxjjjj::a::\"\"",
+      "principal": {
+        "type": "GXjxxjjjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "GXjxxjjjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "GXjxxjjjj::Action",
+        "id": ""
+      },
       "context": {
         "Gxxjjjjej": "",
         "Wjj00000000000": ""
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "GXjxxjjjj::a::\"\"",
-      "action": "GXjxxjjjj::Action::\"\"",
-      "resource": "GXjxxjjjj::a::\"\"",
+      "principal": {
+        "type": "GXjxxjjjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "GXjxxjjjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "GXjxxjjjj::Action",
+        "id": ""
+      },
       "context": {
         "Gxxjjjjej": "",
         "Wjj00000000000": ""
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "GXjxxjjjj::a::\"\"",
-      "action": "GXjxxjjjj::Action::\"\"",
-      "resource": "GXjxxjjjj::a::\"\"",
+      "principal": {
+        "type": "GXjxxjjjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "GXjxxjjjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "GXjxxjjjj::Action",
+        "id": ""
+      },
       "context": {
         "Gxxjjjjej": "",
         "Wjj00000000000": ""
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "GXjxxjjjj::a::\"\"",
-      "action": "GXjxxjjjj::Action::\"\"",
-      "resource": "GXjxxjjjj::a::\"\"",
+      "principal": {
+        "type": "GXjxxjjjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "GXjxxjjjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "GXjxxjjjj::Action",
+        "id": ""
+      },
       "context": {
         "Gxxjjjjej": "",
         "Wjj00000000000": ""
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "GXjxxjjjj::a::\"\"",
-      "action": "GXjxxjjjj::Action::\"\"",
-      "resource": "GXjxxjjjj::a::\"\"",
+      "principal": {
+        "type": "GXjxxjjjj::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "GXjxxjjjj::a",
+        "id": ""
+      },
+      "action": {
+        "type": "GXjxxjjjj::Action",
+        "id": ""
+      },
       "context": {
         "Gxxjjjjej": "",
         "Wjj00000000000": ""
diff --git a/cedar-integration-tests/corpus_tests/a508a0f21fc70ea9462d31de012cf3c2151d9cc9.json b/cedar-integration-tests/corpus_tests/a508a0f21fc70ea9462d31de012cf3c2151d9cc9.json
index 35c3a1371..d7e89adb2 100644
--- a/cedar-integration-tests/corpus_tests/a508a0f21fc70ea9462d31de012cf3c2151d9cc9.json
+++ b/cedar-integration-tests/corpus_tests/a508a0f21fc70ea9462d31de012cf3c2151d9cc9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "F::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"::\"",
+      "principal": {
+        "type": "F",
+        "id": "::"
+      },
+      "resource": {
+        "type": "F",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "F::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"::\"",
+      "principal": {
+        "type": "F",
+        "id": "::"
+      },
+      "resource": {
+        "type": "F",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "F::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"::\"",
+      "principal": {
+        "type": "F",
+        "id": "::"
+      },
+      "resource": {
+        "type": "F",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "F::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"::\"",
+      "principal": {
+        "type": "F",
+        "id": "::"
+      },
+      "resource": {
+        "type": "F",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "F::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"::\"",
+      "principal": {
+        "type": "F",
+        "id": "::"
+      },
+      "resource": {
+        "type": "F",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "F::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"::\"",
+      "principal": {
+        "type": "F",
+        "id": "::"
+      },
+      "resource": {
+        "type": "F",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "F::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"::\"",
+      "principal": {
+        "type": "F",
+        "id": "::"
+      },
+      "resource": {
+        "type": "F",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "F::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"::\"",
+      "principal": {
+        "type": "F",
+        "id": "::"
+      },
+      "resource": {
+        "type": "F",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a523912ab1401f9cc3ac864f868d3d747c0edda4.json b/cedar-integration-tests/corpus_tests/a523912ab1401f9cc3ac864f868d3d747c0edda4.json
index 8615e92fd..fab38d0fa 100644
--- a/cedar-integration-tests/corpus_tests/a523912ab1401f9cc3ac864f868d3d747c0edda4.json
+++ b/cedar-integration-tests/corpus_tests/a523912ab1401f9cc3ac864f868d3d747c0edda4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0@\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0@\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000@"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0@\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000@"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0@\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000@"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0@\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000@"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0@\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000@"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0@\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000@"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0@\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000@"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a54477fd5e4b8306848f0e5733814928756cc9b4.json b/cedar-integration-tests/corpus_tests/a54477fd5e4b8306848f0e5733814928756cc9b4.json
index ddd0af379..ce2f3bf17 100644
--- a/cedar-integration-tests/corpus_tests/a54477fd5e4b8306848f0e5733814928756cc9b4.json
+++ b/cedar-integration-tests/corpus_tests/a54477fd5e4b8306848f0e5733814928756cc9b4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::Khhkkk::\".\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::Khhkkk::\".\"",
+      "principal": {
+        "type": "A::Khhkkk",
+        "id": "."
+      },
+      "resource": {
+        "type": "A::Khhkkk",
+        "id": "."
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::Khhkkk::\".\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::Khhkkk::\".\"",
+      "principal": {
+        "type": "A::Khhkkk",
+        "id": "."
+      },
+      "resource": {
+        "type": "A::Khhkkk",
+        "id": "."
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::Khhkkk::\".\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::Khhkkk::\".\"",
+      "principal": {
+        "type": "A::Khhkkk",
+        "id": "."
+      },
+      "resource": {
+        "type": "A::Khhkkk",
+        "id": "."
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::Khhkkk::\".\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::Khhkkk::\".\"",
+      "principal": {
+        "type": "A::Khhkkk",
+        "id": "."
+      },
+      "resource": {
+        "type": "A::Khhkkk",
+        "id": "."
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::Khhkkk::\".\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::Khhkkk::\".\"",
+      "principal": {
+        "type": "A::Khhkkk",
+        "id": "."
+      },
+      "resource": {
+        "type": "A::Khhkkk",
+        "id": "."
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::Khhkkk::\".\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::Khhkkk::\".\"",
+      "principal": {
+        "type": "A::Khhkkk",
+        "id": "."
+      },
+      "resource": {
+        "type": "A::Khhkkk",
+        "id": "."
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::Khhkkk::\".\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::Khhkkk::\".\"",
+      "principal": {
+        "type": "A::Khhkkk",
+        "id": "."
+      },
+      "resource": {
+        "type": "A::Khhkkk",
+        "id": "."
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::Khhkkk::\".\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::Khhkkk::\".\"",
+      "principal": {
+        "type": "A::Khhkkk",
+        "id": "."
+      },
+      "resource": {
+        "type": "A::Khhkkk",
+        "id": "."
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a54f9c6bdd7a65aad28eea03eaef38ef77f3914f.json b/cedar-integration-tests/corpus_tests/a54f9c6bdd7a65aad28eea03eaef38ef77f3914f.json
index 7cfcc6309..4d7f9897c 100644
--- a/cedar-integration-tests/corpus_tests/a54f9c6bdd7a65aad28eea03eaef38ef77f3914f.json
+++ b/cedar-integration-tests/corpus_tests/a54f9c6bdd7a65aad28eea03eaef38ef77f3914f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\\"\\\"\\\"\\\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\\"\\\"\\\"\\\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\"\"\"\""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\"\"\"\""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\\"\\\"\\\"\\\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\\"\\\"\\\"\\\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\"\"\"\""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\"\"\"\""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\\"\\\"\\\"\\\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\\"\\\"\\\"\\\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\"\"\"\""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\"\"\"\""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\\"\\\"\\\"\\\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\\"\\\"\\\"\\\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\"\"\"\""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\"\"\"\""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\\"\\\"\\\"\\\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\\"\\\"\\\"\\\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\"\"\"\""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\"\"\"\""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\\"\\\"\\\"\\\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\\"\\\"\\\"\\\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\"\"\"\""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\"\"\"\""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\\"\\\"\\\"\\\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\\"\\\"\\\"\\\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\"\"\"\""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\"\"\"\""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\\"\\\"\\\"\\\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\\"\\\"\\\"\\\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\"\"\"\""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\"\"\"\""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/a58af662d9307881939fdb3948822b3be6620cce.json b/cedar-integration-tests/corpus_tests/a58af662d9307881939fdb3948822b3be6620cce.json
index fa52bcf39..4e685ac15 100644
--- a/cedar-integration-tests/corpus_tests/a58af662d9307881939fdb3948822b3be6620cce.json
+++ b/cedar-integration-tests/corpus_tests/a58af662d9307881939fdb3948822b3be6620cce.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0`\\0\\0j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0`\\0\\0j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000`\u0000\u0000j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000`\u0000\u0000j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0`\\0\\0j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0`\\0\\0j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000`\u0000\u0000j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000`\u0000\u0000j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0`\\0\\0j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0`\\0\\0j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000`\u0000\u0000j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000`\u0000\u0000j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0`\\0\\0j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0`\\0\\0j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000`\u0000\u0000j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000`\u0000\u0000j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0`\\0\\0j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0`\\0\\0j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000`\u0000\u0000j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000`\u0000\u0000j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0`\\0\\0j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0`\\0\\0j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000`\u0000\u0000j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000`\u0000\u0000j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0`\\0\\0j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0`\\0\\0j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000`\u0000\u0000j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000`\u0000\u0000j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0`\\0\\0j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0`\\0\\0j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000`\u0000\u0000j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000`\u0000\u0000j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a596945828158d5e9660026876c9978689c098de.json b/cedar-integration-tests/corpus_tests/a596945828158d5e9660026876c9978689c098de.json
index 078d6bbbe..1707c4fa5 100644
--- a/cedar-integration-tests/corpus_tests/a596945828158d5e9660026876c9978689c098de.json
+++ b/cedar-integration-tests/corpus_tests/a596945828158d5e9660026876c9978689c098de.json
@@ -6,9 +6,15 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "cP::v::vxCxz::\"\"",
-      "action": "cP::v::Action::\"zd\"",
+      "principal": {
+        "type": "cP::v::vxCxz",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "cP::v::Action",
+        "id": "zd"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +24,15 @@
     },
     {
       "desc": "Query 1",
-      "principal": "cP::v::vxCxz::\"\"",
-      "action": "cP::v::Action::\"zd\"",
+      "principal": {
+        "type": "cP::v::vxCxz",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "cP::v::Action",
+        "id": "zd"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +42,15 @@
     },
     {
       "desc": "Query 2",
-      "principal": "cP::v::vxCxz::\"\"",
-      "action": "cP::v::Action::\"zd\"",
+      "principal": {
+        "type": "cP::v::vxCxz",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "cP::v::Action",
+        "id": "zd"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +60,15 @@
     },
     {
       "desc": "Query 3",
-      "principal": "cP::v::vxCxz::\"\"",
-      "action": "cP::v::Action::\"zd\"",
+      "principal": {
+        "type": "cP::v::vxCxz",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "cP::v::Action",
+        "id": "zd"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +78,15 @@
     },
     {
       "desc": "Query 4",
-      "principal": "cP::v::vxCxz::\"\"",
-      "action": "cP::v::Action::\"zd\"",
+      "principal": {
+        "type": "cP::v::vxCxz",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "cP::v::Action",
+        "id": "zd"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +96,15 @@
     },
     {
       "desc": "Query 5",
-      "principal": "cP::v::vxCxz::\"\"",
-      "action": "cP::v::Action::\"zd\"",
+      "principal": {
+        "type": "cP::v::vxCxz",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "cP::v::Action",
+        "id": "zd"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +114,15 @@
     },
     {
       "desc": "Query 6",
-      "principal": "cP::v::vxCxz::\"\"",
-      "action": "cP::v::Action::\"zd\"",
+      "principal": {
+        "type": "cP::v::vxCxz",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "cP::v::Action",
+        "id": "zd"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +132,15 @@
     },
     {
       "desc": "Query 7",
-      "principal": "cP::v::vxCxz::\"\"",
-      "action": "cP::v::Action::\"zd\"",
+      "principal": {
+        "type": "cP::v::vxCxz",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "cP::v::Action",
+        "id": "zd"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a5f5eaf2971db213ce1b1716d0e088b80ae6959b.json b/cedar-integration-tests/corpus_tests/a5f5eaf2971db213ce1b1716d0e088b80ae6959b.json
index d3eec21ce..3cead13b9 100644
--- a/cedar-integration-tests/corpus_tests/a5f5eaf2971db213ce1b1716d0e088b80ae6959b.json
+++ b/cedar-integration-tests/corpus_tests/a5f5eaf2971db213ce1b1716d0e088b80ae6959b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "y": -502650286645773924,
         "yi": -502650286645773924
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "y": -502650286645773924,
         "yi": -502650286645773924
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "y": -502650286645773924,
         "yi": -502650286645773924
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "y": -502650286645773924,
         "yi": -502650286645773924
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "y": -502650286645773924,
         "yi": -502650286645773924
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "y": -502650286645773924,
         "yi": -502650286645773924
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "y": -502650286645773924,
         "yi": -502650286645773924
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "y": -502650286645773924,
         "yi": -502650286645773924
diff --git a/cedar-integration-tests/corpus_tests/a5feeea2c9b1b816cba003732da8fe1ae9bb12c4.json b/cedar-integration-tests/corpus_tests/a5feeea2c9b1b816cba003732da8fe1ae9bb12c4.json
index 3d64f3e09..752098843 100644
--- a/cedar-integration-tests/corpus_tests/a5feeea2c9b1b816cba003732da8fe1ae9bb12c4.json
+++ b/cedar-integration-tests/corpus_tests/a5feeea2c9b1b816cba003732da8fe1ae9bb12c4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Fwwwwww0::a::\"::\"",
-      "action": "Fwwwwww0::Action::\"\"",
-      "resource": "Fwwwwww0::a::\"::\"",
+      "principal": {
+        "type": "Fwwwwww0::a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "Fwwwwww0::a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Fwwwwww0::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Fwwwwww0::a::\"::\"",
-      "action": "Fwwwwww0::Action::\"\"",
-      "resource": "Fwwwwww0::a::\"::\"",
+      "principal": {
+        "type": "Fwwwwww0::a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "Fwwwwww0::a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Fwwwwww0::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Fwwwwww0::a::\"::\"",
-      "action": "Fwwwwww0::Action::\"\"",
-      "resource": "Fwwwwww0::a::\"::\"",
+      "principal": {
+        "type": "Fwwwwww0::a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "Fwwwwww0::a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Fwwwwww0::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Fwwwwww0::a::\"::\"",
-      "action": "Fwwwwww0::Action::\"\"",
-      "resource": "Fwwwwww0::a::\"::\"",
+      "principal": {
+        "type": "Fwwwwww0::a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "Fwwwwww0::a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Fwwwwww0::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Fwwwwww0::a::\"::\"",
-      "action": "Fwwwwww0::Action::\"\"",
-      "resource": "Fwwwwww0::a::\"::\"",
+      "principal": {
+        "type": "Fwwwwww0::a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "Fwwwwww0::a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Fwwwwww0::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Fwwwwww0::a::\"::\"",
-      "action": "Fwwwwww0::Action::\"\"",
-      "resource": "Fwwwwww0::a::\"::\"",
+      "principal": {
+        "type": "Fwwwwww0::a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "Fwwwwww0::a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Fwwwwww0::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Fwwwwww0::a::\"::\"",
-      "action": "Fwwwwww0::Action::\"\"",
-      "resource": "Fwwwwww0::a::\"::\"",
+      "principal": {
+        "type": "Fwwwwww0::a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "Fwwwwww0::a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Fwwwwww0::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Fwwwwww0::a::\"::\"",
-      "action": "Fwwwwww0::Action::\"\"",
-      "resource": "Fwwwwww0::a::\"::\"",
+      "principal": {
+        "type": "Fwwwwww0::a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "Fwwwwww0::a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Fwwwwww0::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a6161206cfbf724488baa4a9cd83863ae519abd3.json b/cedar-integration-tests/corpus_tests/a6161206cfbf724488baa4a9cd83863ae519abd3.json
index c48b9bcd4..f84524be1 100644
--- a/cedar-integration-tests/corpus_tests/a6161206cfbf724488baa4a9cd83863ae519abd3.json
+++ b/cedar-integration-tests/corpus_tests/a6161206cfbf724488baa4a9cd83863ae519abd3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/a631815a860cf73e32d9e348beae43039df1c2cd.json b/cedar-integration-tests/corpus_tests/a631815a860cf73e32d9e348beae43039df1c2cd.json
index 5a562c618..117c135cb 100644
--- a/cedar-integration-tests/corpus_tests/a631815a860cf73e32d9e348beae43039df1c2cd.json
+++ b/cedar-integration-tests/corpus_tests/a631815a860cf73e32d9e348beae43039df1c2cd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a63d3ef84a6332dc404d6d9785f468b0204c274c.json b/cedar-integration-tests/corpus_tests/a63d3ef84a6332dc404d6d9785f468b0204c274c.json
index 3723d1af5..8857c4110 100644
--- a/cedar-integration-tests/corpus_tests/a63d3ef84a6332dc404d6d9785f468b0204c274c.json
+++ b/cedar-integration-tests/corpus_tests/a63d3ef84a6332dc404d6d9785f468b0204c274c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/a64e10570f30a6d811e9cbd4d17eca3239eb7ba6.json b/cedar-integration-tests/corpus_tests/a64e10570f30a6d811e9cbd4d17eca3239eb7ba6.json
index c1e1dcacd..d8f9631a3 100644
--- a/cedar-integration-tests/corpus_tests/a64e10570f30a6d811e9cbd4d17eca3239eb7ba6.json
+++ b/cedar-integration-tests/corpus_tests/a64e10570f30a6d811e9cbd4d17eca3239eb7ba6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "C6w::r::a::\"\"",
-      "action": "C6w::r::Action::\"action\"",
-      "resource": "C6w::r::a::\"\\0\"",
+      "principal": {
+        "type": "C6w::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C6w::r::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "C6w::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "C6w::r::a::\"\\0\"",
-      "action": "C6w::r::Action::\"action\"",
-      "resource": "C6w::r::a::\"\\0\"",
+      "principal": {
+        "type": "C6w::r::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "C6w::r::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "C6w::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "C6w::r::a::\"\\0\"",
-      "action": "C6w::r::Action::\"action\"",
-      "resource": "C6w::r::a::\"\\0\"",
+      "principal": {
+        "type": "C6w::r::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "C6w::r::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "C6w::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "C6w::r::a::\"\\0\"",
-      "action": "C6w::r::Action::\"action\"",
-      "resource": "C6w::r::a::\"\\0\"",
+      "principal": {
+        "type": "C6w::r::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "C6w::r::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "C6w::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "C6w::r::a::\"\\0\"",
-      "action": "C6w::r::Action::\"action\"",
-      "resource": "C6w::r::a::\"\\0\"",
+      "principal": {
+        "type": "C6w::r::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "C6w::r::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "C6w::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "C6w::r::a::\"\\0\"",
-      "action": "C6w::r::Action::\"action\"",
-      "resource": "C6w::r::a::\"\\0\"",
+      "principal": {
+        "type": "C6w::r::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "C6w::r::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "C6w::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "C6w::r::a::\"\\0\"",
-      "action": "C6w::r::Action::\"action\"",
-      "resource": "C6w::r::a::\"\\0\"",
+      "principal": {
+        "type": "C6w::r::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "C6w::r::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "C6w::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "C6w::r::a::\"\\0\"",
-      "action": "C6w::r::Action::\"action\"",
-      "resource": "C6w::r::a::\"\\0\"",
+      "principal": {
+        "type": "C6w::r::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "C6w::r::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "C6w::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a663996b98bd10c0501c4e6b1114a59c1df7ab42.json b/cedar-integration-tests/corpus_tests/a663996b98bd10c0501c4e6b1114a59c1df7ab42.json
index 084c14f79..e8d21d445 100644
--- a/cedar-integration-tests/corpus_tests/a663996b98bd10c0501c4e6b1114a59c1df7ab42.json
+++ b/cedar-integration-tests/corpus_tests/a663996b98bd10c0501c4e6b1114a59c1df7ab42.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\u{12}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\u{12}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0012"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0012"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\u{12}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\u{12}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0012"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0012"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\u{12}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\u{12}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0012"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0012"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\u{12}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\u{12}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0012"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0012"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\u{12}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\u{12}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0012"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0012"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\u{12}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\u{12}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0012"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0012"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\u{12}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\u{12}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0012"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0012"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\u{12}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\u{12}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0012"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0012"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a668f8dfb449583535685709a7d9fa1355e32e89.json b/cedar-integration-tests/corpus_tests/a668f8dfb449583535685709a7d9fa1355e32e89.json
index 27c6899a3..5674977b7 100644
--- a/cedar-integration-tests/corpus_tests/a668f8dfb449583535685709a7d9fa1355e32e89.json
+++ b/cedar-integration-tests/corpus_tests/a668f8dfb449583535685709a7d9fa1355e32e89.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "F0ca": {
@@ -30,9 +39,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "F0ca": {
@@ -54,9 +72,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "F0ca": {
@@ -78,9 +105,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "F0ca": {
@@ -102,9 +138,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "F0ca": {
@@ -126,9 +171,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "F0ca": {
@@ -150,9 +204,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "F0ca": {
@@ -174,9 +237,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "F0ca": {
diff --git a/cedar-integration-tests/corpus_tests/a6a34b4a0bae150ab6a591014b93cee198e4fd9e.json b/cedar-integration-tests/corpus_tests/a6a34b4a0bae150ab6a591014b93cee198e4fd9e.json
index 496c8a52f..cd32dbdbf 100644
--- a/cedar-integration-tests/corpus_tests/a6a34b4a0bae150ab6a591014b93cee198e4fd9e.json
+++ b/cedar-integration-tests/corpus_tests/a6a34b4a0bae150ab6a591014b93cee198e4fd9e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/a6c21196776a4e91e71f1aea65176b4f1e3ae983.json b/cedar-integration-tests/corpus_tests/a6c21196776a4e91e71f1aea65176b4f1e3ae983.json
index 5ee7da273..8f5dcb697 100644
--- a/cedar-integration-tests/corpus_tests/a6c21196776a4e91e71f1aea65176b4f1e3ae983.json
+++ b/cedar-integration-tests/corpus_tests/a6c21196776a4e91e71f1aea65176b4f1e3ae983.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a6c6a059732046e9062e072b17117f14f7d470b1.json b/cedar-integration-tests/corpus_tests/a6c6a059732046e9062e072b17117f14f7d470b1.json
index 4501749bd..2e525f30c 100644
--- a/cedar-integration-tests/corpus_tests/a6c6a059732046e9062e072b17117f14f7d470b1.json
+++ b/cedar-integration-tests/corpus_tests/a6c6a059732046e9062e072b17117f14f7d470b1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a6f0ab11593571ef6c4ac31dff8bb1e6919548c7.json b/cedar-integration-tests/corpus_tests/a6f0ab11593571ef6c4ac31dff8bb1e6919548c7.json
index 845c53dcd..56d50a9b9 100644
--- a/cedar-integration-tests/corpus_tests/a6f0ab11593571ef6c4ac31dff8bb1e6919548c7.json
+++ b/cedar-integration-tests/corpus_tests/a6f0ab11593571ef6c4ac31dff8bb1e6919548c7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\";\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\";\"",
-      "action": "Action::\"\"",
-      "resource": "a::\";\"",
+      "principal": {
+        "type": "a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\";\"",
-      "action": "Action::\"\"",
-      "resource": "a::\";\"",
+      "principal": {
+        "type": "a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\";\"",
-      "action": "Action::\"\"",
-      "resource": "a::\";\"",
+      "principal": {
+        "type": "a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\";\"",
-      "action": "Action::\"\"",
-      "resource": "a::\";\"",
+      "principal": {
+        "type": "a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\";\"",
-      "action": "Action::\"\"",
-      "resource": "a::\";\"",
+      "principal": {
+        "type": "a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/a70eeca062f586c523963246d1762f1b3f9826a5.json b/cedar-integration-tests/corpus_tests/a70eeca062f586c523963246d1762f1b3f9826a5.json
index 4dbfb87a3..7b1a6bc9a 100644
--- a/cedar-integration-tests/corpus_tests/a70eeca062f586c523963246d1762f1b3f9826a5.json
+++ b/cedar-integration-tests/corpus_tests/a70eeca062f586c523963246d1762f1b3f9826a5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/a71d0f3bb35dfaafc92756b6a2e71a6d02d8bd76.json b/cedar-integration-tests/corpus_tests/a71d0f3bb35dfaafc92756b6a2e71a6d02d8bd76.json
index e7fd9d0e8..3532e2f77 100644
--- a/cedar-integration-tests/corpus_tests/a71d0f3bb35dfaafc92756b6a2e71a6d02d8bd76.json
+++ b/cedar-integration-tests/corpus_tests/a71d0f3bb35dfaafc92756b6a2e71a6d02d8bd76.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Khhzhhhk::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhzhhhk::\"....\"",
+      "principal": {
+        "type": "Khhzhhhk",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Khhzhhhk",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Khhzhhhk::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhzhhhk::\"....\"",
+      "principal": {
+        "type": "Khhzhhhk",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Khhzhhhk",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Khhzhhhk::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhzhhhk::\"....\"",
+      "principal": {
+        "type": "Khhzhhhk",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Khhzhhhk",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Khhzhhhk::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhzhhhk::\"....\"",
+      "principal": {
+        "type": "Khhzhhhk",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Khhzhhhk",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Khhzhhhk::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhzhhhk::\"....\"",
+      "principal": {
+        "type": "Khhzhhhk",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Khhzhhhk",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Khhzhhhk::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhzhhhk::\"....\"",
+      "principal": {
+        "type": "Khhzhhhk",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Khhzhhhk",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Khhzhhhk::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhzhhhk::\"....\"",
+      "principal": {
+        "type": "Khhzhhhk",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Khhzhhhk",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Khhzhhhk::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhzhhhk::\"....\"",
+      "principal": {
+        "type": "Khhzhhhk",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Khhzhhhk",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a77b6b9fe492bdd0c3e41e011921a5960d92bd06.json b/cedar-integration-tests/corpus_tests/a77b6b9fe492bdd0c3e41e011921a5960d92bd06.json
index bf67e56e1..986ba14bb 100644
--- a/cedar-integration-tests/corpus_tests/a77b6b9fe492bdd0c3e41e011921a5960d92bd06.json
+++ b/cedar-integration-tests/corpus_tests/a77b6b9fe492bdd0c3e41e011921a5960d92bd06.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"200\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"200\"",
+      "principal": {
+        "type": "a",
+        "id": "200"
+      },
+      "resource": {
+        "type": "a",
+        "id": "200"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"200\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"200\"",
+      "principal": {
+        "type": "a",
+        "id": "200"
+      },
+      "resource": {
+        "type": "a",
+        "id": "200"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"200\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "200"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"200\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"200\"",
+      "principal": {
+        "type": "a",
+        "id": "200"
+      },
+      "resource": {
+        "type": "a",
+        "id": "200"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"200\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"200\"",
+      "principal": {
+        "type": "a",
+        "id": "200"
+      },
+      "resource": {
+        "type": "a",
+        "id": "200"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"200\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"200\"",
+      "principal": {
+        "type": "a",
+        "id": "200"
+      },
+      "resource": {
+        "type": "a",
+        "id": "200"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"200\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"200\"",
+      "principal": {
+        "type": "a",
+        "id": "200"
+      },
+      "resource": {
+        "type": "a",
+        "id": "200"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"200\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"200\"",
+      "principal": {
+        "type": "a",
+        "id": "200"
+      },
+      "resource": {
+        "type": "a",
+        "id": "200"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/a7848e613881d5c8ef76a9b4d2daaf5391f604ca.json b/cedar-integration-tests/corpus_tests/a7848e613881d5c8ef76a9b4d2daaf5391f604ca.json
index a9dcfed1b..0998c5f83 100644
--- a/cedar-integration-tests/corpus_tests/a7848e613881d5c8ef76a9b4d2daaf5391f604ca.json
+++ b/cedar-integration-tests/corpus_tests/a7848e613881d5c8ef76a9b4d2daaf5391f604ca.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/a792445aa92865caed7a3bfd0f1daed35d6c28cd.json b/cedar-integration-tests/corpus_tests/a792445aa92865caed7a3bfd0f1daed35d6c28cd.json
index 5a920adcb..1821b1d02 100644
--- a/cedar-integration-tests/corpus_tests/a792445aa92865caed7a3bfd0f1daed35d6c28cd.json
+++ b/cedar-integration-tests/corpus_tests/a792445aa92865caed7a3bfd0f1daed35d6c28cd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/a79fb528d34791d0da895a0bbfb9f4a30c9da306.json b/cedar-integration-tests/corpus_tests/a79fb528d34791d0da895a0bbfb9f4a30c9da306.json
index 62d381a0f..bd7f38075 100644
--- a/cedar-integration-tests/corpus_tests/a79fb528d34791d0da895a0bbfb9f4a30c9da306.json
+++ b/cedar-integration-tests/corpus_tests/a79fb528d34791d0da895a0bbfb9f4a30c9da306.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/a815ab0a661a3ff66ab845596fdeefcaaa2232fc.json b/cedar-integration-tests/corpus_tests/a815ab0a661a3ff66ab845596fdeefcaaa2232fc.json
index d960e03b4..2e8351fda 100644
--- a/cedar-integration-tests/corpus_tests/a815ab0a661a3ff66ab845596fdeefcaaa2232fc.json
+++ b/cedar-integration-tests/corpus_tests/a815ab0a661a3ff66ab845596fdeefcaaa2232fc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/a83523a76464dc4cdbc49f69c8028989e301e6f7.json b/cedar-integration-tests/corpus_tests/a83523a76464dc4cdbc49f69c8028989e301e6f7.json
index f0f9c46df..9eb8912e9 100644
--- a/cedar-integration-tests/corpus_tests/a83523a76464dc4cdbc49f69c8028989e301e6f7.json
+++ b/cedar-integration-tests/corpus_tests/a83523a76464dc4cdbc49f69c8028989e301e6f7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a84c37ed3ee621ef38fd0620cda673cc3c76ba93.json b/cedar-integration-tests/corpus_tests/a84c37ed3ee621ef38fd0620cda673cc3c76ba93.json
index a2acbdc33..83f2b0f22 100644
--- a/cedar-integration-tests/corpus_tests/a84c37ed3ee621ef38fd0620cda673cc3c76ba93.json
+++ b/cedar-integration-tests/corpus_tests/a84c37ed3ee621ef38fd0620cda673cc3c76ba93.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"F\\0RR\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\\0RR\\0R\"",
+      "principal": {
+        "type": "a",
+        "id": "F\u0000RR\u0000R"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F\u0000RR\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"F\\0RR\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\\0RR\\0R\"",
+      "principal": {
+        "type": "a",
+        "id": "F\u0000RR\u0000R"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F\u0000RR\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"F\\0RR\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\\0RR\\0R\"",
+      "principal": {
+        "type": "a",
+        "id": "F\u0000RR\u0000R"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F\u0000RR\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"F\\0RR\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\\0RR\\0R\"",
+      "principal": {
+        "type": "a",
+        "id": "F\u0000RR\u0000R"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F\u0000RR\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"F\\0RR\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\\0RR\\0R\"",
+      "principal": {
+        "type": "a",
+        "id": "F\u0000RR\u0000R"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F\u0000RR\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"F\\0RR\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\\0RR\\0R\"",
+      "principal": {
+        "type": "a",
+        "id": "F\u0000RR\u0000R"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F\u0000RR\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"F\\0RR\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\\0RR\\0R\"",
+      "principal": {
+        "type": "a",
+        "id": "F\u0000RR\u0000R"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F\u0000RR\u0000R"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a86332e8417b2d0f3f98e810965de54f38d16ec0.json b/cedar-integration-tests/corpus_tests/a86332e8417b2d0f3f98e810965de54f38d16ec0.json
index 1f5ce346d..1e5d9db87 100644
--- a/cedar-integration-tests/corpus_tests/a86332e8417b2d0f3f98e810965de54f38d16ec0.json
+++ b/cedar-integration-tests/corpus_tests/a86332e8417b2d0f3f98e810965de54f38d16ec0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/a87b03bd9ed4c18a4d9346098593027c12180c97.json b/cedar-integration-tests/corpus_tests/a87b03bd9ed4c18a4d9346098593027c12180c97.json
index fbd49ecd3..866ac5179 100644
--- a/cedar-integration-tests/corpus_tests/a87b03bd9ed4c18a4d9346098593027c12180c97.json
+++ b/cedar-integration-tests/corpus_tests/a87b03bd9ed4c18a4d9346098593027c12180c97.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"z~\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z~\"",
+      "principal": {
+        "type": "a",
+        "id": "z~"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z~"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"z~\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z~\"",
+      "principal": {
+        "type": "a",
+        "id": "z~"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z~"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"z~\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z~\"",
+      "principal": {
+        "type": "a",
+        "id": "z~"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z~"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"z~\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z~\"",
+      "principal": {
+        "type": "a",
+        "id": "z~"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z~"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"z~\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"?\"",
+      "principal": {
+        "type": "a",
+        "id": "z~"
+      },
+      "resource": {
+        "type": "a",
+        "id": "?"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"z~\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "z~"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z~\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "z~"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -84,9 +147,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"z~\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z~\"",
+      "principal": {
+        "type": "a",
+        "id": "z~"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z~"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a8a34bb71ea2c2b440c290ac0a95cc0599bd8148.json b/cedar-integration-tests/corpus_tests/a8a34bb71ea2c2b440c290ac0a95cc0599bd8148.json
index 375c7e93b..645cf3bf3 100644
--- a/cedar-integration-tests/corpus_tests/a8a34bb71ea2c2b440c290ac0a95cc0599bd8148.json
+++ b/cedar-integration-tests/corpus_tests/a8a34bb71ea2c2b440c290ac0a95cc0599bd8148.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "lyyUIKldYqrj::\"\"",
-      "action": "Action::\"s\"",
-      "resource": "lyyUIKldYqrj::\"\"",
+      "principal": {
+        "type": "lyyUIKldYqrj",
+        "id": ""
+      },
+      "resource": {
+        "type": "lyyUIKldYqrj",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "s"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "lyyUIKldYqrj::\"\"",
-      "action": "Action::\"s\"",
-      "resource": "lyyUIKldYqrj::\"\"",
+      "principal": {
+        "type": "lyyUIKldYqrj",
+        "id": ""
+      },
+      "resource": {
+        "type": "lyyUIKldYqrj",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "s"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "lyyUIKldYqrj::\"\"",
-      "action": "Action::\"s\"",
-      "resource": "lyyUIKldYqrj::\"\"",
+      "principal": {
+        "type": "lyyUIKldYqrj",
+        "id": ""
+      },
+      "resource": {
+        "type": "lyyUIKldYqrj",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "s"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "lyyUIKldYqrj::\"\"",
-      "action": "Action::\"s\"",
-      "resource": "lyyUIKldYqrj::\"\"",
+      "principal": {
+        "type": "lyyUIKldYqrj",
+        "id": ""
+      },
+      "resource": {
+        "type": "lyyUIKldYqrj",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "s"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "lyyUIKldYqrj::\"\"",
-      "action": "Action::\"s\"",
-      "resource": "lyyUIKldYqrj::\"\"",
+      "principal": {
+        "type": "lyyUIKldYqrj",
+        "id": ""
+      },
+      "resource": {
+        "type": "lyyUIKldYqrj",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "s"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "lyyUIKldYqrj::\"\"",
-      "action": "Action::\"s\"",
-      "resource": "lyyUIKldYqrj::\"\"",
+      "principal": {
+        "type": "lyyUIKldYqrj",
+        "id": ""
+      },
+      "resource": {
+        "type": "lyyUIKldYqrj",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "s"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "lyyUIKldYqrj::\"\"",
-      "action": "Action::\"s\"",
-      "resource": "lyyUIKldYqrj::\"\"",
+      "principal": {
+        "type": "lyyUIKldYqrj",
+        "id": ""
+      },
+      "resource": {
+        "type": "lyyUIKldYqrj",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "s"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "lyyUIKldYqrj::\"\"",
-      "action": "Action::\"s\"",
-      "resource": "lyyUIKldYqrj::\"\"",
+      "principal": {
+        "type": "lyyUIKldYqrj",
+        "id": ""
+      },
+      "resource": {
+        "type": "lyyUIKldYqrj",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "s"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a8b757dff29c824709e5fcd3aeacdf2aa8cfebae.json b/cedar-integration-tests/corpus_tests/a8b757dff29c824709e5fcd3aeacdf2aa8cfebae.json
index 37951db09..bbd857d40 100644
--- a/cedar-integration-tests/corpus_tests/a8b757dff29c824709e5fcd3aeacdf2aa8cfebae.json
+++ b/cedar-integration-tests/corpus_tests/a8b757dff29c824709e5fcd3aeacdf2aa8cfebae.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/a8be60afeb8db1fed2a125cc52b40297b7219269.json b/cedar-integration-tests/corpus_tests/a8be60afeb8db1fed2a125cc52b40297b7219269.json
index 09d2a3bd3..414f754e0 100644
--- a/cedar-integration-tests/corpus_tests/a8be60afeb8db1fed2a125cc52b40297b7219269.json
+++ b/cedar-integration-tests/corpus_tests/a8be60afeb8db1fed2a125cc52b40297b7219269.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Vhhhhhhkkkk000333::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkk000333::\"....\"",
+      "principal": {
+        "type": "Vhhhhhhkkkk000333",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkk000333",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Vhhhhhhkkkk000333::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkk000333::\"....\"",
+      "principal": {
+        "type": "Vhhhhhhkkkk000333",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkk000333",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Vhhhhhhkkkk000333::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkk000333::\"....\"",
+      "principal": {
+        "type": "Vhhhhhhkkkk000333",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkk000333",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Vhhhhhhkkkk000333::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkk000333::\"....\"",
+      "principal": {
+        "type": "Vhhhhhhkkkk000333",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkk000333",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Vhhhhhhkkkk000333::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkk000333::\"....\"",
+      "principal": {
+        "type": "Vhhhhhhkkkk000333",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkk000333",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Vhhhhhhkkkk000333::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkk000333::\"....\"",
+      "principal": {
+        "type": "Vhhhhhhkkkk000333",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkk000333",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Vhhhhhhkkkk000333::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkk000333::\"....\"",
+      "principal": {
+        "type": "Vhhhhhhkkkk000333",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkk000333",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Vhhhhhhkkkk000333::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkk000333::\"....\"",
+      "principal": {
+        "type": "Vhhhhhhkkkk000333",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkk000333",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a8c129e6673079a29c3d31194c0a5fa5f35b811f.json b/cedar-integration-tests/corpus_tests/a8c129e6673079a29c3d31194c0a5fa5f35b811f.json
index ec41a2069..e28891907 100644
--- a/cedar-integration-tests/corpus_tests/a8c129e6673079a29c3d31194c0a5fa5f35b811f.json
+++ b/cedar-integration-tests/corpus_tests/a8c129e6673079a29c3d31194c0a5fa5f35b811f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"C\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "C\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/a8ccc3c4ca57bf8bddb318a4387ed4381c1b87c4.json b/cedar-integration-tests/corpus_tests/a8ccc3c4ca57bf8bddb318a4387ed4381c1b87c4.json
index f3f075d53..2b876c24c 100644
--- a/cedar-integration-tests/corpus_tests/a8ccc3c4ca57bf8bddb318a4387ed4381c1b87c4.json
+++ b/cedar-integration-tests/corpus_tests/a8ccc3c4ca57bf8bddb318a4387ed4381c1b87c4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a8fc79a3eec07b04aa1c95873391b6aeb87f2f83.json b/cedar-integration-tests/corpus_tests/a8fc79a3eec07b04aa1c95873391b6aeb87f2f83.json
index d54ee5c4f..67562a689 100644
--- a/cedar-integration-tests/corpus_tests/a8fc79a3eec07b04aa1c95873391b6aeb87f2f83.json
+++ b/cedar-integration-tests/corpus_tests/a8fc79a3eec07b04aa1c95873391b6aeb87f2f83.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0::L\\0\\0\\0%/lang/invo\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0::L\\0\\0\\0%/lang/invo\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000::L\u0000\u0000\u0000%/lang/invo"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000::L\u0000\u0000\u0000%/lang/invo"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0::L\\0\\0\\0%/lang/invo\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0::L\\0\\0\\0%/lang/invo\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000::L\u0000\u0000\u0000%/lang/invo"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000::L\u0000\u0000\u0000%/lang/invo"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0::L\\0\\0\\0%/lang/invo\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0::L\\0\\0\\0%/lang/invo\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000::L\u0000\u0000\u0000%/lang/invo"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000::L\u0000\u0000\u0000%/lang/invo"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0::L\\0\\0\\0%/lang/invo\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0::L\\0\\0\\0%/lang/invo\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000::L\u0000\u0000\u0000%/lang/invo"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000::L\u0000\u0000\u0000%/lang/invo"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0::L\\0\\0\\0%/lang/invo\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0::L\\0\\0\\0%/lang/invo\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000::L\u0000\u0000\u0000%/lang/invo"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000::L\u0000\u0000\u0000%/lang/invo"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0::L\\0\\0\\0%/lang/invo\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0::L\\0\\0\\0%/lang/invo\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000::L\u0000\u0000\u0000%/lang/invo"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000::L\u0000\u0000\u0000%/lang/invo"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0::L\\0\\0\\0%/lang/invo\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0::L\\0\\0\\0%/lang/invo\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000::L\u0000\u0000\u0000%/lang/invo"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000::L\u0000\u0000\u0000%/lang/invo"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0::L\\0\\0\\0%/lang/invo\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0::L\\0\\0\\0%/lang/invo\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000::L\u0000\u0000\u0000%/lang/invo"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000::L\u0000\u0000\u0000%/lang/invo"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a90bb06aa3fe36f3f82b8ab373d3a9eeba170538.json b/cedar-integration-tests/corpus_tests/a90bb06aa3fe36f3f82b8ab373d3a9eeba170538.json
index 75a88d7a2..a743878c1 100644
--- a/cedar-integration-tests/corpus_tests/a90bb06aa3fe36f3f82b8ab373d3a9eeba170538.json
+++ b/cedar-integration-tests/corpus_tests/a90bb06aa3fe36f3f82b8ab373d3a9eeba170538.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/a92907a4bd628ee45bc5da47bfc4724281b772d7.json b/cedar-integration-tests/corpus_tests/a92907a4bd628ee45bc5da47bfc4724281b772d7.json
index c327a0ea6..fd6c2b033 100644
--- a/cedar-integration-tests/corpus_tests/a92907a4bd628ee45bc5da47bfc4724281b772d7.json
+++ b/cedar-integration-tests/corpus_tests/a92907a4bd628ee45bc5da47bfc4724281b772d7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "ff\u0006": {
@@ -29,9 +38,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "ff\u0006": {
@@ -52,9 +70,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "ff\u0006": {
@@ -75,9 +102,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "ff\u0006": {
@@ -98,9 +134,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "ff\u0006": {
@@ -121,9 +166,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "ff\u0006": {
@@ -144,9 +198,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "ff\u0006": {
@@ -167,9 +230,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "ff\u0006": {
diff --git a/cedar-integration-tests/corpus_tests/a92eaa64313a15a7b6e9f6fe8cd0ad0d19ae4d79.json b/cedar-integration-tests/corpus_tests/a92eaa64313a15a7b6e9f6fe8cd0ad0d19ae4d79.json
index ae8e60d23..937123aab 100644
--- a/cedar-integration-tests/corpus_tests/a92eaa64313a15a7b6e9f6fe8cd0ad0d19ae4d79.json
+++ b/cedar-integration-tests/corpus_tests/a92eaa64313a15a7b6e9f6fe8cd0ad0d19ae4d79.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A0::l::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::l::\"\"",
+      "principal": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {
         "y": false
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A0::l::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::l::\"\"",
+      "principal": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {
         "y": false
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A0::l::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::l::\"\"",
+      "principal": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {
         "y": false
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A0::l::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::l::\"\"",
+      "principal": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {
         "y": false
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A0::l::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::l::\"\"",
+      "principal": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {
         "y": false
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A0::l::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::l::\"\"",
+      "principal": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {
         "y": false
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A0::l::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::l::\"\"",
+      "principal": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {
         "y": false
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A0::l::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::l::\"\"",
+      "principal": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {
         "y": false
       },
diff --git a/cedar-integration-tests/corpus_tests/a94a8c799f6f251cf64654360a670c71564f2e79.json b/cedar-integration-tests/corpus_tests/a94a8c799f6f251cf64654360a670c71564f2e79.json
index d087ba087..cc48244fe 100644
--- a/cedar-integration-tests/corpus_tests/a94a8c799f6f251cf64654360a670c71564f2e79.json
+++ b/cedar-integration-tests/corpus_tests/a94a8c799f6f251cf64654360a670c71564f2e79.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Vhhhghhhkkkkkkkk3::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhghhhkkkkkkkk3::\".\"",
+      "principal": {
+        "type": "Vhhhghhhkkkkkkkk3",
+        "id": "."
+      },
+      "resource": {
+        "type": "Vhhhghhhkkkkkkkk3",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Vhhhghhhkkkkkkkk3::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhghhhkkkkkkkk3::\".\"",
+      "principal": {
+        "type": "Vhhhghhhkkkkkkkk3",
+        "id": "."
+      },
+      "resource": {
+        "type": "Vhhhghhhkkkkkkkk3",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Vhhhghhhkkkkkkkk3::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhghhhkkkkkkkk3::\".\"",
+      "principal": {
+        "type": "Vhhhghhhkkkkkkkk3",
+        "id": "."
+      },
+      "resource": {
+        "type": "Vhhhghhhkkkkkkkk3",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Vhhhghhhkkkkkkkk3::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhghhhkkkkkkkk3::\".\"",
+      "principal": {
+        "type": "Vhhhghhhkkkkkkkk3",
+        "id": "."
+      },
+      "resource": {
+        "type": "Vhhhghhhkkkkkkkk3",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Vhhhghhhkkkkkkkk3::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhghhhkkkkkkkk3::\".\"",
+      "principal": {
+        "type": "Vhhhghhhkkkkkkkk3",
+        "id": "."
+      },
+      "resource": {
+        "type": "Vhhhghhhkkkkkkkk3",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Vhhhghhhkkkkkkkk3::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhghhhkkkkkkkk3::\".\"",
+      "principal": {
+        "type": "Vhhhghhhkkkkkkkk3",
+        "id": "."
+      },
+      "resource": {
+        "type": "Vhhhghhhkkkkkkkk3",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Vhhhghhhkkkkkkkk3::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhghhhkkkkkkkk3::\".\"",
+      "principal": {
+        "type": "Vhhhghhhkkkkkkkk3",
+        "id": "."
+      },
+      "resource": {
+        "type": "Vhhhghhhkkkkkkkk3",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Vhhhghhhkkkkkkkk3::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhghhhkkkkkkkk3::\".\"",
+      "principal": {
+        "type": "Vhhhghhhkkkkkkkk3",
+        "id": "."
+      },
+      "resource": {
+        "type": "Vhhhghhhkkkkkkkk3",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a96f74e880792fd63ae1068f22554fd8d3dce2e4.json b/cedar-integration-tests/corpus_tests/a96f74e880792fd63ae1068f22554fd8d3dce2e4.json
index bf81d7cdc..8e9d72e79 100644
--- a/cedar-integration-tests/corpus_tests/a96f74e880792fd63ae1068f22554fd8d3dce2e4.json
+++ b/cedar-integration-tests/corpus_tests/a96f74e880792fd63ae1068f22554fd8d3dce2e4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/a9bf1361a8f55899e5690f4edb3f63f151eb4345.json b/cedar-integration-tests/corpus_tests/a9bf1361a8f55899e5690f4edb3f63f151eb4345.json
index 7da933b40..009967fcc 100644
--- a/cedar-integration-tests/corpus_tests/a9bf1361a8f55899e5690f4edb3f63f151eb4345.json
+++ b/cedar-integration-tests/corpus_tests/a9bf1361a8f55899e5690f4edb3f63f151eb4345.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"F/t`\\u{3}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F/t`\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "F/t`\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F/t`\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"F/t`\\u{3}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F/t`\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "F/t`\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F/t`\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"F/t`\\u{3}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F/t`\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "F/t`\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F/t`\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"F/t`\\u{3}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F/t`\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "F/t`\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F/t`\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"/t\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F/t`\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "/t"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F/t`\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"F/t`\\u{3}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F/t`\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "F/t`\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F/t`\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"F/t`\\u{3}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F/t`\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "F/t`\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F/t`\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"F/t`\\u{3}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F/t`\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "F/t`\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "F/t`\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/a9f6c469b11bb65de265771a4ce262eef2da607b.json b/cedar-integration-tests/corpus_tests/a9f6c469b11bb65de265771a4ce262eef2da607b.json
index c0997ed5b..e7d5e08c8 100644
--- a/cedar-integration-tests/corpus_tests/a9f6c469b11bb65de265771a4ce262eef2da607b.json
+++ b/cedar-integration-tests/corpus_tests/a9f6c469b11bb65de265771a4ce262eef2da607b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"aiq\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "aiq"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}s\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}s\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}s\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}s\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}s\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}s\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}s\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}s\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002s\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/aa24455c7698ba851904d0fff952ae4edc7e76c4.json b/cedar-integration-tests/corpus_tests/aa24455c7698ba851904d0fff952ae4edc7e76c4.json
index f1760419d..ad4376c31 100644
--- a/cedar-integration-tests/corpus_tests/aa24455c7698ba851904d0fff952ae4edc7e76c4.json
+++ b/cedar-integration-tests/corpus_tests/aa24455c7698ba851904d0fff952ae4edc7e76c4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "ukkkkkkkkka20::Khhhhhh::A::\"\"",
-      "action": "ukkkkkkkkka20::Khhhhhh::Action::\"action\"",
-      "resource": "ukkkkkkkkka20::Khhhhhh::A::\"\"",
+      "principal": {
+        "type": "ukkkkkkkkka20::Khhhhhh::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "ukkkkkkkkka20::Khhhhhh::A",
+        "id": ""
+      },
+      "action": {
+        "type": "ukkkkkkkkka20::Khhhhhh::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "ukkkkkkkkka20::Khhhhhh::A::\"\"",
-      "action": "ukkkkkkkkka20::Khhhhhh::Action::\"action\"",
-      "resource": "ukkkkkkkkka20::Khhhhhh::A::\"\"",
+      "principal": {
+        "type": "ukkkkkkkkka20::Khhhhhh::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "ukkkkkkkkka20::Khhhhhh::A",
+        "id": ""
+      },
+      "action": {
+        "type": "ukkkkkkkkka20::Khhhhhh::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "ukkkkkkkkka20::Khhhhhh::A::\"\"",
-      "action": "ukkkkkkkkka20::Khhhhhh::Action::\"action\"",
-      "resource": "ukkkkkkkkka20::Khhhhhh::A::\"\"",
+      "principal": {
+        "type": "ukkkkkkkkka20::Khhhhhh::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "ukkkkkkkkka20::Khhhhhh::A",
+        "id": ""
+      },
+      "action": {
+        "type": "ukkkkkkkkka20::Khhhhhh::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "ukkkkkkkkka20::Khhhhhh::A::\"\"",
-      "action": "ukkkkkkkkka20::Khhhhhh::Action::\"action\"",
-      "resource": "ukkkkkkkkka20::Khhhhhh::A::\"\"",
+      "principal": {
+        "type": "ukkkkkkkkka20::Khhhhhh::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "ukkkkkkkkka20::Khhhhhh::A",
+        "id": ""
+      },
+      "action": {
+        "type": "ukkkkkkkkka20::Khhhhhh::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "ukkkkkkkkka20::Khhhhhh::A::\"\"",
-      "action": "ukkkkkkkkka20::Khhhhhh::Action::\"action\"",
-      "resource": "ukkkkkkkkka20::Khhhhhh::A::\"\"",
+      "principal": {
+        "type": "ukkkkkkkkka20::Khhhhhh::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "ukkkkkkkkka20::Khhhhhh::A",
+        "id": ""
+      },
+      "action": {
+        "type": "ukkkkkkkkka20::Khhhhhh::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "ukkkkkkkkka20::Khhhhhh::A::\"\"",
-      "action": "ukkkkkkkkka20::Khhhhhh::Action::\"action\"",
-      "resource": "ukkkkkkkkka20::Khhhhhh::A::\"\"",
+      "principal": {
+        "type": "ukkkkkkkkka20::Khhhhhh::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "ukkkkkkkkka20::Khhhhhh::A",
+        "id": ""
+      },
+      "action": {
+        "type": "ukkkkkkkkka20::Khhhhhh::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "ukkkkkkkkka20::Khhhhhh::A::\"\"",
-      "action": "ukkkkkkkkka20::Khhhhhh::Action::\"action\"",
-      "resource": "ukkkkkkkkka20::Khhhhhh::A::\"\"",
+      "principal": {
+        "type": "ukkkkkkkkka20::Khhhhhh::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "ukkkkkkkkka20::Khhhhhh::A",
+        "id": ""
+      },
+      "action": {
+        "type": "ukkkkkkkkka20::Khhhhhh::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "ukkkkkkkkka20::Khhhhhh::A::\"\"",
-      "action": "ukkkkkkkkka20::Khhhhhh::Action::\"action\"",
-      "resource": "ukkkkkkkkka20::Khhhhhh::A::\"\"",
+      "principal": {
+        "type": "ukkkkkkkkka20::Khhhhhh::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "ukkkkkkkkka20::Khhhhhh::A",
+        "id": ""
+      },
+      "action": {
+        "type": "ukkkkkkkkka20::Khhhhhh::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/aa622dd75db087080957e0009c870263691379a2.json b/cedar-integration-tests/corpus_tests/aa622dd75db087080957e0009c870263691379a2.json
index 020d5cfe3..8658a7137 100644
--- a/cedar-integration-tests/corpus_tests/aa622dd75db087080957e0009c870263691379a2.json
+++ b/cedar-integration-tests/corpus_tests/aa622dd75db087080957e0009c870263691379a2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"80\"",
+      "principal": {
+        "type": "a",
+        "id": "80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "u": "",
         "v": "",
@@ -22,9 +31,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"80\"",
+      "principal": {
+        "type": "a",
+        "id": "80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "u": "",
         "v": "",
@@ -38,9 +56,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"80\"",
+      "principal": {
+        "type": "a",
+        "id": "80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "u": "",
         "v": "",
@@ -54,9 +81,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"80\"",
+      "principal": {
+        "type": "a",
+        "id": "80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "u": "",
         "v": "",
@@ -70,9 +106,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"80\"",
+      "principal": {
+        "type": "a",
+        "id": "80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "u": "",
         "v": "",
@@ -86,9 +131,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"80\"",
+      "principal": {
+        "type": "a",
+        "id": "80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "u": "",
         "v": "",
@@ -102,9 +156,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"80\"",
+      "principal": {
+        "type": "a",
+        "id": "80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "u": "",
         "v": "",
@@ -118,9 +181,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"80\"",
+      "principal": {
+        "type": "a",
+        "id": "80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "u": "",
         "v": "",
diff --git a/cedar-integration-tests/corpus_tests/aaccddc926fd9164a6bc92dd03fe08d46080cc27.json b/cedar-integration-tests/corpus_tests/aaccddc926fd9164a6bc92dd03fe08d46080cc27.json
index f2536d427..332d8ebee 100644
--- a/cedar-integration-tests/corpus_tests/aaccddc926fd9164a6bc92dd03fe08d46080cc27.json
+++ b/cedar-integration-tests/corpus_tests/aaccddc926fd9164a6bc92dd03fe08d46080cc27.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::r::G::r::a::\":t:::\"",
-      "action": "r::r::r::G::r::Action::\"action\"",
-      "resource": "r::r::r::G::r::a::\":t:::\"",
+      "principal": {
+        "type": "r::r::r::G::r::a",
+        "id": ":t:::"
+      },
+      "resource": {
+        "type": "r::r::r::G::r::a",
+        "id": ":t:::"
+      },
+      "action": {
+        "type": "r::r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::r::G::r::a::\":t:::\"",
-      "action": "r::r::r::G::r::Action::\"action\"",
-      "resource": "r::r::r::G::r::a::\":t:::\"",
+      "principal": {
+        "type": "r::r::r::G::r::a",
+        "id": ":t:::"
+      },
+      "resource": {
+        "type": "r::r::r::G::r::a",
+        "id": ":t:::"
+      },
+      "action": {
+        "type": "r::r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::r::G::r::a::\":t:::\"",
-      "action": "r::r::r::G::r::Action::\"action\"",
-      "resource": "r::r::r::G::r::a::\":t:::\"",
+      "principal": {
+        "type": "r::r::r::G::r::a",
+        "id": ":t:::"
+      },
+      "resource": {
+        "type": "r::r::r::G::r::a",
+        "id": ":t:::"
+      },
+      "action": {
+        "type": "r::r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::r::G::r::a::\":t:::\"",
-      "action": "r::r::r::G::r::Action::\"action\"",
-      "resource": "r::r::r::G::r::a::\":t:::\"",
+      "principal": {
+        "type": "r::r::r::G::r::a",
+        "id": ":t:::"
+      },
+      "resource": {
+        "type": "r::r::r::G::r::a",
+        "id": ":t:::"
+      },
+      "action": {
+        "type": "r::r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::r::G::r::a::\":t:::\"",
-      "action": "r::r::r::G::r::Action::\"action\"",
-      "resource": "r::r::r::G::r::a::\":t:::\"",
+      "principal": {
+        "type": "r::r::r::G::r::a",
+        "id": ":t:::"
+      },
+      "resource": {
+        "type": "r::r::r::G::r::a",
+        "id": ":t:::"
+      },
+      "action": {
+        "type": "r::r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::r::G::r::a::\":t:::\"",
-      "action": "r::r::r::G::r::Action::\"action\"",
-      "resource": "r::r::r::G::r::a::\":t:::\"",
+      "principal": {
+        "type": "r::r::r::G::r::a",
+        "id": ":t:::"
+      },
+      "resource": {
+        "type": "r::r::r::G::r::a",
+        "id": ":t:::"
+      },
+      "action": {
+        "type": "r::r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::r::G::r::a::\":t:::\"",
-      "action": "r::r::r::G::r::Action::\"action\"",
-      "resource": "r::r::r::G::r::a::\":t:::\"",
+      "principal": {
+        "type": "r::r::r::G::r::a",
+        "id": ":t:::"
+      },
+      "resource": {
+        "type": "r::r::r::G::r::a",
+        "id": ":t:::"
+      },
+      "action": {
+        "type": "r::r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::r::G::r::a::\":t:::\"",
-      "action": "r::r::r::G::r::Action::\"action\"",
-      "resource": "r::r::r::G::r::a::\":t:::\"",
+      "principal": {
+        "type": "r::r::r::G::r::a",
+        "id": ":t:::"
+      },
+      "resource": {
+        "type": "r::r::r::G::r::a",
+        "id": ":t:::"
+      },
+      "action": {
+        "type": "r::r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/aae2794d09b22b46bd014d7a8c820d070ed730ea.json b/cedar-integration-tests/corpus_tests/aae2794d09b22b46bd014d7a8c820d070ed730ea.json
index c229489f7..795c67d37 100644
--- a/cedar-integration-tests/corpus_tests/aae2794d09b22b46bd014d7a8c820d070ed730ea.json
+++ b/cedar-integration-tests/corpus_tests/aae2794d09b22b46bd014d7a8c820d070ed730ea.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\0\\0\\0\\0\\0\\0\\0\\0da\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000da\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"+\\0\\0\\0\\0\\0\\0\\0\\0da\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\0\\0\\0\\0\\0\\0\\0\\0da\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000da\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000da\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"+\\0\\0\\0\\0\\0\\0\\0\\0da\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\0\\0\\0\\0\\0\\0\\0\\0da\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000da\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000da\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"+\\0\\0\\0\\0\\0\\0\\0\\0da\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\0\\0\\0\\0\\0\\0\\0\\0da\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000da\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000da\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"+\\0\\0\\0\\0\\0\\0\\0\\0da\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\0\\0\\0\\0\\0\\0\\0\\0da\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000da\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000da\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"+\\0\\0\\0\\0\\0\\0\\0\\0da\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\0\\0\\0\\0\\0\\0\\0\\0da\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000da\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000da\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"+\\0\\0\\0\\0\\0\\0\\0\\0da\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\0\\0\\0\\0\\0\\0\\0\\0da\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000da\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000da\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"+\\0\\0\\0\\0\\0\\0\\0\\0da\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\0\\0\\0\\0\\0\\0\\0\\0da\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000da\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000da\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ab2df42a94c24da0082192add3e33cc4f77e4cb2.json b/cedar-integration-tests/corpus_tests/ab2df42a94c24da0082192add3e33cc4f77e4cb2.json
index c986c2da4..173ccb489 100644
--- a/cedar-integration-tests/corpus_tests/ab2df42a94c24da0082192add3e33cc4f77e4cb2.json
+++ b/cedar-integration-tests/corpus_tests/ab2df42a94c24da0082192add3e33cc4f77e4cb2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"zzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"zzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"zzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"zzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"zzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"zzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"zzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"zzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ab562d3caf2edb027c4de066f9ca76d267a2b6d8.json b/cedar-integration-tests/corpus_tests/ab562d3caf2edb027c4de066f9ca76d267a2b6d8.json
index 4960c6f36..46251d608 100644
--- a/cedar-integration-tests/corpus_tests/ab562d3caf2edb027c4de066f9ca76d267a2b6d8.json
+++ b/cedar-integration-tests/corpus_tests/ab562d3caf2edb027c4de066f9ca76d267a2b6d8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ac209d438f68b0565007a4f5d5186d550022dcf4.json b/cedar-integration-tests/corpus_tests/ac209d438f68b0565007a4f5d5186d550022dcf4.json
index f31d0c03b..257d4e3b5 100644
--- a/cedar-integration-tests/corpus_tests/ac209d438f68b0565007a4f5d5186d550022dcf4.json
+++ b/cedar-integration-tests/corpus_tests/ac209d438f68b0565007a4f5d5186d550022dcf4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\":8\\0[\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":8\\0[\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":8\u0000[\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":8\u0000[\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":8\\0[\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":8\\0[\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":8\u0000[\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":8\u0000[\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\":8\\0[\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":8\u0000[\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ac2dd4eee2aebd24d6f979a378eb7aee76453ae2.json b/cedar-integration-tests/corpus_tests/ac2dd4eee2aebd24d6f979a378eb7aee76453ae2.json
index 5fa99c2c9..f00ef71d4 100644
--- a/cedar-integration-tests/corpus_tests/ac2dd4eee2aebd24d6f979a378eb7aee76453ae2.json
+++ b/cedar-integration-tests/corpus_tests/ac2dd4eee2aebd24d6f979a378eb7aee76453ae2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::FwwwwwPwss::\"\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::FwwwwwPwss::\"\"",
+      "principal": {
+        "type": "r::FwwwwwPwss",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::FwwwwwPwss",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::FwwwwwPwss::\"\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::FwwwwwPwss::\"\"",
+      "principal": {
+        "type": "r::FwwwwwPwss",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::FwwwwwPwss",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::FwwwwwPwss::\"\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::FwwwwwPwss::\"\"",
+      "principal": {
+        "type": "r::FwwwwwPwss",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::FwwwwwPwss",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::FwwwwwPwss::\"\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::FwwwwwPwss::\"\"",
+      "principal": {
+        "type": "r::FwwwwwPwss",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::FwwwwwPwss",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::FwwwwwPwss::\"\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::FwwwwwPwss::\"\"",
+      "principal": {
+        "type": "r::FwwwwwPwss",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::FwwwwwPwss",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::FwwwwwPwss::\"\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::FwwwwwPwss::\"\"",
+      "principal": {
+        "type": "r::FwwwwwPwss",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::FwwwwwPwss",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::FwwwwwPwss::\"\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::FwwwwwPwss::\"\"",
+      "principal": {
+        "type": "r::FwwwwwPwss",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::FwwwwwPwss",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::FwwwwwPwss::\"\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::FwwwwwPwss::\"\"",
+      "principal": {
+        "type": "r::FwwwwwPwss",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::FwwwwwPwss",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ac51e0917f706a71e24ebaacd4689e15b0c9b6bf.json b/cedar-integration-tests/corpus_tests/ac51e0917f706a71e24ebaacd4689e15b0c9b6bf.json
index 578f2720d..15cd8da69 100644
--- a/cedar-integration-tests/corpus_tests/ac51e0917f706a71e24ebaacd4689e15b0c9b6bf.json
+++ b/cedar-integration-tests/corpus_tests/ac51e0917f706a71e24ebaacd4689e15b0c9b6bf.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fwwwwwww": "",
         "G0b000wwhhhhhh": {}
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fwwwwwww": "",
         "G0b000wwhhhhhh": {}
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fwwwwwww": "",
         "G0b000wwhhhhhh": {}
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fwwwwwww": "",
         "G0b000wwhhhhhh": {}
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fwwwwwww": "",
         "G0b000wwhhhhhh": {}
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fwwwwwww": "",
         "G0b000wwhhhhhh": {}
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fwwwwwww": "",
         "G0b000wwhhhhhh": {}
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fwwwwwww": "",
         "G0b000wwhhhhhh": {}
diff --git a/cedar-integration-tests/corpus_tests/ac7972afc0145471ebb54468d69e5ee27e3d8542.json b/cedar-integration-tests/corpus_tests/ac7972afc0145471ebb54468d69e5ee27e3d8542.json
index 92c842971..c91974501 100644
--- a/cedar-integration-tests/corpus_tests/ac7972afc0145471ebb54468d69e5ee27e3d8542.json
+++ b/cedar-integration-tests/corpus_tests/ac7972afc0145471ebb54468d69e5ee27e3d8542.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Vhhhhhhkkkkkkkkki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Vhhhhhhkkkkkkkkki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Vhhhhhhkkkkkkkkki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Vhhhhhhkkkkkkkkki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Vhhhhhhkkkkkkkkki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Vhhhhhhkkkkkkkkki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Vhhhhhhkkkkkkkkki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Vhhhhhhkkkkkkkkki::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkki",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ac81cb6993afdd6f64d424ea051c57c3990a0077.json b/cedar-integration-tests/corpus_tests/ac81cb6993afdd6f64d424ea051c57c3990a0077.json
index 0f25f50b8..5484587fd 100644
--- a/cedar-integration-tests/corpus_tests/ac81cb6993afdd6f64d424ea051c57c3990a0077.json
+++ b/cedar-integration-tests/corpus_tests/ac81cb6993afdd6f64d424ea051c57c3990a0077.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}c\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ac960abd5a0e59a2ab3d8f11479b6e4afbe5c22f.json b/cedar-integration-tests/corpus_tests/ac960abd5a0e59a2ab3d8f11479b6e4afbe5c22f.json
index 01b871707..3c91f9ca6 100644
--- a/cedar-integration-tests/corpus_tests/ac960abd5a0e59a2ab3d8f11479b6e4afbe5c22f.json
+++ b/cedar-integration-tests/corpus_tests/ac960abd5a0e59a2ab3d8f11479b6e4afbe5c22f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sWqslWkgqaWxxxxRx": false,
         "Qxxx": false
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sWqslWkgqaWxxxxRx": false,
         "Qxxx": false
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sWqslWkgqaWxxxxRx": false,
         "Qxxx": false
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sWqslWkgqaWxxxxRx": false,
         "Qxxx": false
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sWqslWkgqaWxxxxRx": false,
         "Qxxx": false
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sWqslWkgqaWxxxxRx": false,
         "Qxxx": false
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sWqslWkgqaWxxxxRx": false,
         "Qxxx": false
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "sWqslWkgqaWxxxxRx": false,
         "Qxxx": false
diff --git a/cedar-integration-tests/corpus_tests/acb3ed70ecdb5f18671b256d118caacb1cf1244c.json b/cedar-integration-tests/corpus_tests/acb3ed70ecdb5f18671b256d118caacb1cf1244c.json
index a1e9760ec..7c39f8749 100644
--- a/cedar-integration-tests/corpus_tests/acb3ed70ecdb5f18671b256d118caacb1cf1244c.json
+++ b/cedar-integration-tests/corpus_tests/acb3ed70ecdb5f18671b256d118caacb1cf1244c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\00\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\00\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\00\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\00\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\00\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\00\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\00\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/acc5004eda3202c7270bbf092480ee6c4fb15ace.json b/cedar-integration-tests/corpus_tests/acc5004eda3202c7270bbf092480ee6c4fb15ace.json
index 8b934e4c8..7054849cd 100644
--- a/cedar-integration-tests/corpus_tests/acc5004eda3202c7270bbf092480ee6c4fb15ace.json
+++ b/cedar-integration-tests/corpus_tests/acc5004eda3202c7270bbf092480ee6c4fb15ace.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ad024f4b0007706d639f6b6214d5a2621963681b.json b/cedar-integration-tests/corpus_tests/ad024f4b0007706d639f6b6214d5a2621963681b.json
index 777e07e39..e0b33ef09 100644
--- a/cedar-integration-tests/corpus_tests/ad024f4b0007706d639f6b6214d5a2621963681b.json
+++ b/cedar-integration-tests/corpus_tests/ad024f4b0007706d639f6b6214d5a2621963681b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::A::a::\":\"",
-      "action": "A::A::Action::\"\"",
-      "resource": "A::A::a::\":\"",
+      "principal": {
+        "type": "A::A::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "A::A::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "A::A::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::A::a::\":\"",
-      "action": "A::A::Action::\"\"",
-      "resource": "A::A::a::\":\"",
+      "principal": {
+        "type": "A::A::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "A::A::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "A::A::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::A::a::\":\"",
-      "action": "A::A::Action::\"\"",
-      "resource": "A::A::a::\":\"",
+      "principal": {
+        "type": "A::A::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "A::A::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "A::A::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::A::a::\":\"",
-      "action": "A::A::Action::\"\"",
-      "resource": "A::A::a::\":\"",
+      "principal": {
+        "type": "A::A::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "A::A::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "A::A::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::A::a::\":\"",
-      "action": "A::A::Action::\"\"",
-      "resource": "A::A::a::\":\"",
+      "principal": {
+        "type": "A::A::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "A::A::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "A::A::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::A::a::\":\"",
-      "action": "A::A::Action::\"\"",
-      "resource": "A::A::a::\":\"",
+      "principal": {
+        "type": "A::A::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "A::A::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "A::A::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::A::a::\":\"",
-      "action": "A::A::Action::\"\"",
-      "resource": "A::A::a::\":\"",
+      "principal": {
+        "type": "A::A::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "A::A::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "A::A::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::A::a::\":\"",
-      "action": "A::A::Action::\"\"",
-      "resource": "A::A::a::\":\"",
+      "principal": {
+        "type": "A::A::a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "A::A::a",
+        "id": ":"
+      },
+      "action": {
+        "type": "A::A::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ad12605abdad67cc856398795a680266f794494f.json b/cedar-integration-tests/corpus_tests/ad12605abdad67cc856398795a680266f794494f.json
index 2bf58da6e..a18c867db 100644
--- a/cedar-integration-tests/corpus_tests/ad12605abdad67cc856398795a680266f794494f.json
+++ b/cedar-integration-tests/corpus_tests/ad12605abdad67cc856398795a680266f794494f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Gxt833777::a::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::a::\"\"",
+      "principal": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Gxt833777::a::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::a::\"\"",
+      "principal": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Gxt833777::a::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::a::\"\"",
+      "principal": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Gxt833777::a::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::a::\"\"",
+      "principal": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Gxt833777::a::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::a::\"\"",
+      "principal": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Gxt833777::a::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::a::\"\"",
+      "principal": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Gxt833777::a::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::a::\"\"",
+      "principal": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Gxt833777::a::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::a::\"\"",
+      "principal": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ad2cc9597f44c1ec8b139752fc4292ebe66ce710.json b/cedar-integration-tests/corpus_tests/ad2cc9597f44c1ec8b139752fc4292ebe66ce710.json
index cadee22ee..a3fa3618d 100644
--- a/cedar-integration-tests/corpus_tests/ad2cc9597f44c1ec8b139752fc4292ebe66ce710.json
+++ b/cedar-integration-tests/corpus_tests/ad2cc9597f44c1ec8b139752fc4292ebe66ce710.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ad3fbf26c2855d5aaf75f48b29b649bd05692a10.json b/cedar-integration-tests/corpus_tests/ad3fbf26c2855d5aaf75f48b29b649bd05692a10.json
index 8ecdcb7de..a3326828b 100644
--- a/cedar-integration-tests/corpus_tests/ad3fbf26c2855d5aaf75f48b29b649bd05692a10.json
+++ b/cedar-integration-tests/corpus_tests/ad3fbf26c2855d5aaf75f48b29b649bd05692a10.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ad5600996bbc368f455e1c739f499c4cd9b77fc0.json b/cedar-integration-tests/corpus_tests/ad5600996bbc368f455e1c739f499c4cd9b77fc0.json
index c31339f85..c8f8d1293 100644
--- a/cedar-integration-tests/corpus_tests/ad5600996bbc368f455e1c739f499c4cd9b77fc0.json
+++ b/cedar-integration-tests/corpus_tests/ad5600996bbc368f455e1c739f499c4cd9b77fc0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "F::FamUJdww::\"\"",
-      "action": "F::Action::\"action\"",
-      "resource": "F::FamUJdww::\"\"",
+      "principal": {
+        "type": "F::FamUJdww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F::FamUJdww",
+        "id": ""
+      },
+      "action": {
+        "type": "F::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "F::FamUJdww::\"\"",
-      "action": "F::Action::\"action\"",
-      "resource": "F::FamUJdww::\"\"",
+      "principal": {
+        "type": "F::FamUJdww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F::FamUJdww",
+        "id": ""
+      },
+      "action": {
+        "type": "F::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "F::FamUJdww::\"\"",
-      "action": "F::Action::\"action\"",
-      "resource": "F::FamUJdww::\"\"",
+      "principal": {
+        "type": "F::FamUJdww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F::FamUJdww",
+        "id": ""
+      },
+      "action": {
+        "type": "F::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "F::FamUJdww::\"\"",
-      "action": "F::Action::\"action\"",
-      "resource": "F::FamUJdww::\"\"",
+      "principal": {
+        "type": "F::FamUJdww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F::FamUJdww",
+        "id": ""
+      },
+      "action": {
+        "type": "F::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "F::FamUJdww::\"\"",
-      "action": "F::Action::\"action\"",
-      "resource": "F::FamUJdww::\"\"",
+      "principal": {
+        "type": "F::FamUJdww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F::FamUJdww",
+        "id": ""
+      },
+      "action": {
+        "type": "F::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "F::FamUJdww::\"\"",
-      "action": "F::Action::\"action\"",
-      "resource": "F::FamUJdww::\"\"",
+      "principal": {
+        "type": "F::FamUJdww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F::FamUJdww",
+        "id": ""
+      },
+      "action": {
+        "type": "F::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "F::FamUJdww::\"\"",
-      "action": "F::Action::\"action\"",
-      "resource": "F::FamUJdww::\"\"",
+      "principal": {
+        "type": "F::FamUJdww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F::FamUJdww",
+        "id": ""
+      },
+      "action": {
+        "type": "F::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "F::FamUJdww::\"\"",
-      "action": "F::Action::\"action\"",
-      "resource": "F::FamUJdww::\"\"",
+      "principal": {
+        "type": "F::FamUJdww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F::FamUJdww",
+        "id": ""
+      },
+      "action": {
+        "type": "F::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ad60db88a7f37324e6c885200699a54b47768294.json b/cedar-integration-tests/corpus_tests/ad60db88a7f37324e6c885200699a54b47768294.json
index a4a528cf3..0d69d1e4e 100644
--- a/cedar-integration-tests/corpus_tests/ad60db88a7f37324e6c885200699a54b47768294.json
+++ b/cedar-integration-tests/corpus_tests/ad60db88a7f37324e6c885200699a54b47768294.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ad94686eeaa8a8c6ca06164decd6776f55c5ee96.json b/cedar-integration-tests/corpus_tests/ad94686eeaa8a8c6ca06164decd6776f55c5ee96.json
index 5fa5e0c6b..00665f584 100644
--- a/cedar-integration-tests/corpus_tests/ad94686eeaa8a8c6ca06164decd6776f55c5ee96.json
+++ b/cedar-integration-tests/corpus_tests/ad94686eeaa8a8c6ca06164decd6776f55c5ee96.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\u{4}\\0FFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\u{4}\\0FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\u{4}\\0FFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\u{4}\\0FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\u{4}\\0FFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\u{4}\\0FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\u{4}\\0FFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\u{4}\\0FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\u{4}\\0FFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\u{4}\\0FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\u{4}\\0FFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\u{4}\\0FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\u{4}\\0FFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\u{4}\\0FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\u{4}\\0FFF\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\u{4}\\0FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ad9568c97753068fff36e91d05581efbc24563c0.json b/cedar-integration-tests/corpus_tests/ad9568c97753068fff36e91d05581efbc24563c0.json
index 1025850e9..74db78504 100644
--- a/cedar-integration-tests/corpus_tests/ad9568c97753068fff36e91d05581efbc24563c0.json
+++ b/cedar-integration-tests/corpus_tests/ad9568c97753068fff36e91d05581efbc24563c0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}\\0\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0000\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/adfc05795139db386bbeb2c04e5f59813aee588f.json b/cedar-integration-tests/corpus_tests/adfc05795139db386bbeb2c04e5f59813aee588f.json
index eed9480da..a07cf8669 100644
--- a/cedar-integration-tests/corpus_tests/adfc05795139db386bbeb2c04e5f59813aee588f.json
+++ b/cedar-integration-tests/corpus_tests/adfc05795139db386bbeb2c04e5f59813aee588f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\"",
+      "principal": {
+        "type": "a",
+        "id": "`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\"",
+      "principal": {
+        "type": "a",
+        "id": "`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\"",
+      "principal": {
+        "type": "a",
+        "id": "`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\"",
+      "principal": {
+        "type": "a",
+        "id": "`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\"",
+      "principal": {
+        "type": "a",
+        "id": "`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\"",
+      "principal": {
+        "type": "a",
+        "id": "`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\"",
+      "principal": {
+        "type": "a",
+        "id": "`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\"",
+      "principal": {
+        "type": "a",
+        "id": "`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ae1dfb197982f0811f33f0379c9a6353fd85edc3.json b/cedar-integration-tests/corpus_tests/ae1dfb197982f0811f33f0379c9a6353fd85edc3.json
index 85c583893..7b44cfe74 100644
--- a/cedar-integration-tests/corpus_tests/ae1dfb197982f0811f33f0379c9a6353fd85edc3.json
+++ b/cedar-integration-tests/corpus_tests/ae1dfb197982f0811f33f0379c9a6353fd85edc3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ae2c67d1713bca35a2ef40518399e6d3af5f342b.json b/cedar-integration-tests/corpus_tests/ae2c67d1713bca35a2ef40518399e6d3af5f342b.json
index bf66a0e09..783179d29 100644
--- a/cedar-integration-tests/corpus_tests/ae2c67d1713bca35a2ef40518399e6d3af5f342b.json
+++ b/cedar-integration-tests/corpus_tests/ae2c67d1713bca35a2ef40518399e6d3af5f342b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ae7ff96bdcaf6552d9f0763e382daa001b6cdb40.json b/cedar-integration-tests/corpus_tests/ae7ff96bdcaf6552d9f0763e382daa001b6cdb40.json
index 8744ec780..dfe5729f8 100644
--- a/cedar-integration-tests/corpus_tests/ae7ff96bdcaf6552d9f0763e382daa001b6cdb40.json
+++ b/cedar-integration-tests/corpus_tests/ae7ff96bdcaf6552d9f0763e382daa001b6cdb40.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "mzzzzzcYdlw7z::r::a::\"\"",
-      "action": "mzzzzzcYdlw7z::r::Action::\"\"",
-      "resource": "mzzzzzcYdlw7z::r::a::\"\"",
+      "principal": {
+        "type": "mzzzzzcYdlw7z::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzzcYdlw7z::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzzcYdlw7z::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "mzzzzzcYdlw7z::r::a::\"\"",
-      "action": "mzzzzzcYdlw7z::r::Action::\"\"",
-      "resource": "mzzzzzcYdlw7z::r::a::\"\"",
+      "principal": {
+        "type": "mzzzzzcYdlw7z::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzzcYdlw7z::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzzcYdlw7z::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "mzzzzzcYdlw7z::r::a::\"\"",
-      "action": "mzzzzzcYdlw7z::r::Action::\"\"",
-      "resource": "mzzzzzcYdlw7z::r::a::\"\"",
+      "principal": {
+        "type": "mzzzzzcYdlw7z::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzzcYdlw7z::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzzcYdlw7z::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "mzzzzzcYdlw7z::r::a::\"\"",
-      "action": "mzzzzzcYdlw7z::r::Action::\"\"",
-      "resource": "mzzzzzcYdlw7z::r::a::\"\"",
+      "principal": {
+        "type": "mzzzzzcYdlw7z::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzzcYdlw7z::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzzcYdlw7z::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "mzzzzzcYdlw7z::r::a::\"\"",
-      "action": "mzzzzzcYdlw7z::r::Action::\"\"",
-      "resource": "mzzzzzcYdlw7z::r::a::\"\"",
+      "principal": {
+        "type": "mzzzzzcYdlw7z::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzzcYdlw7z::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzzcYdlw7z::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "mzzzzzcYdlw7z::r::a::\"\"",
-      "action": "mzzzzzcYdlw7z::r::Action::\"\"",
-      "resource": "mzzzzzcYdlw7z::r::a::\"\"",
+      "principal": {
+        "type": "mzzzzzcYdlw7z::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzzcYdlw7z::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzzcYdlw7z::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "mzzzzzcYdlw7z::r::a::\"\"",
-      "action": "mzzzzzcYdlw7z::r::Action::\"\"",
-      "resource": "mzzzzzcYdlw7z::r::a::\"\"",
+      "principal": {
+        "type": "mzzzzzcYdlw7z::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzzcYdlw7z::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzzcYdlw7z::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "mzzzzzcYdlw7z::r::a::\"\"",
-      "action": "mzzzzzcYdlw7z::r::Action::\"\"",
-      "resource": "mzzzzzcYdlw7z::r::a::\"\"",
+      "principal": {
+        "type": "mzzzzzcYdlw7z::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzzcYdlw7z::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzzcYdlw7z::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ae8da091a8eed99d190d1653722ecbdf451e5415.json b/cedar-integration-tests/corpus_tests/ae8da091a8eed99d190d1653722ecbdf451e5415.json
index 7f20cf6a0..38664ab69 100644
--- a/cedar-integration-tests/corpus_tests/ae8da091a8eed99d190d1653722ecbdf451e5415.json
+++ b/cedar-integration-tests/corpus_tests/ae8da091a8eed99d190d1653722ecbdf451e5415.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{5}\\n\\u{6}zoneinfo/\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}\\n\\u{6}zoneinfo/\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005\n\u0006zoneinfo/\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005\n\u0006zoneinfo/\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{5}\\n\\u{6}zoneinfo/\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}\\n\\u{6}zoneinfo/\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005\n\u0006zoneinfo/\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005\n\u0006zoneinfo/\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{5}\\n\\u{6}zoneinfo/\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}\\n\\u{6}zoneinfo/\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005\n\u0006zoneinfo/\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005\n\u0006zoneinfo/\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{5}\\n\\u{6}zoneinfo/\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}\\n\\u{6}zoneinfo/\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005\n\u0006zoneinfo/\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005\n\u0006zoneinfo/\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{5}\\n\\u{6}zoneinfo/\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}\\n\\u{6}zoneinfo/\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005\n\u0006zoneinfo/\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005\n\u0006zoneinfo/\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{5}\\n\\u{6}zoneinfo/\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}\\n\\u{6}zoneinfo/\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005\n\u0006zoneinfo/\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005\n\u0006zoneinfo/\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{5}\\n\\u{6}zoneinfo/\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}\\n\\u{6}zoneinfo/\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005\n\u0006zoneinfo/\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005\n\u0006zoneinfo/\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{5}\\n\\u{6}zoneinfo/\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}\\n\\u{6}zoneinfo/\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005\n\u0006zoneinfo/\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005\n\u0006zoneinfo/\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/aeafc5c38b367f9289c0a642fd60e531de2f3b57.json b/cedar-integration-tests/corpus_tests/aeafc5c38b367f9289c0a642fd60e531de2f3b57.json
index eb8115dd4..c4160dd55 100644
--- a/cedar-integration-tests/corpus_tests/aeafc5c38b367f9289c0a642fd60e531de2f3b57.json
+++ b/cedar-integration-tests/corpus_tests/aeafc5c38b367f9289c0a642fd60e531de2f3b57.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"FEF\"",
-      "action": "Action::\"zq\"",
-      "resource": "a::\"FEF\"",
+      "principal": {
+        "type": "a",
+        "id": "FEF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FEF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "zq"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"FEF\"",
-      "action": "Action::\"zq\"",
-      "resource": "a::\"FEF\"",
+      "principal": {
+        "type": "a",
+        "id": "FEF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FEF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "zq"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"FEF\"",
-      "action": "Action::\"zq\"",
-      "resource": "a::\"FEF\"",
+      "principal": {
+        "type": "a",
+        "id": "FEF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FEF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "zq"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"FEF\"",
-      "action": "Action::\"zq\"",
-      "resource": "a::\"FEF\"",
+      "principal": {
+        "type": "a",
+        "id": "FEF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FEF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "zq"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"FEF\"",
-      "action": "Action::\"zq\"",
-      "resource": "a::\"FEF\"",
+      "principal": {
+        "type": "a",
+        "id": "FEF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FEF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "zq"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"FEF\"",
-      "action": "Action::\"zq\"",
-      "resource": "a::\"FEF\"",
+      "principal": {
+        "type": "a",
+        "id": "FEF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FEF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "zq"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"FEF\"",
-      "action": "Action::\"zq\"",
-      "resource": "a::\"FEF\"",
+      "principal": {
+        "type": "a",
+        "id": "FEF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FEF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "zq"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"FEF\"",
-      "action": "Action::\"zq\"",
-      "resource": "a::\"FEF\"",
+      "principal": {
+        "type": "a",
+        "id": "FEF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FEF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "zq"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/aef35a4c59c7b94df6c961749a09f12d8a58a352.json b/cedar-integration-tests/corpus_tests/aef35a4c59c7b94df6c961749a09f12d8a58a352.json
index e9b08c07e..65fbf41f0 100644
--- a/cedar-integration-tests/corpus_tests/aef35a4c59c7b94df6c961749a09f12d8a58a352.json
+++ b/cedar-integration-tests/corpus_tests/aef35a4c59c7b94df6c961749a09f12d8a58a352.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/aeffa0eb74c897ada3e7d2d19f725267a96c95a2.json b/cedar-integration-tests/corpus_tests/aeffa0eb74c897ada3e7d2d19f725267a96c95a2.json
index fcc11f355..b15592064 100644
--- a/cedar-integration-tests/corpus_tests/aeffa0eb74c897ada3e7d2d19f725267a96c95a2.json
+++ b/cedar-integration-tests/corpus_tests/aeffa0eb74c897ada3e7d2d19f725267a96c95a2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "R::Wj::R::a::\"\"",
-      "action": "R::Wj::R::Action::\"action\"",
-      "resource": "R::Wj::R::a::\"\"",
+      "principal": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::R::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "R::Wj::R::a::\"\"",
-      "action": "R::Wj::R::Action::\"action\"",
-      "resource": "R::Wj::R::a::\"\"",
+      "principal": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::R::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "R::Wj::R::a::\"\"",
-      "action": "R::Wj::R::Action::\"action\"",
-      "resource": "R::Wj::R::a::\"\"",
+      "principal": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::R::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "R::Wj::R::a::\"\"",
-      "action": "R::Wj::R::Action::\"action\"",
-      "resource": "R::Wj::R::a::\"\"",
+      "principal": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::R::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "R::Wj::R::a::\"\"",
-      "action": "R::Wj::R::Action::\"action\"",
-      "resource": "R::Wj::R::a::\"\"",
+      "principal": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::R::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "R::Wj::R::a::\"\"",
-      "action": "R::Wj::R::Action::\"action\"",
-      "resource": "R::Wj::R::a::\"\"",
+      "principal": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::R::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "R::Wj::R::a::\"\"",
-      "action": "R::Wj::R::Action::\"action\"",
-      "resource": "R::Wj::R::a::\"\"",
+      "principal": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::R::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "R::Wj::R::a::\"\"",
-      "action": "R::Wj::R::Action::\"action\"",
-      "resource": "R::Wj::R::a::\"\"",
+      "principal": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::R::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::R::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/af02ff4c4f1361b328a242db69959e408a494694.json b/cedar-integration-tests/corpus_tests/af02ff4c4f1361b328a242db69959e408a494694.json
index 3a46c2993..b15cbb63c 100644
--- a/cedar-integration-tests/corpus_tests/af02ff4c4f1361b328a242db69959e408a494694.json
+++ b/cedar-integration-tests/corpus_tests/af02ff4c4f1361b328a242db69959e408a494694.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C00000000000000": "",
         "Bstvnnnmmustun_": "",
@@ -22,9 +31,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C00000000000000": "",
         "Bstvnnnmmustun_": "",
@@ -38,9 +56,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C00000000000000": "",
         "Bstvnnnmmustun_": "",
@@ -54,9 +81,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C00000000000000": "",
         "Bstvnnnmmustun_": "",
@@ -70,9 +106,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C00000000000000": "",
         "Bstvnnnmmustun_": "",
@@ -86,9 +131,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C00000000000000": "",
         "Bstvnnnmmustun_": "",
@@ -102,9 +156,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C00000000000000": "",
         "Bstvnnnmmustun_": "",
@@ -118,9 +181,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C00000000000000": "",
         "Bstvnnnmmustun_": "",
diff --git a/cedar-integration-tests/corpus_tests/af890984e3da2e79598e3fb4eba4fdb41989c984.json b/cedar-integration-tests/corpus_tests/af890984e3da2e79598e3fb4eba4fdb41989c984.json
index 4436b8790..7726000a5 100644
--- a/cedar-integration-tests/corpus_tests/af890984e3da2e79598e3fb4eba4fdb41989c984.json
+++ b/cedar-integration-tests/corpus_tests/af890984e3da2e79598e3fb4eba4fdb41989c984.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0 \\0,\\0\\0\\0\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0 \\0,\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000,\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000,\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0 \\0,\\0\\0\\0\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0 \\0,\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000,\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000,\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0 \\0,\\0\\0\\0\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0 \\0,\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000,\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000,\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0 \\0,\\0\\0\\0\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0 \\0,\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000,\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000,\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0 \\0,\\0\\0\\0\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0 \\0,\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000,\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000,\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0 \\0,\\0\\0\\0\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0 \\0,\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000,\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000,\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0 \\0,\\0\\0\\0\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0 \\0,\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000,\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000,\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0 \\0,\\0\\0\\0\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0 \\0,\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000,\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000 \u0000,\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/afa41923c27f22a96bfd76a9a8a3b2569b91a53e.json b/cedar-integration-tests/corpus_tests/afa41923c27f22a96bfd76a9a8a3b2569b91a53e.json
index 69a8b60b7..1e1efd585 100644
--- a/cedar-integration-tests/corpus_tests/afa41923c27f22a96bfd76a9a8a3b2569b91a53e.json
+++ b/cedar-integration-tests/corpus_tests/afa41923c27f22a96bfd76a9a8a3b2569b91a53e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\0\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0000\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b02a56cde55e6c6371c50bfa2a93a381cdc32495.json b/cedar-integration-tests/corpus_tests/b02a56cde55e6c6371c50bfa2a93a381cdc32495.json
index 603c50251..ef32ca81d 100644
--- a/cedar-integration-tests/corpus_tests/b02a56cde55e6c6371c50bfa2a93a381cdc32495.json
+++ b/cedar-integration-tests/corpus_tests/b02a56cde55e6c6371c50bfa2a93a381cdc32495.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffff,ff\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffff,ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"fffff,ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffff,ff\"",
+      "principal": {
+        "type": "a",
+        "id": "fffff,ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffff,ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"fffff,ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffff,ff\"",
+      "principal": {
+        "type": "a",
+        "id": "fffff,ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffff,ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"fffff,ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffff,ff\"",
+      "principal": {
+        "type": "a",
+        "id": "fffff,ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffff,ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"fffff,ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffff,ff\"",
+      "principal": {
+        "type": "a",
+        "id": "fffff,ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffff,ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"fffff,ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffff,ff\"",
+      "principal": {
+        "type": "a",
+        "id": "fffff,ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffff,ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"fffff,ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffff,ff\"",
+      "principal": {
+        "type": "a",
+        "id": "fffff,ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffff,ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"fffff,ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffff,ff\"",
+      "principal": {
+        "type": "a",
+        "id": "fffff,ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffff,ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/b03022745562f50975056c368a84a733ddba5319.json b/cedar-integration-tests/corpus_tests/b03022745562f50975056c368a84a733ddba5319.json
index 0ffade728..c708e769f 100644
--- a/cedar-integration-tests/corpus_tests/b03022745562f50975056c368a84a733ddba5319.json
+++ b/cedar-integration-tests/corpus_tests/b03022745562f50975056c368a84a733ddba5319.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "w::A::a::\"fFff\"",
-      "action": "w::A::Action::\"action\"",
-      "resource": "w::A::a::\"fFff\"",
+      "principal": {
+        "type": "w::A::a",
+        "id": "fFff"
+      },
+      "resource": {
+        "type": "w::A::a",
+        "id": "fFff"
+      },
+      "action": {
+        "type": "w::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "w::A::a::\"fFff\"",
-      "action": "w::A::Action::\"action\"",
-      "resource": "w::A::a::\"fFff\"",
+      "principal": {
+        "type": "w::A::a",
+        "id": "fFff"
+      },
+      "resource": {
+        "type": "w::A::a",
+        "id": "fFff"
+      },
+      "action": {
+        "type": "w::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "w::A::a::\"fFff\"",
-      "action": "w::A::Action::\"action\"",
-      "resource": "w::A::a::\"fFff\"",
+      "principal": {
+        "type": "w::A::a",
+        "id": "fFff"
+      },
+      "resource": {
+        "type": "w::A::a",
+        "id": "fFff"
+      },
+      "action": {
+        "type": "w::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "w::A::a::\"fFff\"",
-      "action": "w::A::Action::\"action\"",
-      "resource": "w::A::a::\"fFff\"",
+      "principal": {
+        "type": "w::A::a",
+        "id": "fFff"
+      },
+      "resource": {
+        "type": "w::A::a",
+        "id": "fFff"
+      },
+      "action": {
+        "type": "w::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "w::A::a::\"fFff\"",
-      "action": "w::A::Action::\"action\"",
-      "resource": "w::A::a::\"fFff\"",
+      "principal": {
+        "type": "w::A::a",
+        "id": "fFff"
+      },
+      "resource": {
+        "type": "w::A::a",
+        "id": "fFff"
+      },
+      "action": {
+        "type": "w::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "w::A::a::\"fFff\"",
-      "action": "w::A::Action::\"action\"",
-      "resource": "w::A::a::\"fFff\"",
+      "principal": {
+        "type": "w::A::a",
+        "id": "fFff"
+      },
+      "resource": {
+        "type": "w::A::a",
+        "id": "fFff"
+      },
+      "action": {
+        "type": "w::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "w::A::a::\"fFff\"",
-      "action": "w::A::Action::\"action\"",
-      "resource": "w::A::a::\"fFff\"",
+      "principal": {
+        "type": "w::A::a",
+        "id": "fFff"
+      },
+      "resource": {
+        "type": "w::A::a",
+        "id": "fFff"
+      },
+      "action": {
+        "type": "w::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "w::A::a::\"fFff\"",
-      "action": "w::A::Action::\"action\"",
-      "resource": "w::A::a::\"fFff\"",
+      "principal": {
+        "type": "w::A::a",
+        "id": "fFff"
+      },
+      "resource": {
+        "type": "w::A::a",
+        "id": "fFff"
+      },
+      "action": {
+        "type": "w::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b060c814a9da144f7c44fecc61aa19c899e14908.json b/cedar-integration-tests/corpus_tests/b060c814a9da144f7c44fecc61aa19c899e14908.json
index b669a5b73..10cec75f9 100644
--- a/cedar-integration-tests/corpus_tests/b060c814a9da144f7c44fecc61aa19c899e14908.json
+++ b/cedar-integration-tests/corpus_tests/b060c814a9da144f7c44fecc61aa19c899e14908.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"2\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "2"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/b09c050c89c695099088ec2c50e89094ecf2683e.json b/cedar-integration-tests/corpus_tests/b09c050c89c695099088ec2c50e89094ecf2683e.json
index 2a0ec51a4..09906e75b 100644
--- a/cedar-integration-tests/corpus_tests/b09c050c89c695099088ec2c50e89094ecf2683e.json
+++ b/cedar-integration-tests/corpus_tests/b09c050c89c695099088ec2c50e89094ecf2683e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "g::r::A::Q::a::\"\"",
-      "action": "g::r::A::Q::Action::\"action\"",
-      "resource": "g::r::A::Q::a::\"\"",
+      "principal": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "g::r::A::Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "g::r::A::Q::a::\"\"",
-      "action": "g::r::A::Q::Action::\"action\"",
-      "resource": "g::r::A::Q::a::\"\"",
+      "principal": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "g::r::A::Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "g::r::A::Q::a::\"\"",
-      "action": "g::r::A::Q::Action::\"action\"",
-      "resource": "g::r::A::Q::a::\"\"",
+      "principal": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "g::r::A::Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "g::r::A::Q::a::\"\"",
-      "action": "g::r::A::Q::Action::\"action\"",
-      "resource": "g::r::A::Q::a::\"\"",
+      "principal": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "g::r::A::Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "g::r::A::Q::a::\"\"",
-      "action": "g::r::A::Q::Action::\"action\"",
-      "resource": "g::r::A::Q::a::\"\"",
+      "principal": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "g::r::A::Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "g::r::A::Q::a::\"\"",
-      "action": "g::r::A::Q::Action::\"action\"",
-      "resource": "g::r::A::Q::a::\"\"",
+      "principal": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "g::r::A::Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "g::r::A::Q::a::\"\"",
-      "action": "g::r::A::Q::Action::\"action\"",
-      "resource": "g::r::A::Q::a::\"\"",
+      "principal": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "g::r::A::Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "g::r::A::Q::a::\"\"",
-      "action": "g::r::A::Q::Action::\"action\"",
-      "resource": "g::r::A::Q::a::\"\"",
+      "principal": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "g::r::A::Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/b0c3e7c0d07b08c6b94c5330ee508aa02b976d79.json b/cedar-integration-tests/corpus_tests/b0c3e7c0d07b08c6b94c5330ee508aa02b976d79.json
index 0a4954c55..9d17589ed 100644
--- a/cedar-integration-tests/corpus_tests/b0c3e7c0d07b08c6b94c5330ee508aa02b976d79.json
+++ b/cedar-integration-tests/corpus_tests/b0c3e7c0d07b08c6b94c5330ee508aa02b976d79.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r33::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r33::\"\"",
+      "principal": {
+        "type": "r33",
+        "id": ""
+      },
+      "resource": {
+        "type": "r33",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r33::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r33::\"\"",
+      "principal": {
+        "type": "r33",
+        "id": ""
+      },
+      "resource": {
+        "type": "r33",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r33::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r33::\"\"",
+      "principal": {
+        "type": "r33",
+        "id": ""
+      },
+      "resource": {
+        "type": "r33",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r33::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r33::\"\"",
+      "principal": {
+        "type": "r33",
+        "id": ""
+      },
+      "resource": {
+        "type": "r33",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r33::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r33::\"\"",
+      "principal": {
+        "type": "r33",
+        "id": ""
+      },
+      "resource": {
+        "type": "r33",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r33::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r33::\"\"",
+      "principal": {
+        "type": "r33",
+        "id": ""
+      },
+      "resource": {
+        "type": "r33",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r33::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r33::\"\"",
+      "principal": {
+        "type": "r33",
+        "id": ""
+      },
+      "resource": {
+        "type": "r33",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r33::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r33::\"\"",
+      "principal": {
+        "type": "r33",
+        "id": ""
+      },
+      "resource": {
+        "type": "r33",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b1248b892bd661b95b085cc5aea3c789d06f4c7a.json b/cedar-integration-tests/corpus_tests/b1248b892bd661b95b085cc5aea3c789d06f4c7a.json
index 8a3cb15d2..27ed4dcd8 100644
--- a/cedar-integration-tests/corpus_tests/b1248b892bd661b95b085cc5aea3c789d06f4c7a.json
+++ b/cedar-integration-tests/corpus_tests/b1248b892bd661b95b085cc5aea3c789d06f4c7a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "f111::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "f111::\"\"",
+      "principal": {
+        "type": "f111",
+        "id": ""
+      },
+      "resource": {
+        "type": "f111",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": []
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "f111::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "f111::\"\"",
+      "principal": {
+        "type": "f111",
+        "id": ""
+      },
+      "resource": {
+        "type": "f111",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": []
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "f111::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "f111::\"\"",
+      "principal": {
+        "type": "f111",
+        "id": ""
+      },
+      "resource": {
+        "type": "f111",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": []
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "f111::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "f111::\"\"",
+      "principal": {
+        "type": "f111",
+        "id": ""
+      },
+      "resource": {
+        "type": "f111",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": []
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "f111::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "f111::\"\"",
+      "principal": {
+        "type": "f111",
+        "id": ""
+      },
+      "resource": {
+        "type": "f111",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": []
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "f111::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "f111::\"\"",
+      "principal": {
+        "type": "f111",
+        "id": ""
+      },
+      "resource": {
+        "type": "f111",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": []
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "f111::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "f111::\"\"",
+      "principal": {
+        "type": "f111",
+        "id": ""
+      },
+      "resource": {
+        "type": "f111",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": []
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "f111::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "f111::\"\"",
+      "principal": {
+        "type": "f111",
+        "id": ""
+      },
+      "resource": {
+        "type": "f111",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": []
       },
diff --git a/cedar-integration-tests/corpus_tests/b16e13e2dfb0404e1fc0caa0e0abede544de5cbd.json b/cedar-integration-tests/corpus_tests/b16e13e2dfb0404e1fc0caa0e0abede544de5cbd.json
index ef6fadd3d..ce136610b 100644
--- a/cedar-integration-tests/corpus_tests/b16e13e2dfb0404e1fc0caa0e0abede544de5cbd.json
+++ b/cedar-integration-tests/corpus_tests/b16e13e2dfb0404e1fc0caa0e0abede544de5cbd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b179feb1214ecdeeca4643f1724304e90f0c5b52.json b/cedar-integration-tests/corpus_tests/b179feb1214ecdeeca4643f1724304e90f0c5b52.json
index d4bed02f1..ea632ce26 100644
--- a/cedar-integration-tests/corpus_tests/b179feb1214ecdeeca4643f1724304e90f0c5b52.json
+++ b/cedar-integration-tests/corpus_tests/b179feb1214ecdeeca4643f1724304e90f0c5b52.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::a::\"\\0\\'\\0\\0\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0000'\u0000\u0000"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::a::\"\\0\\'\\0\\0\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\\0\\'\\0\\0\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0000'\u0000\u0000"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "\u0000'\u0000\u0000"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::a::\"\\0\\'\\0\\0\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0000'\u0000\u0000"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b1aed3d993954e1122aba91bca73575cb9ef259a.json b/cedar-integration-tests/corpus_tests/b1aed3d993954e1122aba91bca73575cb9ef259a.json
index c8cf8eb4b..e810a978c 100644
--- a/cedar-integration-tests/corpus_tests/b1aed3d993954e1122aba91bca73575cb9ef259a.json
+++ b/cedar-integration-tests/corpus_tests/b1aed3d993954e1122aba91bca73575cb9ef259a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/b1bd4a844da9e80d56caf2319d0b09d9746274f6.json b/cedar-integration-tests/corpus_tests/b1bd4a844da9e80d56caf2319d0b09d9746274f6.json
index 98616a3c9..395fcf765 100644
--- a/cedar-integration-tests/corpus_tests/b1bd4a844da9e80d56caf2319d0b09d9746274f6.json
+++ b/cedar-integration-tests/corpus_tests/b1bd4a844da9e80d56caf2319d0b09d9746274f6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": ""
+      },
       "context": {
         "qx": {
           "__entity": {
@@ -26,9 +35,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": ""
+      },
       "context": {
         "qx": {
           "__entity": {
@@ -46,9 +64,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": ""
+      },
       "context": {
         "qx": {
           "__entity": {
@@ -66,9 +93,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": ""
+      },
       "context": {
         "qx": {
           "__entity": {
@@ -86,9 +122,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": ""
+      },
       "context": {
         "qx": {
           "__entity": {
@@ -106,9 +151,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": ""
+      },
       "context": {
         "qx": {
           "__entity": {
@@ -126,9 +180,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": ""
+      },
       "context": {
         "qx": {
           "__entity": {
@@ -146,9 +209,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": ""
+      },
       "context": {
         "qx": {
           "__entity": {
diff --git a/cedar-integration-tests/corpus_tests/b1cdf5f8969de06b11f9fe69168f746032eca879.json b/cedar-integration-tests/corpus_tests/b1cdf5f8969de06b11f9fe69168f746032eca879.json
index e2766f85a..5f399175e 100644
--- a/cedar-integration-tests/corpus_tests/b1cdf5f8969de06b11f9fe69168f746032eca879.json
+++ b/cedar-integration-tests/corpus_tests/b1cdf5f8969de06b11f9fe69168f746032eca879.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/b1f3140125d5a63832b560a8ceca4e9824da293d.json b/cedar-integration-tests/corpus_tests/b1f3140125d5a63832b560a8ceca4e9824da293d.json
index c039d5e3d..3f70bc957 100644
--- a/cedar-integration-tests/corpus_tests/b1f3140125d5a63832b560a8ceca4e9824da293d.json
+++ b/cedar-integration-tests/corpus_tests/b1f3140125d5a63832b560a8ceca4e9824da293d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b20c535ead0b171e75e413ad7a22add8b94fe12e.json b/cedar-integration-tests/corpus_tests/b20c535ead0b171e75e413ad7a22add8b94fe12e.json
index 153bd6815..999864692 100644
--- a/cedar-integration-tests/corpus_tests/b20c535ead0b171e75e413ad7a22add8b94fe12e.json
+++ b/cedar-integration-tests/corpus_tests/b20c535ead0b171e75e413ad7a22add8b94fe12e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::r::\"\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::r::\"\"",
+      "principal": {
+        "type": "r::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {
         "E": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::r::\"\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::r::\"\"",
+      "principal": {
+        "type": "r::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {
         "E": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::r::\"\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::r::\"\"",
+      "principal": {
+        "type": "r::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {
         "E": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::r::\"\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::r::\"\"",
+      "principal": {
+        "type": "r::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {
         "E": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::r::\"\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::r::\"\"",
+      "principal": {
+        "type": "r::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {
         "E": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::r::\"\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::r::\"\"",
+      "principal": {
+        "type": "r::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {
         "E": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::r::\"\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::r::\"\"",
+      "principal": {
+        "type": "r::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {
         "E": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::r::\"\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::r::\"\"",
+      "principal": {
+        "type": "r::r::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {
         "E": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/b22b165e1e51019db4f32dc3960a3856509e6b10.json b/cedar-integration-tests/corpus_tests/b22b165e1e51019db4f32dc3960a3856509e6b10.json
index 1b9c4a3f2..d6501f96c 100644
--- a/cedar-integration-tests/corpus_tests/b22b165e1e51019db4f32dc3960a3856509e6b10.json
+++ b/cedar-integration-tests/corpus_tests/b22b165e1e51019db4f32dc3960a3856509e6b10.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/b24ab34a4e77453be45d5743cce301254b9d4f70.json b/cedar-integration-tests/corpus_tests/b24ab34a4e77453be45d5743cce301254b9d4f70.json
index 38dcd098f..9db05c90f 100644
--- a/cedar-integration-tests/corpus_tests/b24ab34a4e77453be45d5743cce301254b9d4f70.json
+++ b/cedar-integration-tests/corpus_tests/b24ab34a4e77453be45d5743cce301254b9d4f70.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/b26b72b174aded01b6b866bbeb34751b7297733b.json b/cedar-integration-tests/corpus_tests/b26b72b174aded01b6b866bbeb34751b7297733b.json
index 0cec10562..a7f764512 100644
--- a/cedar-integration-tests/corpus_tests/b26b72b174aded01b6b866bbeb34751b7297733b.json
+++ b/cedar-integration-tests/corpus_tests/b26b72b174aded01b6b866bbeb34751b7297733b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/b2cf1b0ae1eee0fecd5a7c46c3487f3b6dc6b057.json b/cedar-integration-tests/corpus_tests/b2cf1b0ae1eee0fecd5a7c46c3487f3b6dc6b057.json
index 1cb86e7c2..81d3c35ed 100644
--- a/cedar-integration-tests/corpus_tests/b2cf1b0ae1eee0fecd5a7c46c3487f3b6dc6b057.json
+++ b/cedar-integration-tests/corpus_tests/b2cf1b0ae1eee0fecd5a7c46c3487f3b6dc6b057.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Qmc::Qx0xxu_YYYY::qmlAURxxx::\"\"",
-      "action": "Qmc::Qx0xxu_YYYY::Action::\"action\"",
-      "resource": "Qmc::Qx0xxu_YYYY::qmlAURxxx::\"\"",
+      "principal": {
+        "type": "Qmc::Qx0xxu_YYYY::qmlAURxxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "Qmc::Qx0xxu_YYYY::qmlAURxxx",
+        "id": ""
+      },
+      "action": {
+        "type": "Qmc::Qx0xxu_YYYY::Action",
+        "id": "action"
+      },
       "context": {
         "A000": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Qmc::Qx0xxu_YYYY::qmlAURxxx::\"\"",
-      "action": "Qmc::Qx0xxu_YYYY::Action::\"action\"",
-      "resource": "Qmc::Qx0xxu_YYYY::qmlAURxxx::\"\"",
+      "principal": {
+        "type": "Qmc::Qx0xxu_YYYY::qmlAURxxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "Qmc::Qx0xxu_YYYY::qmlAURxxx",
+        "id": ""
+      },
+      "action": {
+        "type": "Qmc::Qx0xxu_YYYY::Action",
+        "id": "action"
+      },
       "context": {
         "A000": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Qmc::Qx0xxu_YYYY::qmlAURxxx::\"\"",
-      "action": "Qmc::Qx0xxu_YYYY::Action::\"action\"",
-      "resource": "Qmc::Qx0xxu_YYYY::qmlAURxxx::\"\"",
+      "principal": {
+        "type": "Qmc::Qx0xxu_YYYY::qmlAURxxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "Qmc::Qx0xxu_YYYY::qmlAURxxx",
+        "id": ""
+      },
+      "action": {
+        "type": "Qmc::Qx0xxu_YYYY::Action",
+        "id": "action"
+      },
       "context": {
         "A000": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Qmc::Qx0xxu_YYYY::qmlAURxxx::\"\"",
-      "action": "Qmc::Qx0xxu_YYYY::Action::\"action\"",
-      "resource": "Qmc::Qx0xxu_YYYY::qmlAURxxx::\"\"",
+      "principal": {
+        "type": "Qmc::Qx0xxu_YYYY::qmlAURxxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "Qmc::Qx0xxu_YYYY::qmlAURxxx",
+        "id": ""
+      },
+      "action": {
+        "type": "Qmc::Qx0xxu_YYYY::Action",
+        "id": "action"
+      },
       "context": {
         "A000": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Qmc::Qx0xxu_YYYY::qmlAURxxx::\"\"",
-      "action": "Qmc::Qx0xxu_YYYY::Action::\"action\"",
-      "resource": "Qmc::Qx0xxu_YYYY::qmlAURxxx::\"\"",
+      "principal": {
+        "type": "Qmc::Qx0xxu_YYYY::qmlAURxxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "Qmc::Qx0xxu_YYYY::qmlAURxxx",
+        "id": ""
+      },
+      "action": {
+        "type": "Qmc::Qx0xxu_YYYY::Action",
+        "id": "action"
+      },
       "context": {
         "A000": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Qmc::Qx0xxu_YYYY::qmlAURxxx::\"\"",
-      "action": "Qmc::Qx0xxu_YYYY::Action::\"action\"",
-      "resource": "Qmc::Qx0xxu_YYYY::qmlAURxxx::\"\"",
+      "principal": {
+        "type": "Qmc::Qx0xxu_YYYY::qmlAURxxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "Qmc::Qx0xxu_YYYY::qmlAURxxx",
+        "id": ""
+      },
+      "action": {
+        "type": "Qmc::Qx0xxu_YYYY::Action",
+        "id": "action"
+      },
       "context": {
         "A000": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Qmc::Qx0xxu_YYYY::qmlAURxxx::\"\"",
-      "action": "Qmc::Qx0xxu_YYYY::Action::\"action\"",
-      "resource": "Qmc::Qx0xxu_YYYY::qmlAURxxx::\"\"",
+      "principal": {
+        "type": "Qmc::Qx0xxu_YYYY::qmlAURxxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "Qmc::Qx0xxu_YYYY::qmlAURxxx",
+        "id": ""
+      },
+      "action": {
+        "type": "Qmc::Qx0xxu_YYYY::Action",
+        "id": "action"
+      },
       "context": {
         "A000": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Qmc::Qx0xxu_YYYY::qmlAURxxx::\"\"",
-      "action": "Qmc::Qx0xxu_YYYY::Action::\"action\"",
-      "resource": "Qmc::Qx0xxu_YYYY::qmlAURxxx::\"\"",
+      "principal": {
+        "type": "Qmc::Qx0xxu_YYYY::qmlAURxxx",
+        "id": ""
+      },
+      "resource": {
+        "type": "Qmc::Qx0xxu_YYYY::qmlAURxxx",
+        "id": ""
+      },
+      "action": {
+        "type": "Qmc::Qx0xxu_YYYY::Action",
+        "id": "action"
+      },
       "context": {
         "A000": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/b3305ef1a95d6d84b653de740d0688824e6cc958.json b/cedar-integration-tests/corpus_tests/b3305ef1a95d6d84b653de740d0688824e6cc958.json
index 10667cd69..85cd2e137 100644
--- a/cedar-integration-tests/corpus_tests/b3305ef1a95d6d84b653de740d0688824e6cc958.json
+++ b/cedar-integration-tests/corpus_tests/b3305ef1a95d6d84b653de740d0688824e6cc958.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{5}\\u{5}ت\\0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0005\u0005ت\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\n\\u{5}\\u{5}ت\\0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0005\u0005ت\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b335948a70874cd4556e6b60cd794cd9285feb22.json b/cedar-integration-tests/corpus_tests/b335948a70874cd4556e6b60cd794cd9285feb22.json
index ed9b6eda2..fde5dc7ca 100644
--- a/cedar-integration-tests/corpus_tests/b335948a70874cd4556e6b60cd794cd9285feb22.json
+++ b/cedar-integration-tests/corpus_tests/b335948a70874cd4556e6b60cd794cd9285feb22.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A000": false,
         "r": false
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A000": false,
         "r": false
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A000": false,
         "r": false
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A000": false,
         "r": false
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A000": false,
         "r": false
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A000": false,
         "r": false
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A000": false,
         "r": false
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A000": false,
         "r": false
diff --git a/cedar-integration-tests/corpus_tests/b3e498fe461062e23f64aa092d6f868d712fcc85.json b/cedar-integration-tests/corpus_tests/b3e498fe461062e23f64aa092d6f868d712fcc85.json
index 879577b58..513364fc8 100644
--- a/cedar-integration-tests/corpus_tests/b3e498fe461062e23f64aa092d6f868d712fcc85.json
+++ b/cedar-integration-tests/corpus_tests/b3e498fe461062e23f64aa092d6f868d712fcc85.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"3\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "3"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/b3f1cf53e38305a659a1e2d048f9613d35acf097.json b/cedar-integration-tests/corpus_tests/b3f1cf53e38305a659a1e2d048f9613d35acf097.json
index a50896089..62d45778e 100644
--- a/cedar-integration-tests/corpus_tests/b3f1cf53e38305a659a1e2d048f9613d35acf097.json
+++ b/cedar-integration-tests/corpus_tests/b3f1cf53e38305a659a1e2d048f9613d35acf097.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": 4195882857412573894
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": 63
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": 0
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": 0
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": 0
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": 0
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": 0
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": 0
       },
diff --git a/cedar-integration-tests/corpus_tests/b4134b83b9dfec592e7806ef6612a86a5c3310a4.json b/cedar-integration-tests/corpus_tests/b4134b83b9dfec592e7806ef6612a86a5c3310a4.json
index 0ebc36b51..4450119c7 100644
--- a/cedar-integration-tests/corpus_tests/b4134b83b9dfec592e7806ef6612a86a5c3310a4.json
+++ b/cedar-integration-tests/corpus_tests/b4134b83b9dfec592e7806ef6612a86a5c3310a4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r3333::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r3333::\"\"",
+      "principal": {
+        "type": "r3333",
+        "id": ""
+      },
+      "resource": {
+        "type": "r3333",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r3333::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r3333::\"\"",
+      "principal": {
+        "type": "r3333",
+        "id": ""
+      },
+      "resource": {
+        "type": "r3333",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r3333::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r3333::\"\"",
+      "principal": {
+        "type": "r3333",
+        "id": ""
+      },
+      "resource": {
+        "type": "r3333",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r3333::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r3333::\"\"",
+      "principal": {
+        "type": "r3333",
+        "id": ""
+      },
+      "resource": {
+        "type": "r3333",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r3333::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r3333::\"\"",
+      "principal": {
+        "type": "r3333",
+        "id": ""
+      },
+      "resource": {
+        "type": "r3333",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r3333::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r3333::\"\"",
+      "principal": {
+        "type": "r3333",
+        "id": ""
+      },
+      "resource": {
+        "type": "r3333",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r3333::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r3333::\"\"",
+      "principal": {
+        "type": "r3333",
+        "id": ""
+      },
+      "resource": {
+        "type": "r3333",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r3333::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r3333::\"\"",
+      "principal": {
+        "type": "r3333",
+        "id": ""
+      },
+      "resource": {
+        "type": "r3333",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b42a2e319baa13c4bfc3207cfed423d5b235c7a3.json b/cedar-integration-tests/corpus_tests/b42a2e319baa13c4bfc3207cfed423d5b235c7a3.json
index 4beec3e29..b25cdb5e7 100644
--- a/cedar-integration-tests/corpus_tests/b42a2e319baa13c4bfc3207cfed423d5b235c7a3.json
+++ b/cedar-integration-tests/corpus_tests/b42a2e319baa13c4bfc3207cfed423d5b235c7a3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"6\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "6"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/b441a53ba07e60e2feb4257d374d179818c0e1a7.json b/cedar-integration-tests/corpus_tests/b441a53ba07e60e2feb4257d374d179818c0e1a7.json
index 0cf02702d..d67f26165 100644
--- a/cedar-integration-tests/corpus_tests/b441a53ba07e60e2feb4257d374d179818c0e1a7.json
+++ b/cedar-integration-tests/corpus_tests/b441a53ba07e60e2feb4257d374d179818c0e1a7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "R77::Rx::\"FFFFFFF\"",
-      "action": "R77::Action::\"action\"",
-      "resource": "R77::Rx::\"FFFFFFF\"",
+      "principal": {
+        "type": "R77::Rx",
+        "id": "FFFFFFF"
+      },
+      "resource": {
+        "type": "R77::Rx",
+        "id": "FFFFFFF"
+      },
+      "action": {
+        "type": "R77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "R77::Rx::\"FFFFFFF\"",
-      "action": "R77::Action::\"action\"",
-      "resource": "R77::Rx::\"FFFFFFF\"",
+      "principal": {
+        "type": "R77::Rx",
+        "id": "FFFFFFF"
+      },
+      "resource": {
+        "type": "R77::Rx",
+        "id": "FFFFFFF"
+      },
+      "action": {
+        "type": "R77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "R77::Rx::\"FFFFFFF\"",
-      "action": "R77::Action::\"action\"",
-      "resource": "R77::Rx::\"FFFFFFF\"",
+      "principal": {
+        "type": "R77::Rx",
+        "id": "FFFFFFF"
+      },
+      "resource": {
+        "type": "R77::Rx",
+        "id": "FFFFFFF"
+      },
+      "action": {
+        "type": "R77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "R77::Rx::\"FFFFFFF\"",
-      "action": "R77::Action::\"action\"",
-      "resource": "R77::Rx::\"FFFFFFF\"",
+      "principal": {
+        "type": "R77::Rx",
+        "id": "FFFFFFF"
+      },
+      "resource": {
+        "type": "R77::Rx",
+        "id": "FFFFFFF"
+      },
+      "action": {
+        "type": "R77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "R77::Rx::\"FFFFFFF\"",
-      "action": "R77::Action::\"action\"",
-      "resource": "R77::Rx::\"FFFFFFF\"",
+      "principal": {
+        "type": "R77::Rx",
+        "id": "FFFFFFF"
+      },
+      "resource": {
+        "type": "R77::Rx",
+        "id": "FFFFFFF"
+      },
+      "action": {
+        "type": "R77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "R77::Rx::\"FFFFFFF\"",
-      "action": "R77::Action::\"action\"",
-      "resource": "R77::Rx::\"FFFFFFF\"",
+      "principal": {
+        "type": "R77::Rx",
+        "id": "FFFFFFF"
+      },
+      "resource": {
+        "type": "R77::Rx",
+        "id": "FFFFFFF"
+      },
+      "action": {
+        "type": "R77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "R77::Rx::\"FFFFFFF\"",
-      "action": "R77::Action::\"action\"",
-      "resource": "R77::Rx::\"FFFFFFF\"",
+      "principal": {
+        "type": "R77::Rx",
+        "id": "FFFFFFF"
+      },
+      "resource": {
+        "type": "R77::Rx",
+        "id": "FFFFFFF"
+      },
+      "action": {
+        "type": "R77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "R77::Rx::\"FFFFFFF\"",
-      "action": "R77::Action::\"action\"",
-      "resource": "R77::Rx::\"FFFFFFF\"",
+      "principal": {
+        "type": "R77::Rx",
+        "id": "FFFFFFF"
+      },
+      "resource": {
+        "type": "R77::Rx",
+        "id": "FFFFFFF"
+      },
+      "action": {
+        "type": "R77::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b459c25a7f3d95ad0453a77d9b202e6200d675d8.json b/cedar-integration-tests/corpus_tests/b459c25a7f3d95ad0453a77d9b202e6200d675d8.json
index 83a3c2cd4..3fe5f361a 100644
--- a/cedar-integration-tests/corpus_tests/b459c25a7f3d95ad0453a77d9b202e6200d675d8.json
+++ b/cedar-integration-tests/corpus_tests/b459c25a7f3d95ad0453a77d9b202e6200d675d8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b47f0e7119ff8a7854787659ba6486ed5dd160b0.json b/cedar-integration-tests/corpus_tests/b47f0e7119ff8a7854787659ba6486ed5dd160b0.json
index af9603fe8..58f269ce9 100644
--- a/cedar-integration-tests/corpus_tests/b47f0e7119ff8a7854787659ba6486ed5dd160b0.json
+++ b/cedar-integration-tests/corpus_tests/b47f0e7119ff8a7854787659ba6486ed5dd160b0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/b4917d2a0f00a6ecc4ddca36bdc64bc3fd302075.json b/cedar-integration-tests/corpus_tests/b4917d2a0f00a6ecc4ddca36bdc64bc3fd302075.json
index fb1d172d5..01d407492 100644
--- a/cedar-integration-tests/corpus_tests/b4917d2a0f00a6ecc4ddca36bdc64bc3fd302075.json
+++ b/cedar-integration-tests/corpus_tests/b4917d2a0f00a6ecc4ddca36bdc64bc3fd302075.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/b4a367629c47a7bf4856cf0658f53e8ef6bd4012.json b/cedar-integration-tests/corpus_tests/b4a367629c47a7bf4856cf0658f53e8ef6bd4012.json
index 82b89b05f..34738b5b0 100644
--- a/cedar-integration-tests/corpus_tests/b4a367629c47a7bf4856cf0658f53e8ef6bd4012.json
+++ b/cedar-integration-tests/corpus_tests/b4a367629c47a7bf4856cf0658f53e8ef6bd4012.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"zzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"zzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"zzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"zzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"zzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"zzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"zzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"zzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b4dc1d4785707448f03dc5a5dcf34493a76ef134.json b/cedar-integration-tests/corpus_tests/b4dc1d4785707448f03dc5a5dcf34493a76ef134.json
index fc983746c..c05ead2ee 100644
--- a/cedar-integration-tests/corpus_tests/b4dc1d4785707448f03dc5a5dcf34493a76ef134.json
+++ b/cedar-integration-tests/corpus_tests/b4dc1d4785707448f03dc5a5dcf34493a76ef134.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Gxxxx100g::a::\"\"",
-      "action": "Gxxxx100g::Action::\"action\"",
-      "resource": "Gxxxx100g::a::\"\"",
+      "principal": {
+        "type": "Gxxxx100g::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxx100g::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxx100g::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Gxxxx100g::a::\"\"",
-      "action": "Gxxxx100g::Action::\"action\"",
-      "resource": "Gxxxx100g::a::\"\"",
+      "principal": {
+        "type": "Gxxxx100g::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxx100g::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxx100g::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Gxxxx100g::a::\"\"",
-      "action": "Gxxxx100g::Action::\"action\"",
-      "resource": "Gxxxx100g::a::\"\"",
+      "principal": {
+        "type": "Gxxxx100g::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxx100g::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxx100g::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Gxxxx100g::a::\"\"",
-      "action": "Gxxxx100g::Action::\"action\"",
-      "resource": "Gxxxx100g::a::\"\"",
+      "principal": {
+        "type": "Gxxxx100g::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxx100g::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxx100g::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Gxxxx100g::a::\"\"",
-      "action": "Gxxxx100g::Action::\"action\"",
-      "resource": "Gxxxx100g::a::\"\"",
+      "principal": {
+        "type": "Gxxxx100g::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxx100g::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxx100g::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Gxxxx100g::a::\"\"",
-      "action": "Gxxxx100g::Action::\"action\"",
-      "resource": "Gxxxx100g::a::\"\"",
+      "principal": {
+        "type": "Gxxxx100g::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxx100g::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxx100g::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Gxxxx100g::a::\"\"",
-      "action": "Gxxxx100g::Action::\"action\"",
-      "resource": "Gxxxx100g::a::\"\"",
+      "principal": {
+        "type": "Gxxxx100g::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxx100g::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxx100g::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Gxxxx100g::a::\"\"",
-      "action": "Gxxxx100g::Action::\"action\"",
-      "resource": "Gxxxx100g::a::\"\"",
+      "principal": {
+        "type": "Gxxxx100g::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxxxx100g::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxxxx100g::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b537e1d0a5408c81734469f4629f830e78ddef79.json b/cedar-integration-tests/corpus_tests/b537e1d0a5408c81734469f4629f830e78ddef79.json
index e771555e9..fcccd7622 100644
--- a/cedar-integration-tests/corpus_tests/b537e1d0a5408c81734469f4629f830e78ddef79.json
+++ b/cedar-integration-tests/corpus_tests/b537e1d0a5408c81734469f4629f830e78ddef79.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"6\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "6\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"6\\u{3}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"6\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "6\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "6\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"6\\u{3}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"6\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "6\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "6\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"6\\u{3}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"6\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "6\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "6\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"6\\u{3}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"6\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "6\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "6\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"6\\u{3}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"6\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "6\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "6\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"6\\u{3}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"6\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "6\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "6\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"6\\u{3}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"6\\u{3}\"",
+      "principal": {
+        "type": "a",
+        "id": "6\u0003"
+      },
+      "resource": {
+        "type": "a",
+        "id": "6\u0003"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/b561573781ed4992f1172af07a4084a2458fd243.json b/cedar-integration-tests/corpus_tests/b561573781ed4992f1172af07a4084a2458fd243.json
index 7a3f6f1f8..7a8ec97fa 100644
--- a/cedar-integration-tests/corpus_tests/b561573781ed4992f1172af07a4084a2458fd243.json
+++ b/cedar-integration-tests/corpus_tests/b561573781ed4992f1172af07a4084a2458fd243.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "VBhhhghhkkkkkk30k::a::\".\"",
-      "action": "VBhhhghhkkkkkk30k::Action::\"action\"",
-      "resource": "VBhhhghhkkkkkk30k::a::\".\"",
+      "principal": {
+        "type": "VBhhhghhkkkkkk30k::a",
+        "id": "."
+      },
+      "resource": {
+        "type": "VBhhhghhkkkkkk30k::a",
+        "id": "."
+      },
+      "action": {
+        "type": "VBhhhghhkkkkkk30k::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "VBhhhghhkkkkkk30k::a::\".\"",
-      "action": "VBhhhghhkkkkkk30k::Action::\"action\"",
-      "resource": "VBhhhghhkkkkkk30k::a::\".\"",
+      "principal": {
+        "type": "VBhhhghhkkkkkk30k::a",
+        "id": "."
+      },
+      "resource": {
+        "type": "VBhhhghhkkkkkk30k::a",
+        "id": "."
+      },
+      "action": {
+        "type": "VBhhhghhkkkkkk30k::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "VBhhhghhkkkkkk30k::a::\".\"",
-      "action": "VBhhhghhkkkkkk30k::Action::\"action\"",
-      "resource": "VBhhhghhkkkkkk30k::a::\".\"",
+      "principal": {
+        "type": "VBhhhghhkkkkkk30k::a",
+        "id": "."
+      },
+      "resource": {
+        "type": "VBhhhghhkkkkkk30k::a",
+        "id": "."
+      },
+      "action": {
+        "type": "VBhhhghhkkkkkk30k::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "VBhhhghhkkkkkk30k::a::\".\"",
-      "action": "VBhhhghhkkkkkk30k::Action::\"action\"",
-      "resource": "VBhhhghhkkkkkk30k::a::\".\"",
+      "principal": {
+        "type": "VBhhhghhkkkkkk30k::a",
+        "id": "."
+      },
+      "resource": {
+        "type": "VBhhhghhkkkkkk30k::a",
+        "id": "."
+      },
+      "action": {
+        "type": "VBhhhghhkkkkkk30k::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "VBhhhghhkkkkkk30k::a::\".\"",
-      "action": "VBhhhghhkkkkkk30k::Action::\"action\"",
-      "resource": "VBhhhghhkkkkkk30k::a::\".\"",
+      "principal": {
+        "type": "VBhhhghhkkkkkk30k::a",
+        "id": "."
+      },
+      "resource": {
+        "type": "VBhhhghhkkkkkk30k::a",
+        "id": "."
+      },
+      "action": {
+        "type": "VBhhhghhkkkkkk30k::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "VBhhhghhkkkkkk30k::a::\".\"",
-      "action": "VBhhhghhkkkkkk30k::Action::\"action\"",
-      "resource": "VBhhhghhkkkkkk30k::a::\".\"",
+      "principal": {
+        "type": "VBhhhghhkkkkkk30k::a",
+        "id": "."
+      },
+      "resource": {
+        "type": "VBhhhghhkkkkkk30k::a",
+        "id": "."
+      },
+      "action": {
+        "type": "VBhhhghhkkkkkk30k::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "VBhhhghhkkkkkk30k::a::\".\"",
-      "action": "VBhhhghhkkkkkk30k::Action::\"action\"",
-      "resource": "VBhhhghhkkkkkk30k::a::\".\"",
+      "principal": {
+        "type": "VBhhhghhkkkkkk30k::a",
+        "id": "."
+      },
+      "resource": {
+        "type": "VBhhhghhkkkkkk30k::a",
+        "id": "."
+      },
+      "action": {
+        "type": "VBhhhghhkkkkkk30k::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "VBhhhghhkkkkkk30k::a::\".\"",
-      "action": "VBhhhghhkkkkkk30k::Action::\"action\"",
-      "resource": "VBhhhghhkkkkkk30k::a::\".\"",
+      "principal": {
+        "type": "VBhhhghhkkkkkk30k::a",
+        "id": "."
+      },
+      "resource": {
+        "type": "VBhhhghhkkkkkk30k::a",
+        "id": "."
+      },
+      "action": {
+        "type": "VBhhhghhkkkkkk30k::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b5675f1d0fce1b205972bc991638b47f459c86e8.json b/cedar-integration-tests/corpus_tests/b5675f1d0fce1b205972bc991638b47f459c86e8.json
index d69c93839..893188658 100644
--- a/cedar-integration-tests/corpus_tests/b5675f1d0fce1b205972bc991638b47f459c86e8.json
+++ b/cedar-integration-tests/corpus_tests/b5675f1d0fce1b205972bc991638b47f459c86e8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/b56a215cc72585d6691218771c28bbfd40bad2bd.json b/cedar-integration-tests/corpus_tests/b56a215cc72585d6691218771c28bbfd40bad2bd.json
index 1779291f7..0232fe751 100644
--- a/cedar-integration-tests/corpus_tests/b56a215cc72585d6691218771c28bbfd40bad2bd.json
+++ b/cedar-integration-tests/corpus_tests/b56a215cc72585d6691218771c28bbfd40bad2bd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\":::&::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::&::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::&::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::&::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":::&::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::&::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::&::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::&::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\":::&::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::&::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::&::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::&::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\":::&::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::&::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::&::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::&::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\":::&::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::&::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::&::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::&::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\":::&::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::&::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::&::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::&::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\":::&::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::&::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::&::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::&::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\":::&::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::&::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::&::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::&::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/b5923f387efebcb2fb744d589da5eb60ac8b5a2f.json b/cedar-integration-tests/corpus_tests/b5923f387efebcb2fb744d589da5eb60ac8b5a2f.json
index 59304cf4b..f8eedd5fb 100644
--- a/cedar-integration-tests/corpus_tests/b5923f387efebcb2fb744d589da5eb60ac8b5a2f.json
+++ b/cedar-integration-tests/corpus_tests/b5923f387efebcb2fb744d589da5eb60ac8b5a2f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b5b8ae9492a59923e7dee4d59d378648b4b8c272.json b/cedar-integration-tests/corpus_tests/b5b8ae9492a59923e7dee4d59d378648b4b8c272.json
index fe3b25e8a..117205e7f 100644
--- a/cedar-integration-tests/corpus_tests/b5b8ae9492a59923e7dee4d59d378648b4b8c272.json
+++ b/cedar-integration-tests/corpus_tests/b5b8ae9492a59923e7dee4d59d378648b4b8c272.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\\u{1}\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::a::\"\\u{1}\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b5cd7ecd8056ac97a3c1081cdbe2bcbc48832bce.json b/cedar-integration-tests/corpus_tests/b5cd7ecd8056ac97a3c1081cdbe2bcbc48832bce.json
index 2170bd0b3..35fbe7154 100644
--- a/cedar-integration-tests/corpus_tests/b5cd7ecd8056ac97a3c1081cdbe2bcbc48832bce.json
+++ b/cedar-integration-tests/corpus_tests/b5cd7ecd8056ac97a3c1081cdbe2bcbc48832bce.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\">0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\">0\"",
+      "principal": {
+        "type": "a",
+        "id": ">0"
+      },
+      "resource": {
+        "type": "a",
+        "id": ">0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\">0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\">0\"",
+      "principal": {
+        "type": "a",
+        "id": ">0"
+      },
+      "resource": {
+        "type": "a",
+        "id": ">0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\">0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\">0\"",
+      "principal": {
+        "type": "a",
+        "id": ">0"
+      },
+      "resource": {
+        "type": "a",
+        "id": ">0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\">0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ">0"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\">0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ">0"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\">0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\">0\"",
+      "principal": {
+        "type": "a",
+        "id": ">0"
+      },
+      "resource": {
+        "type": "a",
+        "id": ">0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\">0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\">0\"",
+      "principal": {
+        "type": "a",
+        "id": ">0"
+      },
+      "resource": {
+        "type": "a",
+        "id": ">0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\">0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\">0\"",
+      "principal": {
+        "type": "a",
+        "id": ">0"
+      },
+      "resource": {
+        "type": "a",
+        "id": ">0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/b5df629c792d661f4c4bddbd32df911464282586.json b/cedar-integration-tests/corpus_tests/b5df629c792d661f4c4bddbd32df911464282586.json
index 4c06c51d4..8462af5e1 100644
--- a/cedar-integration-tests/corpus_tests/b5df629c792d661f4c4bddbd32df911464282586.json
+++ b/cedar-integration-tests/corpus_tests/b5df629c792d661f4c4bddbd32df911464282586.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b5f7789e9c3cd200a626d2f5ad9b8cb496564749.json b/cedar-integration-tests/corpus_tests/b5f7789e9c3cd200a626d2f5ad9b8cb496564749.json
index f981128d8..d8856227b 100644
--- a/cedar-integration-tests/corpus_tests/b5f7789e9c3cd200a626d2f5ad9b8cb496564749.json
+++ b/cedar-integration-tests/corpus_tests/b5f7789e9c3cd200a626d2f5ad9b8cb496564749.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"7\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "7"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b6028c08fe3641d2fc2bb7a3d997cfe37559603a.json b/cedar-integration-tests/corpus_tests/b6028c08fe3641d2fc2bb7a3d997cfe37559603a.json
index eef2693d4..d6f7faa5a 100644
--- a/cedar-integration-tests/corpus_tests/b6028c08fe3641d2fc2bb7a3d997cfe37559603a.json
+++ b/cedar-integration-tests/corpus_tests/b6028c08fe3641d2fc2bb7a3d997cfe37559603a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "i::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "i::\"\"",
+      "principal": {
+        "type": "i",
+        "id": ""
+      },
+      "resource": {
+        "type": "i",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "i::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "i::\"\"",
+      "principal": {
+        "type": "i",
+        "id": ""
+      },
+      "resource": {
+        "type": "i",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "i::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "i::\"\"",
+      "principal": {
+        "type": "i",
+        "id": ""
+      },
+      "resource": {
+        "type": "i",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "i::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "i::\"\"",
+      "principal": {
+        "type": "i",
+        "id": ""
+      },
+      "resource": {
+        "type": "i",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "i::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "i::\"\"",
+      "principal": {
+        "type": "i",
+        "id": ""
+      },
+      "resource": {
+        "type": "i",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "i::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "i::\"\"",
+      "principal": {
+        "type": "i",
+        "id": ""
+      },
+      "resource": {
+        "type": "i",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "i::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "i::\"\"",
+      "principal": {
+        "type": "i",
+        "id": ""
+      },
+      "resource": {
+        "type": "i",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "i::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "i::\"\"",
+      "principal": {
+        "type": "i",
+        "id": ""
+      },
+      "resource": {
+        "type": "i",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b60520d68f13b97bb55aa1a50859609e785bbe94.json b/cedar-integration-tests/corpus_tests/b60520d68f13b97bb55aa1a50859609e785bbe94.json
index 04552f15e..99145349c 100644
--- a/cedar-integration-tests/corpus_tests/b60520d68f13b97bb55aa1a50859609e785bbe94.json
+++ b/cedar-integration-tests/corpus_tests/b60520d68f13b97bb55aa1a50859609e785bbe94.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b616f53e96b13c4e1daf4dbb82a0b65061c9ac99.json b/cedar-integration-tests/corpus_tests/b616f53e96b13c4e1daf4dbb82a0b65061c9ac99.json
index 72e6c5f1a..8684eb974 100644
--- a/cedar-integration-tests/corpus_tests/b616f53e96b13c4e1daf4dbb82a0b65061c9ac99.json
+++ b/cedar-integration-tests/corpus_tests/b616f53e96b13c4e1daf4dbb82a0b65061c9ac99.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/b685a4d25c15badc7ac66b97f7c279979bce2725.json b/cedar-integration-tests/corpus_tests/b685a4d25c15badc7ac66b97f7c279979bce2725.json
index 7e5e52115..169e7d61b 100644
--- a/cedar-integration-tests/corpus_tests/b685a4d25c15badc7ac66b97f7c279979bce2725.json
+++ b/cedar-integration-tests/corpus_tests/b685a4d25c15badc7ac66b97f7c279979bce2725.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r3::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r3::\"\"",
+      "principal": {
+        "type": "r3",
+        "id": ""
+      },
+      "resource": {
+        "type": "r3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r3::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r3::\"\"",
+      "principal": {
+        "type": "r3",
+        "id": ""
+      },
+      "resource": {
+        "type": "r3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r3::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r3::\"\"",
+      "principal": {
+        "type": "r3",
+        "id": ""
+      },
+      "resource": {
+        "type": "r3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r3::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r3::\"\"",
+      "principal": {
+        "type": "r3",
+        "id": ""
+      },
+      "resource": {
+        "type": "r3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r3::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r3::\"\"",
+      "principal": {
+        "type": "r3",
+        "id": ""
+      },
+      "resource": {
+        "type": "r3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r3::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r3::\"\"",
+      "principal": {
+        "type": "r3",
+        "id": ""
+      },
+      "resource": {
+        "type": "r3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r3::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r3::\"\"",
+      "principal": {
+        "type": "r3",
+        "id": ""
+      },
+      "resource": {
+        "type": "r3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r3::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r3::\"\"",
+      "principal": {
+        "type": "r3",
+        "id": ""
+      },
+      "resource": {
+        "type": "r3",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b69bf509a757aaf3abc19937f723c7914545bc61.json b/cedar-integration-tests/corpus_tests/b69bf509a757aaf3abc19937f723c7914545bc61.json
index 6129f5191..4ec64a299 100644
--- a/cedar-integration-tests/corpus_tests/b69bf509a757aaf3abc19937f723c7914545bc61.json
+++ b/cedar-integration-tests/corpus_tests/b69bf509a757aaf3abc19937f723c7914545bc61.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A000": "",
         "r": ""
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A000": "",
         "r": ""
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A000": "",
         "r": ""
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A000": "",
         "r": ""
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A000": "",
         "r": ""
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A000": "",
         "r": ""
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A000": "",
         "r": ""
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A000": "",
         "r": ""
diff --git a/cedar-integration-tests/corpus_tests/b69eb2d5856d53c84b344d82608ba83c0c06f013.json b/cedar-integration-tests/corpus_tests/b69eb2d5856d53c84b344d82608ba83c0c06f013.json
index 868f2c2b6..5b9378336 100644
--- a/cedar-integration-tests/corpus_tests/b69eb2d5856d53c84b344d82608ba83c0c06f013.json
+++ b/cedar-integration-tests/corpus_tests/b69eb2d5856d53c84b344d82608ba83c0c06f013.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"::::::::::::::::::::::2:\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "::::::::::::::::::::::2:"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"::::::::::::::::::::::2:\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "::::::::::::::::::::::2:"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"::::::::::::::::::::::2:\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "::::::::::::::::::::::2:"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"::::::::::::::::::::::2:\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "::::::::::::::::::::::2:"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"::::::::::::::::::::::2:\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "::::::::::::::::::::::2:"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"::::::::::::::::::::::2:\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "::::::::::::::::::::::2:"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"::::::::::::::::::::::2:\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "::::::::::::::::::::::2:"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"::::::::::::::::::::::2:\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "::::::::::::::::::::::2:"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b767b9745f8381d0b00264149e5683504bf463ce.json b/cedar-integration-tests/corpus_tests/b767b9745f8381d0b00264149e5683504bf463ce.json
index a3ae6d1bc..0e6163cc0 100644
--- a/cedar-integration-tests/corpus_tests/b767b9745f8381d0b00264149e5683504bf463ce.json
+++ b/cedar-integration-tests/corpus_tests/b767b9745f8381d0b00264149e5683504bf463ce.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"z\\nRzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\\nRzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "z\nRzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z\nRzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"z\\nRzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\\nRzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "z\nRzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z\nRzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"z\\nRzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\\nRzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "z\nRzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z\nRzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"z\\nRzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\\nRzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "z\nRzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z\nRzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"z\\nRzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\\nRzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "z\nRzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z\nRzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"z\\nRzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\\nRzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "z\nRzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z\nRzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"z\\nRzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\\nRzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "z\nRzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z\nRzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"z\\nRzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\\nRzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "z\nRzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z\nRzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b7c122bef1ed48427641aa2ba120554dedf15bba.json b/cedar-integration-tests/corpus_tests/b7c122bef1ed48427641aa2ba120554dedf15bba.json
index 47fdc4580..dd7f9de2d 100644
--- a/cedar-integration-tests/corpus_tests/b7c122bef1ed48427641aa2ba120554dedf15bba.json
+++ b/cedar-integration-tests/corpus_tests/b7c122bef1ed48427641aa2ba120554dedf15bba.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/b860fa2c05cf6d66862e0e63a375a12f6dca9d45.json b/cedar-integration-tests/corpus_tests/b860fa2c05cf6d66862e0e63a375a12f6dca9d45.json
index 7be25bde9..9ab8f9a10 100644
--- a/cedar-integration-tests/corpus_tests/b860fa2c05cf6d66862e0e63a375a12f6dca9d45.json
+++ b/cedar-integration-tests/corpus_tests/b860fa2c05cf6d66862e0e63a375a12f6dca9d45.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "wttt::Bmii5h::\"\\0\"",
-      "action": "wttt::Action::\"action\"",
-      "resource": "wttt::Bmii5h::\"\\0\"",
+      "principal": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "wttt::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "wttt::Bmii5h::\"\\0\"",
-      "action": "wttt::Action::\"action\"",
-      "resource": "wttt::Bmii5h::\"\\0\"",
+      "principal": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "wttt::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "wttt::Bmii5h::\"\\0\"",
-      "action": "wttt::Action::\"action\"",
-      "resource": "wttt::Bmii5h::\"\\0\"",
+      "principal": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "wttt::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "wttt::Bmii5h::\"\\0\"",
-      "action": "wttt::Action::\"action\"",
-      "resource": "wttt::Bmii5h::\"\\0\"",
+      "principal": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "wttt::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "wttt::Bmii5h::\"\\0\"",
-      "action": "wttt::Action::\"action\"",
-      "resource": "wttt::Bmii5h::\"\\0\"",
+      "principal": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "wttt::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "wttt::Bmii5h::\"\\0\"",
-      "action": "wttt::Action::\"action\"",
-      "resource": "wttt::Bmii5h::\"\\0\"",
+      "principal": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "wttt::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "wttt::Bmii5h::\"\\0\"",
-      "action": "wttt::Action::\"action\"",
-      "resource": "wttt::Bmii5h::\"\\0\"",
+      "principal": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "wttt::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "wttt::Bmii5h::\"\\0\"",
-      "action": "wttt::Action::\"action\"",
-      "resource": "wttt::Bmii5h::\"\\0\"",
+      "principal": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "wttt::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b88adf50c73122ba2eb6f1684bf6e249d16e9a08.json b/cedar-integration-tests/corpus_tests/b88adf50c73122ba2eb6f1684bf6e249d16e9a08.json
index f1ad62f48..646608347 100644
--- a/cedar-integration-tests/corpus_tests/b88adf50c73122ba2eb6f1684bf6e249d16e9a08.json
+++ b/cedar-integration-tests/corpus_tests/b88adf50c73122ba2eb6f1684bf6e249d16e9a08.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b8a54ca437e5986646f9bb67b54eca04a728c310.json b/cedar-integration-tests/corpus_tests/b8a54ca437e5986646f9bb67b54eca04a728c310.json
index cfce6a709..8db6053ed 100644
--- a/cedar-integration-tests/corpus_tests/b8a54ca437e5986646f9bb67b54eca04a728c310.json
+++ b/cedar-integration-tests/corpus_tests/b8a54ca437e5986646f9bb67b54eca04a728c310.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/b8fd93ae23da1e6bbaf51234f0e34b9603bd151e.json b/cedar-integration-tests/corpus_tests/b8fd93ae23da1e6bbaf51234f0e34b9603bd151e.json
index 376ea5b71..522552055 100644
--- a/cedar-integration-tests/corpus_tests/b8fd93ae23da1e6bbaf51234f0e34b9603bd151e.json
+++ b/cedar-integration-tests/corpus_tests/b8fd93ae23da1e6bbaf51234f0e34b9603bd151e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\0\\0\\u{6}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\0\\0\\u{6}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0000\u0000\u0006\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0000\u0000\u0006\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\0\\0\\u{6}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0000\u0000\u0006\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\0\\0\\u{6}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\0\\0\\u{6}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0000\u0000\u0006\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0000\u0000\u0006\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\0\\0\\u{6}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\0\\0\\u{6}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0000\u0000\u0006\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0000\u0000\u0006\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\0\\0\\u{6}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\0\\0\\u{6}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0000\u0000\u0006\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0000\u0000\u0006\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\0\\0\\u{6}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\0\\0\\u{6}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0000\u0000\u0006\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0000\u0000\u0006\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\0\\0\\u{6}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\0\\0\\u{6}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0000\u0000\u0006\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0000\u0000\u0006\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\0\\0\\u{6}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\u{6}\\0\\0\\u{6}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0000\u0000\u0006\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0006\u0000\u0000\u0006\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b948b6c95baeb0f32fff0171c4032ae9a99a585c.json b/cedar-integration-tests/corpus_tests/b948b6c95baeb0f32fff0171c4032ae9a99a585c.json
index c275dc44a..fc3856273 100644
--- a/cedar-integration-tests/corpus_tests/b948b6c95baeb0f32fff0171c4032ae9a99a585c.json
+++ b/cedar-integration-tests/corpus_tests/b948b6c95baeb0f32fff0171c4032ae9a99a585c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"F/\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "F/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/b96248c91d47d68ac560a81aebfd0ede344ad285.json b/cedar-integration-tests/corpus_tests/b96248c91d47d68ac560a81aebfd0ede344ad285.json
index c234b3259..7240c512a 100644
--- a/cedar-integration-tests/corpus_tests/b96248c91d47d68ac560a81aebfd0ede344ad285.json
+++ b/cedar-integration-tests/corpus_tests/b96248c91d47d68ac560a81aebfd0ede344ad285.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b9684eccf126c884dcfb17a3d773511d09ff8a7d.json b/cedar-integration-tests/corpus_tests/b9684eccf126c884dcfb17a3d773511d09ff8a7d.json
index d985aa6f3..e1db27f99 100644
--- a/cedar-integration-tests/corpus_tests/b9684eccf126c884dcfb17a3d773511d09ff8a7d.json
+++ b/cedar-integration-tests/corpus_tests/b9684eccf126c884dcfb17a3d773511d09ff8a7d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/b9ba0cd046f46175d9c494da778329fb92e1b1c8.json b/cedar-integration-tests/corpus_tests/b9ba0cd046f46175d9c494da778329fb92e1b1c8.json
index e083e7402..38a422ddc 100644
--- a/cedar-integration-tests/corpus_tests/b9ba0cd046f46175d9c494da778329fb92e1b1c8.json
+++ b/cedar-integration-tests/corpus_tests/b9ba0cd046f46175d9c494da778329fb92e1b1c8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/b9c02a049395e0a0f5861308d63cf968a6dfe177.json b/cedar-integration-tests/corpus_tests/b9c02a049395e0a0f5861308d63cf968a6dfe177.json
index f5012beb5..1a6c26d2b 100644
--- a/cedar-integration-tests/corpus_tests/b9c02a049395e0a0f5861308d63cf968a6dfe177.json
+++ b/cedar-integration-tests/corpus_tests/b9c02a049395e0a0f5861308d63cf968a6dfe177.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0@\\0\\0RRRRR\\u{c}R\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0@\\0\\0RRRRR\\u{c}R\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000@\u0000\u0000RRRRR\fR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000@\u0000\u0000RRRRR\fR"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0@\\0\\0RRRRR\\u{c}R\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0@\\0\\0RRRRR\\u{c}R\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000@\u0000\u0000RRRRR\fR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000@\u0000\u0000RRRRR\fR"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0@\\0\\0RRRRR\\u{c}R\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0@\\0\\0RRRRR\\u{c}R\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000@\u0000\u0000RRRRR\fR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000@\u0000\u0000RRRRR\fR"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0@\\0\\0RRRRR\\u{c}R\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0@\\0\\0RRRRR\\u{c}R\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000@\u0000\u0000RRRRR\fR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000@\u0000\u0000RRRRR\fR"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0@\\0\\0RRRRR\\u{c}R\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0@\\0\\0RRRRR\\u{c}R\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000@\u0000\u0000RRRRR\fR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000@\u0000\u0000RRRRR\fR"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0@\\0\\0RRRRR\\u{c}R\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0@\\0\\0RRRRR\\u{c}R\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000@\u0000\u0000RRRRR\fR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000@\u0000\u0000RRRRR\fR"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0@\\0\\0RRRRR\\u{c}R\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0@\\0\\0RRRRR\\u{c}R\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000@\u0000\u0000RRRRR\fR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000@\u0000\u0000RRRRR\fR"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0@\\0\\0RRRRR\\u{c}R\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0@\\0\\0RRRRR\\u{c}R\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000@\u0000\u0000RRRRR\fR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000@\u0000\u0000RRRRR\fR"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/b9c8d6feca161c723f28929d6cbb30479f6924ae.json b/cedar-integration-tests/corpus_tests/b9c8d6feca161c723f28929d6cbb30479f6924ae.json
index 6b1dddd33..b0c1ba7a0 100644
--- a/cedar-integration-tests/corpus_tests/b9c8d6feca161c723f28929d6cbb30479f6924ae.json
+++ b/cedar-integration-tests/corpus_tests/b9c8d6feca161c723f28929d6cbb30479f6924ae.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"78\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"78\"",
+      "principal": {
+        "type": "a",
+        "id": "78"
+      },
+      "resource": {
+        "type": "a",
+        "id": "78"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"78\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"78\"",
+      "principal": {
+        "type": "a",
+        "id": "78"
+      },
+      "resource": {
+        "type": "a",
+        "id": "78"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"78\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"78\"",
+      "principal": {
+        "type": "a",
+        "id": "78"
+      },
+      "resource": {
+        "type": "a",
+        "id": "78"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"78\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"78\"",
+      "principal": {
+        "type": "a",
+        "id": "78"
+      },
+      "resource": {
+        "type": "a",
+        "id": "78"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"78\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"78\"",
+      "principal": {
+        "type": "a",
+        "id": "78"
+      },
+      "resource": {
+        "type": "a",
+        "id": "78"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"78\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"78\"",
+      "principal": {
+        "type": "a",
+        "id": "78"
+      },
+      "resource": {
+        "type": "a",
+        "id": "78"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"78\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"78\"",
+      "principal": {
+        "type": "a",
+        "id": "78"
+      },
+      "resource": {
+        "type": "a",
+        "id": "78"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"78\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"78\"",
+      "principal": {
+        "type": "a",
+        "id": "78"
+      },
+      "resource": {
+        "type": "a",
+        "id": "78"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ba3e19b3c147885c792ad04d896258f6800adc01.json b/cedar-integration-tests/corpus_tests/ba3e19b3c147885c792ad04d896258f6800adc01.json
index bb2473a76..5c457301f 100644
--- a/cedar-integration-tests/corpus_tests/ba3e19b3c147885c792ad04d896258f6800adc01.json
+++ b/cedar-integration-tests/corpus_tests/ba3e19b3c147885c792ad04d896258f6800adc01.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "D655zz::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "D655zz::\"\"",
+      "principal": {
+        "type": "D655zz",
+        "id": ""
+      },
+      "resource": {
+        "type": "D655zz",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "D655zz::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "D655zz::\"\"",
+      "principal": {
+        "type": "D655zz",
+        "id": ""
+      },
+      "resource": {
+        "type": "D655zz",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "D655zz::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "D655zz::\"\"",
+      "principal": {
+        "type": "D655zz",
+        "id": ""
+      },
+      "resource": {
+        "type": "D655zz",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "D655zz::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "D655zz::\"\"",
+      "principal": {
+        "type": "D655zz",
+        "id": ""
+      },
+      "resource": {
+        "type": "D655zz",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "D655zz::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "D655zz::\"\"",
+      "principal": {
+        "type": "D655zz",
+        "id": ""
+      },
+      "resource": {
+        "type": "D655zz",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "D655zz::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "D655zz::\"\"",
+      "principal": {
+        "type": "D655zz",
+        "id": ""
+      },
+      "resource": {
+        "type": "D655zz",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "D655zz::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "D655zz::\"\"",
+      "principal": {
+        "type": "D655zz",
+        "id": ""
+      },
+      "resource": {
+        "type": "D655zz",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "D655zz::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "D655zz::\"\"",
+      "principal": {
+        "type": "D655zz",
+        "id": ""
+      },
+      "resource": {
+        "type": "D655zz",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ba4d87ce7c6c3bca381073a32ddf47de29f6c23a.json b/cedar-integration-tests/corpus_tests/ba4d87ce7c6c3bca381073a32ddf47de29f6c23a.json
index f3c12a438..e2bf43405 100644
--- a/cedar-integration-tests/corpus_tests/ba4d87ce7c6c3bca381073a32ddf47de29f6c23a.json
+++ b/cedar-integration-tests/corpus_tests/ba4d87ce7c6c3bca381073a32ddf47de29f6c23a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ba6b0c182011c2acd90ddd555ba2a818c3097c59.json b/cedar-integration-tests/corpus_tests/ba6b0c182011c2acd90ddd555ba2a818c3097c59.json
index 4dc9bd003..2c19f04f4 100644
--- a/cedar-integration-tests/corpus_tests/ba6b0c182011c2acd90ddd555ba2a818c3097c59.json
+++ b/cedar-integration-tests/corpus_tests/ba6b0c182011c2acd90ddd555ba2a818c3097c59.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ba6b355a1bf226a09064499762b03cea811236f5.json b/cedar-integration-tests/corpus_tests/ba6b355a1bf226a09064499762b03cea811236f5.json
index 0e9498bf2..92c24c75f 100644
--- a/cedar-integration-tests/corpus_tests/ba6b355a1bf226a09064499762b03cea811236f5.json
+++ b/cedar-integration-tests/corpus_tests/ba6b355a1bf226a09064499762b03cea811236f5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"z\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\"",
+      "principal": {
+        "type": "a",
+        "id": "z"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ba86328a2ae4547692bb6a08f5ee2dc2ce4b25e9.json b/cedar-integration-tests/corpus_tests/ba86328a2ae4547692bb6a08f5ee2dc2ce4b25e9.json
index ce504e62a..ce3f7c869 100644
--- a/cedar-integration-tests/corpus_tests/ba86328a2ae4547692bb6a08f5ee2dc2ce4b25e9.json
+++ b/cedar-integration-tests/corpus_tests/ba86328a2ae4547692bb6a08f5ee2dc2ce4b25e9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ba96234b4693881a5e4ef898cd5b11a123ab4d13.json b/cedar-integration-tests/corpus_tests/ba96234b4693881a5e4ef898cd5b11a123ab4d13.json
index 0f3fba24a..864fcf439 100644
--- a/cedar-integration-tests/corpus_tests/ba96234b4693881a5e4ef898cd5b11a123ab4d13.json
+++ b/cedar-integration-tests/corpus_tests/ba96234b4693881a5e4ef898cd5b11a123ab4d13.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/bab94d26d2fcf63c2c0bf4c0b1d783f53ea4e52f.json b/cedar-integration-tests/corpus_tests/bab94d26d2fcf63c2c0bf4c0b1d783f53ea4e52f.json
index 76f35bd0c..4b61fad30 100644
--- a/cedar-integration-tests/corpus_tests/bab94d26d2fcf63c2c0bf4c0b1d783f53ea4e52f.json
+++ b/cedar-integration-tests/corpus_tests/bab94d26d2fcf63c2c0bf4c0b1d783f53ea4e52f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0(\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000(\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0(\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000(\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/babfcc8b3847d347f710f4a46ae1ac192986c981.json b/cedar-integration-tests/corpus_tests/babfcc8b3847d347f710f4a46ae1ac192986c981.json
index 17fe645ac..299508b74 100644
--- a/cedar-integration-tests/corpus_tests/babfcc8b3847d347f710f4a46ae1ac192986c981.json
+++ b/cedar-integration-tests/corpus_tests/babfcc8b3847d347f710f4a46ae1ac192986c981.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/bac24b8211fc5e04a8a41541f7da05df048166e7.json b/cedar-integration-tests/corpus_tests/bac24b8211fc5e04a8a41541f7da05df048166e7.json
index 71ab4739d..7d3b82506 100644
--- a/cedar-integration-tests/corpus_tests/bac24b8211fc5e04a8a41541f7da05df048166e7.json
+++ b/cedar-integration-tests/corpus_tests/bac24b8211fc5e04a8a41541f7da05df048166e7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "R::AJHH::A::\"\"",
-      "action": "R::AJHH::Action::\"\"",
-      "resource": "R::AJHH::A::\"\"",
+      "principal": {
+        "type": "R::AJHH::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::AJHH::A",
+        "id": ""
+      },
+      "action": {
+        "type": "R::AJHH::Action",
+        "id": ""
+      },
       "context": {
         "xmljjj000": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "R::AJHH::A::\"\"",
-      "action": "R::AJHH::Action::\"\"",
-      "resource": "R::AJHH::A::\"\"",
+      "principal": {
+        "type": "R::AJHH::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::AJHH::A",
+        "id": ""
+      },
+      "action": {
+        "type": "R::AJHH::Action",
+        "id": ""
+      },
       "context": {
         "xmljjj000": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "R::AJHH::A::\"\"",
-      "action": "R::AJHH::Action::\"\"",
-      "resource": "R::AJHH::A::\"\"",
+      "principal": {
+        "type": "R::AJHH::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::AJHH::A",
+        "id": ""
+      },
+      "action": {
+        "type": "R::AJHH::Action",
+        "id": ""
+      },
       "context": {
         "xmljjj000": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "R::AJHH::A::\"\"",
-      "action": "R::AJHH::Action::\"\"",
-      "resource": "R::AJHH::A::\"\"",
+      "principal": {
+        "type": "R::AJHH::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::AJHH::A",
+        "id": ""
+      },
+      "action": {
+        "type": "R::AJHH::Action",
+        "id": ""
+      },
       "context": {
         "xmljjj000": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "R::AJHH::A::\"\"",
-      "action": "R::AJHH::Action::\"\"",
-      "resource": "R::AJHH::A::\"\"",
+      "principal": {
+        "type": "R::AJHH::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::AJHH::A",
+        "id": ""
+      },
+      "action": {
+        "type": "R::AJHH::Action",
+        "id": ""
+      },
       "context": {
         "xmljjj000": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "R::AJHH::A::\"\"",
-      "action": "R::AJHH::Action::\"\"",
-      "resource": "R::AJHH::A::\"\"",
+      "principal": {
+        "type": "R::AJHH::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::AJHH::A",
+        "id": ""
+      },
+      "action": {
+        "type": "R::AJHH::Action",
+        "id": ""
+      },
       "context": {
         "xmljjj000": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "R::AJHH::A::\"\"",
-      "action": "R::AJHH::Action::\"\"",
-      "resource": "R::AJHH::A::\"\"",
+      "principal": {
+        "type": "R::AJHH::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::AJHH::A",
+        "id": ""
+      },
+      "action": {
+        "type": "R::AJHH::Action",
+        "id": ""
+      },
       "context": {
         "xmljjj000": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "R::AJHH::A::\"\"",
-      "action": "R::AJHH::Action::\"\"",
-      "resource": "R::AJHH::A::\"\"",
+      "principal": {
+        "type": "R::AJHH::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::AJHH::A",
+        "id": ""
+      },
+      "action": {
+        "type": "R::AJHH::Action",
+        "id": ""
+      },
       "context": {
         "xmljjj000": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/bad207c3066f1ffbd151959fd7bdf29c07b02298.json b/cedar-integration-tests/corpus_tests/bad207c3066f1ffbd151959fd7bdf29c07b02298.json
index b5c69c6c4..cd1388889 100644
--- a/cedar-integration-tests/corpus_tests/bad207c3066f1ffbd151959fd7bdf29c07b02298.json
+++ b/cedar-integration-tests/corpus_tests/bad207c3066f1ffbd151959fd7bdf29c07b02298.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/baf85e0c1b79dbcd88df62d430e23b2ecbc41685.json b/cedar-integration-tests/corpus_tests/baf85e0c1b79dbcd88df62d430e23b2ecbc41685.json
index b1248765e..49ba5e040 100644
--- a/cedar-integration-tests/corpus_tests/baf85e0c1b79dbcd88df62d430e23b2ecbc41685.json
+++ b/cedar-integration-tests/corpus_tests/baf85e0c1b79dbcd88df62d430e23b2ecbc41685.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"-\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"-\"",
+      "principal": {
+        "type": "a",
+        "id": "-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"-\"",
+      "principal": {
+        "type": "a",
+        "id": "-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"-\"",
+      "principal": {
+        "type": "a",
+        "id": "-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"-\"",
+      "principal": {
+        "type": "a",
+        "id": "-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"-\"",
+      "principal": {
+        "type": "a",
+        "id": "-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"-\"",
+      "principal": {
+        "type": "a",
+        "id": "-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"-\"",
+      "principal": {
+        "type": "a",
+        "id": "-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/bafc7b19b6fb6e468a21d8fd17c07b3676f7e568.json b/cedar-integration-tests/corpus_tests/bafc7b19b6fb6e468a21d8fd17c07b3676f7e568.json
index 821fe4fe0..c40c25ef5 100644
--- a/cedar-integration-tests/corpus_tests/bafc7b19b6fb6e468a21d8fd17c07b3676f7e568.json
+++ b/cedar-integration-tests/corpus_tests/bafc7b19b6fb6e468a21d8fd17c07b3676f7e568.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/bb18e52bb813c138683e38f2e1ebc7dfd3131ad7.json b/cedar-integration-tests/corpus_tests/bb18e52bb813c138683e38f2e1ebc7dfd3131ad7.json
index 4687c68e0..ddff5ff02 100644
--- a/cedar-integration-tests/corpus_tests/bb18e52bb813c138683e38f2e1ebc7dfd3131ad7.json
+++ b/cedar-integration-tests/corpus_tests/bb18e52bb813c138683e38f2e1ebc7dfd3131ad7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/bb3ef5fe04a8594071227b50ba4e4f1c67070ca3.json b/cedar-integration-tests/corpus_tests/bb3ef5fe04a8594071227b50ba4e4f1c67070ca3.json
index 82f081983..bfea2358a 100644
--- a/cedar-integration-tests/corpus_tests/bb3ef5fe04a8594071227b50ba4e4f1c67070ca3.json
+++ b/cedar-integration-tests/corpus_tests/bb3ef5fe04a8594071227b50ba4e4f1c67070ca3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"11\\06609-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"11\\06609-\"",
+      "principal": {
+        "type": "a",
+        "id": "11\u00006609-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "11\u00006609-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"11\\06609-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"11\\06609-\"",
+      "principal": {
+        "type": "a",
+        "id": "11\u00006609-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "11\u00006609-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"11\\06609-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"11\\06609-\"",
+      "principal": {
+        "type": "a",
+        "id": "11\u00006609-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "11\u00006609-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"11\\06609-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"11\\06609-\"",
+      "principal": {
+        "type": "a",
+        "id": "11\u00006609-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "11\u00006609-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"11\\06609-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"11\\06609-\"",
+      "principal": {
+        "type": "a",
+        "id": "11\u00006609-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "11\u00006609-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"11\\06609-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"11\\06609-\"",
+      "principal": {
+        "type": "a",
+        "id": "11\u00006609-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "11\u00006609-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"11\\06609-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"11\\06609-\"",
+      "principal": {
+        "type": "a",
+        "id": "11\u00006609-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "11\u00006609-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"11\\06609-\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"11\\06609-\"",
+      "principal": {
+        "type": "a",
+        "id": "11\u00006609-"
+      },
+      "resource": {
+        "type": "a",
+        "id": "11\u00006609-"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/bb766ff1ac0c9b4d4cf4108a2172ab49254e9992.json b/cedar-integration-tests/corpus_tests/bb766ff1ac0c9b4d4cf4108a2172ab49254e9992.json
index dc66d323d..3b199cb1e 100644
--- a/cedar-integration-tests/corpus_tests/bb766ff1ac0c9b4d4cf4108a2172ab49254e9992.json
+++ b/cedar-integration-tests/corpus_tests/bb766ff1ac0c9b4d4cf4108a2172ab49254e9992.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"/n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"/n\"",
+      "principal": {
+        "type": "a",
+        "id": "/n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"/n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"/n\"",
+      "principal": {
+        "type": "a",
+        "id": "/n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"/n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"/n\"",
+      "principal": {
+        "type": "a",
+        "id": "/n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"/n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"/n\"",
+      "principal": {
+        "type": "a",
+        "id": "/n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"/n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"/n\"",
+      "principal": {
+        "type": "a",
+        "id": "/n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"/n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"/n\"",
+      "principal": {
+        "type": "a",
+        "id": "/n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"/n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"/n\"",
+      "principal": {
+        "type": "a",
+        "id": "/n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"/n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"/n\"",
+      "principal": {
+        "type": "a",
+        "id": "/n"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/n"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/bba8300156d7b101f3fabdb9a5b66650eef37d04.json b/cedar-integration-tests/corpus_tests/bba8300156d7b101f3fabdb9a5b66650eef37d04.json
index 72c5c4ffe..c251c8072 100644
--- a/cedar-integration-tests/corpus_tests/bba8300156d7b101f3fabdb9a5b66650eef37d04.json
+++ b/cedar-integration-tests/corpus_tests/bba8300156d7b101f3fabdb9a5b66650eef37d04.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/bbbba300ccd3f8a8ce43172dbb79394076c4ccde.json b/cedar-integration-tests/corpus_tests/bbbba300ccd3f8a8ce43172dbb79394076c4ccde.json
index 94ffb8204..e02528d8d 100644
--- a/cedar-integration-tests/corpus_tests/bbbba300ccd3f8a8ce43172dbb79394076c4ccde.json
+++ b/cedar-integration-tests/corpus_tests/bbbba300ccd3f8a8ce43172dbb79394076c4ccde.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/bbc1b27f8b8e179db4fc826a1ac81a70c7f0f014.json b/cedar-integration-tests/corpus_tests/bbc1b27f8b8e179db4fc826a1ac81a70c7f0f014.json
index cf0d0a908..4b97b6f1c 100644
--- a/cedar-integration-tests/corpus_tests/bbc1b27f8b8e179db4fc826a1ac81a70c7f0f014.json
+++ b/cedar-integration-tests/corpus_tests/bbc1b27f8b8e179db4fc826a1ac81a70c7f0f014.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/bbcefef754fb8ff1c9a48cb40254d24e4b021932.json b/cedar-integration-tests/corpus_tests/bbcefef754fb8ff1c9a48cb40254d24e4b021932.json
index 43252913f..5cd771ef8 100644
--- a/cedar-integration-tests/corpus_tests/bbcefef754fb8ff1c9a48cb40254d24e4b021932.json
+++ b/cedar-integration-tests/corpus_tests/bbcefef754fb8ff1c9a48cb40254d24e4b021932.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\":::\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\":::\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\":::\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\":::\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\":::\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\":::\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\":::\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/bc0fd67ace59edf84c2d95fce4f8836571d6ac18.json b/cedar-integration-tests/corpus_tests/bc0fd67ace59edf84c2d95fce4f8836571d6ac18.json
index 768d52b84..87075b0d5 100644
--- a/cedar-integration-tests/corpus_tests/bc0fd67ace59edf84c2d95fce4f8836571d6ac18.json
+++ b/cedar-integration-tests/corpus_tests/bc0fd67ace59edf84c2d95fce4f8836571d6ac18.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/bc106a3e13cd549e165c8bad694c59a6687e9424.json b/cedar-integration-tests/corpus_tests/bc106a3e13cd549e165c8bad694c59a6687e9424.json
index f570a14e5..3c2eb7423 100644
--- a/cedar-integration-tests/corpus_tests/bc106a3e13cd549e165c8bad694c59a6687e9424.json
+++ b/cedar-integration-tests/corpus_tests/bc106a3e13cd549e165c8bad694c59a6687e9424.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::\"",
+      "principal": {
+        "type": "a",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/bc1c8b6f90bf849e3adc20f2b2e24ccd1c128465.json b/cedar-integration-tests/corpus_tests/bc1c8b6f90bf849e3adc20f2b2e24ccd1c128465.json
index 25ff1fa92..bb2b075fb 100644
--- a/cedar-integration-tests/corpus_tests/bc1c8b6f90bf849e3adc20f2b2e24ccd1c128465.json
+++ b/cedar-integration-tests/corpus_tests/bc1c8b6f90bf849e3adc20f2b2e24ccd1c128465.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{2}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0002"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{2}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0002"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{2}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0002"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{2}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0002"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{2}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0002"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{2}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0002"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{2}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0002"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{2}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u0002"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/bc1eb67eb0bd87437d450690c1cb44032123b3dd.json b/cedar-integration-tests/corpus_tests/bc1eb67eb0bd87437d450690c1cb44032123b3dd.json
index 5b0daaf55..9b706ab4d 100644
--- a/cedar-integration-tests/corpus_tests/bc1eb67eb0bd87437d450690c1cb44032123b3dd.json
+++ b/cedar-integration-tests/corpus_tests/bc1eb67eb0bd87437d450690c1cb44032123b3dd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/bc2a101c4a38cafd034acbf494600294eec9b1e6.json b/cedar-integration-tests/corpus_tests/bc2a101c4a38cafd034acbf494600294eec9b1e6.json
index 139c4f996..0b217612c 100644
--- a/cedar-integration-tests/corpus_tests/bc2a101c4a38cafd034acbf494600294eec9b1e6.json
+++ b/cedar-integration-tests/corpus_tests/bc2a101c4a38cafd034acbf494600294eec9b1e6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "q::a::\"\"",
-      "action": "q::Action::\"f\\u{6}\"",
-      "resource": "q::a::\"\"",
+      "principal": {
+        "type": "q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "f\u0006"
+      },
       "context": {
         "G": {
           "ff\u0006": {
@@ -24,9 +33,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "q::a::\"\"",
-      "action": "q::Action::\"f\\u{6}\"",
-      "resource": "q::a::\"\"",
+      "principal": {
+        "type": "q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "f\u0006"
+      },
       "context": {
         "G": {
           "ff\u0006": {
@@ -42,9 +60,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "q::a::\"\"",
-      "action": "q::Action::\"f\\u{6}\"",
-      "resource": "q::a::\"\"",
+      "principal": {
+        "type": "q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "f\u0006"
+      },
       "context": {
         "G": {
           "ff\u0006": {
@@ -60,9 +87,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "q::a::\"\"",
-      "action": "q::Action::\"f\\u{6}\"",
-      "resource": "q::a::\"\"",
+      "principal": {
+        "type": "q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "f\u0006"
+      },
       "context": {
         "G": {
           "ff\u0006": {
@@ -78,9 +114,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "q::a::\"\"",
-      "action": "q::Action::\"f\\u{6}\"",
-      "resource": "q::a::\"\"",
+      "principal": {
+        "type": "q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "f\u0006"
+      },
       "context": {
         "G": {
           "ff\u0006": {
@@ -96,9 +141,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "q::a::\"\"",
-      "action": "q::Action::\"f\\u{6}\"",
-      "resource": "q::a::\"\"",
+      "principal": {
+        "type": "q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "f\u0006"
+      },
       "context": {
         "G": {
           "ff\u0006": {
@@ -114,9 +168,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "q::a::\"\"",
-      "action": "q::Action::\"f\\u{6}\"",
-      "resource": "q::a::\"\"",
+      "principal": {
+        "type": "q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "f\u0006"
+      },
       "context": {
         "G": {
           "ff\u0006": {
@@ -132,9 +195,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "q::a::\"\"",
-      "action": "q::Action::\"f\\u{6}\"",
-      "resource": "q::a::\"\"",
+      "principal": {
+        "type": "q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "f\u0006"
+      },
       "context": {
         "G": {
           "ff\u0006": {
diff --git a/cedar-integration-tests/corpus_tests/bc3a9bc9b547563249b2c43dffb33dc95829c5fa.json b/cedar-integration-tests/corpus_tests/bc3a9bc9b547563249b2c43dffb33dc95829c5fa.json
index c5f77d9c9..6662aca62 100644
--- a/cedar-integration-tests/corpus_tests/bc3a9bc9b547563249b2c43dffb33dc95829c5fa.json
+++ b/cedar-integration-tests/corpus_tests/bc3a9bc9b547563249b2c43dffb33dc95829c5fa.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/bc746deb49ee466bc4288792d0e4342dc80896f3.json b/cedar-integration-tests/corpus_tests/bc746deb49ee466bc4288792d0e4342dc80896f3.json
index 3e67ffac3..0ab832d63 100644
--- a/cedar-integration-tests/corpus_tests/bc746deb49ee466bc4288792d0e4342dc80896f3.json
+++ b/cedar-integration-tests/corpus_tests/bc746deb49ee466bc4288792d0e4342dc80896f3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "l6y2Uuwwwwww::a::\"\"",
-      "action": "l6y2Uuwwwwww::Action::\"action\"",
-      "resource": "l6y2Uuwwwwww::a::\"\"",
+      "principal": {
+        "type": "l6y2Uuwwwwww::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l6y2Uuwwwwww::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l6y2Uuwwwwww::Action",
+        "id": "action"
+      },
       "context": {
         "wwQ2wmmmmmm": false
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "l6y2Uuwwwwww::a::\"\"",
-      "action": "l6y2Uuwwwwww::Action::\"action\"",
-      "resource": "l6y2Uuwwwwww::a::\"\"",
+      "principal": {
+        "type": "l6y2Uuwwwwww::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l6y2Uuwwwwww::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l6y2Uuwwwwww::Action",
+        "id": "action"
+      },
       "context": {
         "wwQ2wmmmmmm": false
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "l6y2Uuwwwwww::a::\"\"",
-      "action": "l6y2Uuwwwwww::Action::\"action\"",
-      "resource": "l6y2Uuwwwwww::a::\"\"",
+      "principal": {
+        "type": "l6y2Uuwwwwww::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l6y2Uuwwwwww::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l6y2Uuwwwwww::Action",
+        "id": "action"
+      },
       "context": {
         "wwQ2wmmmmmm": false
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "l6y2Uuwwwwww::a::\"\"",
-      "action": "l6y2Uuwwwwww::Action::\"action\"",
-      "resource": "l6y2Uuwwwwww::a::\"\"",
+      "principal": {
+        "type": "l6y2Uuwwwwww::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l6y2Uuwwwwww::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l6y2Uuwwwwww::Action",
+        "id": "action"
+      },
       "context": {
         "wwQ2wmmmmmm": false
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "l6y2Uuwwwwww::a::\"\"",
-      "action": "l6y2Uuwwwwww::Action::\"action\"",
-      "resource": "l6y2Uuwwwwww::a::\"\"",
+      "principal": {
+        "type": "l6y2Uuwwwwww::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l6y2Uuwwwwww::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l6y2Uuwwwwww::Action",
+        "id": "action"
+      },
       "context": {
         "wwQ2wmmmmmm": false
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "l6y2Uuwwwwww::a::\"\"",
-      "action": "l6y2Uuwwwwww::Action::\"action\"",
-      "resource": "l6y2Uuwwwwww::a::\"\"",
+      "principal": {
+        "type": "l6y2Uuwwwwww::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l6y2Uuwwwwww::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l6y2Uuwwwwww::Action",
+        "id": "action"
+      },
       "context": {
         "wwQ2wmmmmmm": false
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "l6y2Uuwwwwww::a::\"\"",
-      "action": "l6y2Uuwwwwww::Action::\"action\"",
-      "resource": "l6y2Uuwwwwww::a::\"\"",
+      "principal": {
+        "type": "l6y2Uuwwwwww::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l6y2Uuwwwwww::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l6y2Uuwwwwww::Action",
+        "id": "action"
+      },
       "context": {
         "wwQ2wmmmmmm": false
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "l6y2Uuwwwwww::a::\"\"",
-      "action": "l6y2Uuwwwwww::Action::\"action\"",
-      "resource": "l6y2Uuwwwwww::a::\"\"",
+      "principal": {
+        "type": "l6y2Uuwwwwww::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l6y2Uuwwwwww::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l6y2Uuwwwwww::Action",
+        "id": "action"
+      },
       "context": {
         "wwQ2wmmmmmm": false
       },
diff --git a/cedar-integration-tests/corpus_tests/bc96415309c3b229c7d40bff8a3b9cf0cd58071a.json b/cedar-integration-tests/corpus_tests/bc96415309c3b229c7d40bff8a3b9cf0cd58071a.json
index 40785d5a2..06b6d5bb5 100644
--- a/cedar-integration-tests/corpus_tests/bc96415309c3b229c7d40bff8a3b9cf0cd58071a.json
+++ b/cedar-integration-tests/corpus_tests/bc96415309c3b229c7d40bff8a3b9cf0cd58071a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\t\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\t\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\t\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\t\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\t\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\t\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\t\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\t\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\t\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\t\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\t\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\t\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\t\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/bc9ab20725b791a5660f678694db33cb4a1ccefe.json b/cedar-integration-tests/corpus_tests/bc9ab20725b791a5660f678694db33cb4a1ccefe.json
index 4c8df71b7..ca8970aa0 100644
--- a/cedar-integration-tests/corpus_tests/bc9ab20725b791a5660f678694db33cb4a1ccefe.json
+++ b/cedar-integration-tests/corpus_tests/bc9ab20725b791a5660f678694db33cb4a1ccefe.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/bd1752d749a28ba01382db7bb02a0a972d2c401a.json b/cedar-integration-tests/corpus_tests/bd1752d749a28ba01382db7bb02a0a972d2c401a.json
index c7cd5cd24..eee60909a 100644
--- a/cedar-integration-tests/corpus_tests/bd1752d749a28ba01382db7bb02a0a972d2c401a.json
+++ b/cedar-integration-tests/corpus_tests/bd1752d749a28ba01382db7bb02a0a972d2c401a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"n0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "n0\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"n0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "n0\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"n0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"n0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "n0\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "n0\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"n0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"n0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "n0\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "n0\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"n0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"n0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "n0\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "n0\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"n0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"n0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "n0\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "n0\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"n0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"n0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "n0\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "n0\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"n0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"n0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "n0\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "n0\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/bd18bd41ab202db204cea1f32221d6eaf35d8cd9.json b/cedar-integration-tests/corpus_tests/bd18bd41ab202db204cea1f32221d6eaf35d8cd9.json
index 127870f58..3b20c5ea6 100644
--- a/cedar-integration-tests/corpus_tests/bd18bd41ab202db204cea1f32221d6eaf35d8cd9.json
+++ b/cedar-integration-tests/corpus_tests/bd18bd41ab202db204cea1f32221d6eaf35d8cd9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0FFFFF\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFFF\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFF\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFF\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0FFFFF\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFFF\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFF\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFF\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0FFFFF\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFFF\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFF\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFF\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0FFFFF\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFFF\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFF\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFF\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0FFFFF\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFFF\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFF\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFF\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0FFFFF\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFFF\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFF\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFF\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0FFFFF\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFFF\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFF\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFF\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0FFFFF\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0FFFFF\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFF\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000FFFFF\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/bd4aea79dc2fd325bef3fa0df4b811a6f746ef34.json b/cedar-integration-tests/corpus_tests/bd4aea79dc2fd325bef3fa0df4b811a6f746ef34.json
index ae9a6edc2..ba14ef70a 100644
--- a/cedar-integration-tests/corpus_tests/bd4aea79dc2fd325bef3fa0df4b811a6f746ef34.json
+++ b/cedar-integration-tests/corpus_tests/bd4aea79dc2fd325bef3fa0df4b811a6f746ef34.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"r0П)0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r0П)0\"",
+      "principal": {
+        "type": "a",
+        "id": "r0П)0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r0П)0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"r0П)0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r0П)0\"",
+      "principal": {
+        "type": "a",
+        "id": "r0П)0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r0П)0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"r0П)0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r0П)0\"",
+      "principal": {
+        "type": "a",
+        "id": "r0П)0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r0П)0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"r0П)0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r0П)0\"",
+      "principal": {
+        "type": "a",
+        "id": "r0П)0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r0П)0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"r0П)0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r0П)0\"",
+      "principal": {
+        "type": "a",
+        "id": "r0П)0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r0П)0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"r0П)0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r0П)0\"",
+      "principal": {
+        "type": "a",
+        "id": "r0П)0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r0П)0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"r0П)0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r0П)0\"",
+      "principal": {
+        "type": "a",
+        "id": "r0П)0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r0П)0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"r0П)0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r0П)0\"",
+      "principal": {
+        "type": "a",
+        "id": "r0П)0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "r0П)0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/bd4d0d3bd104ad2aa88641b7b6704cc14de00fa2.json b/cedar-integration-tests/corpus_tests/bd4d0d3bd104ad2aa88641b7b6704cc14de00fa2.json
index 24fa2c043..60102e07d 100644
--- a/cedar-integration-tests/corpus_tests/bd4d0d3bd104ad2aa88641b7b6704cc14de00fa2.json
+++ b/cedar-integration-tests/corpus_tests/bd4d0d3bd104ad2aa88641b7b6704cc14de00fa2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/bd52aeabb79ad9249ef0960923b730c571327ffe.json b/cedar-integration-tests/corpus_tests/bd52aeabb79ad9249ef0960923b730c571327ffe.json
index 90dc75e63..cb20930a6 100644
--- a/cedar-integration-tests/corpus_tests/bd52aeabb79ad9249ef0960923b730c571327ffe.json
+++ b/cedar-integration-tests/corpus_tests/bd52aeabb79ad9249ef0960923b730c571327ffe.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b5\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "b5"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"b5\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b5\"",
+      "principal": {
+        "type": "a",
+        "id": "b5"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b5"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"b5\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b5\"",
+      "principal": {
+        "type": "a",
+        "id": "b5"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b5"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"b5\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b5\"",
+      "principal": {
+        "type": "a",
+        "id": "b5"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b5"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"b5\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b5\"",
+      "principal": {
+        "type": "a",
+        "id": "b5"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b5"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"b5\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b5\"",
+      "principal": {
+        "type": "a",
+        "id": "b5"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b5"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"b5\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b5\"",
+      "principal": {
+        "type": "a",
+        "id": "b5"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b5"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"b5\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"b5\"",
+      "principal": {
+        "type": "a",
+        "id": "b5"
+      },
+      "resource": {
+        "type": "a",
+        "id": "b5"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/bd6dde94fdc76cf2ba5c1ac07e02a291730daf56.json b/cedar-integration-tests/corpus_tests/bd6dde94fdc76cf2ba5c1ac07e02a291730daf56.json
index 1a26aaf27..168e57209 100644
--- a/cedar-integration-tests/corpus_tests/bd6dde94fdc76cf2ba5c1ac07e02a291730daf56.json
+++ b/cedar-integration-tests/corpus_tests/bd6dde94fdc76cf2ba5c1ac07e02a291730daf56.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/bd84e98a5b8a09ad280c6d382affcd06ec248aee.json b/cedar-integration-tests/corpus_tests/bd84e98a5b8a09ad280c6d382affcd06ec248aee.json
index d50356d8b..19ca4a393 100644
--- a/cedar-integration-tests/corpus_tests/bd84e98a5b8a09ad280c6d382affcd06ec248aee.json
+++ b/cedar-integration-tests/corpus_tests/bd84e98a5b8a09ad280c6d382affcd06ec248aee.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Fwwwywww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwywww::\"\"",
+      "principal": {
+        "type": "Fwwwywww",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwywww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Fwwwywww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwywww::\"\"",
+      "principal": {
+        "type": "Fwwwywww",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwywww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Fwwwywww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwywww::\"\"",
+      "principal": {
+        "type": "Fwwwywww",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwywww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Fwwwywww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwywww::\"\"",
+      "principal": {
+        "type": "Fwwwywww",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwywww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Fwwwywww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwywww::\"\"",
+      "principal": {
+        "type": "Fwwwywww",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwywww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Fwwwywww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwywww::\"\"",
+      "principal": {
+        "type": "Fwwwywww",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwywww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Fwwwywww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwywww::\"\"",
+      "principal": {
+        "type": "Fwwwywww",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwywww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Fwwwywww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Fwwwywww::\"\"",
+      "principal": {
+        "type": "Fwwwywww",
+        "id": ""
+      },
+      "resource": {
+        "type": "Fwwwywww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/bde9abe88143eac23364f5aa0e8bec52eb83b465.json b/cedar-integration-tests/corpus_tests/bde9abe88143eac23364f5aa0e8bec52eb83b465.json
index 151e93497..751d0a2f7 100644
--- a/cedar-integration-tests/corpus_tests/bde9abe88143eac23364f5aa0e8bec52eb83b465.json
+++ b/cedar-integration-tests/corpus_tests/bde9abe88143eac23364f5aa0e8bec52eb83b465.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"@\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"@\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "@"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"@\"",
+      "principal": {
+        "type": "a",
+        "id": "@"
+      },
+      "resource": {
+        "type": "a",
+        "id": "@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"@\"",
+      "principal": {
+        "type": "a",
+        "id": "@"
+      },
+      "resource": {
+        "type": "a",
+        "id": "@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"@\"",
+      "principal": {
+        "type": "a",
+        "id": "@"
+      },
+      "resource": {
+        "type": "a",
+        "id": "@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"@\"",
+      "principal": {
+        "type": "a",
+        "id": "@"
+      },
+      "resource": {
+        "type": "a",
+        "id": "@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"@\"",
+      "principal": {
+        "type": "a",
+        "id": "@"
+      },
+      "resource": {
+        "type": "a",
+        "id": "@"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/be1a3bb152ac556d10011963b2543c28bede4f4f.json b/cedar-integration-tests/corpus_tests/be1a3bb152ac556d10011963b2543c28bede4f4f.json
index 5f3342a6f..bf5293baa 100644
--- a/cedar-integration-tests/corpus_tests/be1a3bb152ac556d10011963b2543c28bede4f4f.json
+++ b/cedar-integration-tests/corpus_tests/be1a3bb152ac556d10011963b2543c28bede4f4f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"F\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "F"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "F"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "F"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/be3efdc8162eb23ea015be57b9d18094521b1551.json b/cedar-integration-tests/corpus_tests/be3efdc8162eb23ea015be57b9d18094521b1551.json
index 0bdbba64a..767732026 100644
--- a/cedar-integration-tests/corpus_tests/be3efdc8162eb23ea015be57b9d18094521b1551.json
+++ b/cedar-integration-tests/corpus_tests/be3efdc8162eb23ea015be57b9d18094521b1551.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/be49a30f3793be19e8fa9dfad276edc57705ac89.json b/cedar-integration-tests/corpus_tests/be49a30f3793be19e8fa9dfad276edc57705ac89.json
index 108e49f84..a724207a1 100644
--- a/cedar-integration-tests/corpus_tests/be49a30f3793be19e8fa9dfad276edc57705ac89.json
+++ b/cedar-integration-tests/corpus_tests/be49a30f3793be19e8fa9dfad276edc57705ac89.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/be4eb076d2594dfc30f6c2b6abba097fbc9ddbff.json b/cedar-integration-tests/corpus_tests/be4eb076d2594dfc30f6c2b6abba097fbc9ddbff.json
index bfd6cb82f..e4052912d 100644
--- a/cedar-integration-tests/corpus_tests/be4eb076d2594dfc30f6c2b6abba097fbc9ddbff.json
+++ b/cedar-integration-tests/corpus_tests/be4eb076d2594dfc30f6c2b6abba097fbc9ddbff.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"::\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"::\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"::\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"::\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"::\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"::\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"::\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"::\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/be57443a5a447a1dd4060b87a0b2a1e6ebb8720c.json b/cedar-integration-tests/corpus_tests/be57443a5a447a1dd4060b87a0b2a1e6ebb8720c.json
index 840c36cee..ef544b8f3 100644
--- a/cedar-integration-tests/corpus_tests/be57443a5a447a1dd4060b87a0b2a1e6ebb8720c.json
+++ b/cedar-integration-tests/corpus_tests/be57443a5a447a1dd4060b87a0b2a1e6ebb8720c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "C::a::\"c\"",
-      "action": "C::Action::\"action\"",
-      "resource": "C::a::\"c\"",
+      "principal": {
+        "type": "C::a",
+        "id": "c"
+      },
+      "resource": {
+        "type": "C::a",
+        "id": "c"
+      },
+      "action": {
+        "type": "C::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "C::a::\"c\"",
-      "action": "C::Action::\"action\"",
-      "resource": "C::a::\"c\"",
+      "principal": {
+        "type": "C::a",
+        "id": "c"
+      },
+      "resource": {
+        "type": "C::a",
+        "id": "c"
+      },
+      "action": {
+        "type": "C::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "C::a::\"c\"",
-      "action": "C::Action::\"action\"",
-      "resource": "C::a::\"c\"",
+      "principal": {
+        "type": "C::a",
+        "id": "c"
+      },
+      "resource": {
+        "type": "C::a",
+        "id": "c"
+      },
+      "action": {
+        "type": "C::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "C::a::\"c\"",
-      "action": "C::Action::\"action\"",
-      "resource": "C::a::\"c\"",
+      "principal": {
+        "type": "C::a",
+        "id": "c"
+      },
+      "resource": {
+        "type": "C::a",
+        "id": "c"
+      },
+      "action": {
+        "type": "C::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "C::a::\"c\"",
-      "action": "C::Action::\"action\"",
-      "resource": "C::a::\"c\"",
+      "principal": {
+        "type": "C::a",
+        "id": "c"
+      },
+      "resource": {
+        "type": "C::a",
+        "id": "c"
+      },
+      "action": {
+        "type": "C::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "C::a::\"c\"",
-      "action": "C::Action::\"action\"",
-      "resource": "C::a::\"c\"",
+      "principal": {
+        "type": "C::a",
+        "id": "c"
+      },
+      "resource": {
+        "type": "C::a",
+        "id": "c"
+      },
+      "action": {
+        "type": "C::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "C::a::\"c\"",
-      "action": "C::Action::\"action\"",
-      "resource": "C::a::\"c\"",
+      "principal": {
+        "type": "C::a",
+        "id": "c"
+      },
+      "resource": {
+        "type": "C::a",
+        "id": "c"
+      },
+      "action": {
+        "type": "C::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "C::a::\"c\"",
-      "action": "C::Action::\"action\"",
-      "resource": "C::a::\"c\"",
+      "principal": {
+        "type": "C::a",
+        "id": "c"
+      },
+      "resource": {
+        "type": "C::a",
+        "id": "c"
+      },
+      "action": {
+        "type": "C::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/be99802ae024b42034c30c09b782dd85b260450c.json b/cedar-integration-tests/corpus_tests/be99802ae024b42034c30c09b782dd85b260450c.json
index 8928ca1b0..d29fc2c29 100644
--- a/cedar-integration-tests/corpus_tests/be99802ae024b42034c30c09b782dd85b260450c.json
+++ b/cedar-integration-tests/corpus_tests/be99802ae024b42034c30c09b782dd85b260450c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{6}\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{6}\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/befa779a6eaa498e69b648767ef394de194387f5.json b/cedar-integration-tests/corpus_tests/befa779a6eaa498e69b648767ef394de194387f5.json
index a1cd1bff1..271d587a6 100644
--- a/cedar-integration-tests/corpus_tests/befa779a6eaa498e69b648767ef394de194387f5.json
+++ b/cedar-integration-tests/corpus_tests/befa779a6eaa498e69b648767ef394de194387f5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/bf2db13b966c9eb3b197e601f867b59aeb753000.json b/cedar-integration-tests/corpus_tests/bf2db13b966c9eb3b197e601f867b59aeb753000.json
index 0d76b38ec..2e6acf847 100644
--- a/cedar-integration-tests/corpus_tests/bf2db13b966c9eb3b197e601f867b59aeb753000.json
+++ b/cedar-integration-tests/corpus_tests/bf2db13b966c9eb3b197e601f867b59aeb753000.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": [
           "\u0000"
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": []
       },
@@ -32,9 +50,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": []
       },
@@ -44,9 +71,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": []
       },
@@ -56,9 +92,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": []
       },
@@ -68,9 +113,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": []
       },
@@ -80,9 +134,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": []
       },
@@ -92,9 +155,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": []
       },
diff --git a/cedar-integration-tests/corpus_tests/bf589bae634b3e3a7f603883c65d4b1f99f417f3.json b/cedar-integration-tests/corpus_tests/bf589bae634b3e3a7f603883c65d4b1f99f417f3.json
index 2390ae90e..c149703ff 100644
--- a/cedar-integration-tests/corpus_tests/bf589bae634b3e3a7f603883c65d4b1f99f417f3.json
+++ b/cedar-integration-tests/corpus_tests/bf589bae634b3e3a7f603883c65d4b1f99f417f3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u00020"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u00020"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u00020"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u00020"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u00020"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u00020"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u00020"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u00020"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u00020"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u00020"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u00020"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u00020"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u00020"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u00020"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u00020"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/bf5e387dee17b1c906a9b53c95f4752441d5f4e9.json b/cedar-integration-tests/corpus_tests/bf5e387dee17b1c906a9b53c95f4752441d5f4e9.json
index dfd5ab1d2..44f093a61 100644
--- a/cedar-integration-tests/corpus_tests/bf5e387dee17b1c906a9b53c95f4752441d5f4e9.json
+++ b/cedar-integration-tests/corpus_tests/bf5e387dee17b1c906a9b53c95f4752441d5f4e9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ffffffff*fffffffffffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffff*fffffffffffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffff*fffffffffffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffff*fffffffffffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ffffffff*fffffffffffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffff*fffffffffffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffff*fffffffffffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffff*fffffffffffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"ffffffff*fffffffffffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffff*fffffffffffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffff*fffffffffffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffff*fffffffffffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ffffffff*fffffffffffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffff*fffffffffffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffff*fffffffffffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffff*fffffffffffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ffffffff*fffffffffffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffff*fffffffffffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffff*fffffffffffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffff*fffffffffffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ffffffff*fffffffffffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffff*fffffffffffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffff*fffffffffffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffff*fffffffffffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ffffffff*fffffffffffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffff*fffffffffffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffff*fffffffffffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffff*fffffffffffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ffffffff*fffffffffffffff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffff*fffffffffffffff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffff*fffffffffffffff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffff*fffffffffffffff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/bf6829d08b3bf661e5f3c36155c1e46fb033075a.json b/cedar-integration-tests/corpus_tests/bf6829d08b3bf661e5f3c36155c1e46fb033075a.json
index 297e42488..95505ff9a 100644
--- a/cedar-integration-tests/corpus_tests/bf6829d08b3bf661e5f3c36155c1e46fb033075a.json
+++ b/cedar-integration-tests/corpus_tests/bf6829d08b3bf661e5f3c36155c1e46fb033075a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/bf84f17312ea3b15a9f38b1aad4ed37d1880ac09.json b/cedar-integration-tests/corpus_tests/bf84f17312ea3b15a9f38b1aad4ed37d1880ac09.json
index 5ff799561..7ab4a3b70 100644
--- a/cedar-integration-tests/corpus_tests/bf84f17312ea3b15a9f38b1aad4ed37d1880ac09.json
+++ b/cedar-integration-tests/corpus_tests/bf84f17312ea3b15a9f38b1aad4ed37d1880ac09.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::Gxxxx1033::a::\";\"",
-      "action": "A::Gxxxx1033::Action::\"\"",
-      "resource": "A::Gxxxx1033::a::\";\"",
+      "principal": {
+        "type": "A::Gxxxx1033::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "A::Gxxxx1033::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "A::Gxxxx1033::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::Gxxxx1033::a::\";\"",
-      "action": "A::Gxxxx1033::Action::\"\"",
-      "resource": "A::Gxxxx1033::a::\";\"",
+      "principal": {
+        "type": "A::Gxxxx1033::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "A::Gxxxx1033::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "A::Gxxxx1033::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::Gxxxx1033::a::\";\"",
-      "action": "A::Gxxxx1033::Action::\"\"",
-      "resource": "A::Gxxxx1033::a::\";\"",
+      "principal": {
+        "type": "A::Gxxxx1033::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "A::Gxxxx1033::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "A::Gxxxx1033::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::Gxxxx1033::a::\";\"",
-      "action": "A::Gxxxx1033::Action::\"\"",
-      "resource": "A::Gxxxx1033::a::\";\"",
+      "principal": {
+        "type": "A::Gxxxx1033::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "A::Gxxxx1033::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "A::Gxxxx1033::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::Gxxxx1033::a::\";\"",
-      "action": "A::Gxxxx1033::Action::\"\"",
-      "resource": "A::Gxxxx1033::a::\";\"",
+      "principal": {
+        "type": "A::Gxxxx1033::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "A::Gxxxx1033::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "A::Gxxxx1033::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::Gxxxx1033::a::\";\"",
-      "action": "A::Gxxxx1033::Action::\"\"",
-      "resource": "A::Gxxxx1033::a::\";\"",
+      "principal": {
+        "type": "A::Gxxxx1033::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "A::Gxxxx1033::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "A::Gxxxx1033::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::Gxxxx1033::a::\";\"",
-      "action": "A::Gxxxx1033::Action::\"\"",
-      "resource": "A::Gxxxx1033::a::\";\"",
+      "principal": {
+        "type": "A::Gxxxx1033::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "A::Gxxxx1033::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "A::Gxxxx1033::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::Gxxxx1033::a::\";\"",
-      "action": "A::Gxxxx1033::Action::\"\"",
-      "resource": "A::Gxxxx1033::a::\";\"",
+      "principal": {
+        "type": "A::Gxxxx1033::a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "A::Gxxxx1033::a",
+        "id": ";"
+      },
+      "action": {
+        "type": "A::Gxxxx1033::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/bfa8dfbfa938aa71e4877cf59d50a66fa4bade4d.json b/cedar-integration-tests/corpus_tests/bfa8dfbfa938aa71e4877cf59d50a66fa4bade4d.json
index b75678547..2fbd03284 100644
--- a/cedar-integration-tests/corpus_tests/bfa8dfbfa938aa71e4877cf59d50a66fa4bade4d.json
+++ b/cedar-integration-tests/corpus_tests/bfa8dfbfa938aa71e4877cf59d50a66fa4bade4d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{5}\\u{5}ت\\0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0005\u0005ت\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{5}\\u{5}ت\\0\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0005\u0005ت\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\n\\u{5}\\u{5}ت\\0\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0005\u0005ت\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/bfe1530e6c63665594f5a9552b1a49b8e6446e2f.json b/cedar-integration-tests/corpus_tests/bfe1530e6c63665594f5a9552b1a49b8e6446e2f.json
index 0e6888606..b8e7788a1 100644
--- a/cedar-integration-tests/corpus_tests/bfe1530e6c63665594f5a9552b1a49b8e6446e2f.json
+++ b/cedar-integration-tests/corpus_tests/bfe1530e6c63665594f5a9552b1a49b8e6446e2f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "imsm": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "imsm": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "imsm": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "imsm": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "imsm": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "imsm": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "imsm": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "imsm": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/bff74d1463f86358c828c6b42b08169133d7a9e8.json b/cedar-integration-tests/corpus_tests/bff74d1463f86358c828c6b42b08169133d7a9e8.json
index 04f09dec1..cf0ad1e4b 100644
--- a/cedar-integration-tests/corpus_tests/bff74d1463f86358c828c6b42b08169133d7a9e8.json
+++ b/cedar-integration-tests/corpus_tests/bff74d1463f86358c828c6b42b08169133d7a9e8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "Bhh00": ""
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "Bhh00": ""
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "Bhh00": ""
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "Bhh00": ""
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "Bhh00": ""
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "Bhh00": ""
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "Bhh00": ""
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": "",
         "Bhh00": ""
diff --git a/cedar-integration-tests/corpus_tests/c00aed5424af094435eca1de3f47ca9827d3c879.json b/cedar-integration-tests/corpus_tests/c00aed5424af094435eca1de3f47ca9827d3c879.json
index cee7d1829..e066eca4d 100644
--- a/cedar-integration-tests/corpus_tests/c00aed5424af094435eca1de3f47ca9827d3c879.json
+++ b/cedar-integration-tests/corpus_tests/c00aed5424af094435eca1de3f47ca9827d3c879.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{2}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0002\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{2}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0002\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\u{2}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{2}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0002\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0002\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\u{2}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{2}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0002\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0002\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\u{2}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{2}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0002\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0002\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\u{2}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{2}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0002\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0002\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\u{2}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{2}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0002\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0002\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\u{2}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{2}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0002\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0002\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c00d7ed64a2ac5a8331d45ee955ede225209d69d.json b/cedar-integration-tests/corpus_tests/c00d7ed64a2ac5a8331d45ee955ede225209d69d.json
index dccaf2c67..51220c56d 100644
--- a/cedar-integration-tests/corpus_tests/c00d7ed64a2ac5a8331d45ee955ede225209d69d.json
+++ b/cedar-integration-tests/corpus_tests/c00d7ed64a2ac5a8331d45ee955ede225209d69d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::Q::Qxxxxxxxx33::a::\"\"",
-      "action": "r::Q::Qxxxxxxxx33::Action::\"action\"",
-      "resource": "r::Q::Qxxxxxxxx33::a::\"\"",
+      "principal": {
+        "type": "r::Q::Qxxxxxxxx33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Q::Qxxxxxxxx33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Q::Qxxxxxxxx33::Action",
+        "id": "action"
+      },
       "context": {
         "lbbW": {
           "__entity": {
@@ -25,9 +34,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::Q::Qxxxxxxxx33::a::\"\"",
-      "action": "r::Q::Qxxxxxxxx33::Action::\"action\"",
-      "resource": "r::Q::Qxxxxxxxx33::a::\"\"",
+      "principal": {
+        "type": "r::Q::Qxxxxxxxx33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Q::Qxxxxxxxx33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Q::Qxxxxxxxx33::Action",
+        "id": "action"
+      },
       "context": {
         "lbbW": {
           "__entity": {
@@ -44,9 +62,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::Q::Qxxxxxxxx33::a::\"\"",
-      "action": "r::Q::Qxxxxxxxx33::Action::\"action\"",
-      "resource": "r::Q::Qxxxxxxxx33::a::\"\"",
+      "principal": {
+        "type": "r::Q::Qxxxxxxxx33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Q::Qxxxxxxxx33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Q::Qxxxxxxxx33::Action",
+        "id": "action"
+      },
       "context": {
         "lbbW": {
           "__entity": {
@@ -63,9 +90,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::Q::Qxxxxxxxx33::a::\"\"",
-      "action": "r::Q::Qxxxxxxxx33::Action::\"action\"",
-      "resource": "r::Q::Qxxxxxxxx33::a::\"\"",
+      "principal": {
+        "type": "r::Q::Qxxxxxxxx33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Q::Qxxxxxxxx33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Q::Qxxxxxxxx33::Action",
+        "id": "action"
+      },
       "context": {
         "lbbW": {
           "__entity": {
@@ -82,9 +118,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::Q::Qxxxxxxxx33::a::\"\"",
-      "action": "r::Q::Qxxxxxxxx33::Action::\"action\"",
-      "resource": "r::Q::Qxxxxxxxx33::a::\"\"",
+      "principal": {
+        "type": "r::Q::Qxxxxxxxx33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Q::Qxxxxxxxx33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Q::Qxxxxxxxx33::Action",
+        "id": "action"
+      },
       "context": {
         "lbbW": {
           "__entity": {
@@ -101,9 +146,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::Q::Qxxxxxxxx33::a::\"\"",
-      "action": "r::Q::Qxxxxxxxx33::Action::\"action\"",
-      "resource": "r::Q::Qxxxxxxxx33::a::\"\"",
+      "principal": {
+        "type": "r::Q::Qxxxxxxxx33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Q::Qxxxxxxxx33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Q::Qxxxxxxxx33::Action",
+        "id": "action"
+      },
       "context": {
         "lbbW": {
           "__entity": {
@@ -120,9 +174,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::Q::Qxxxxxxxx33::a::\"\"",
-      "action": "r::Q::Qxxxxxxxx33::Action::\"action\"",
-      "resource": "r::Q::Qxxxxxxxx33::a::\"\"",
+      "principal": {
+        "type": "r::Q::Qxxxxxxxx33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Q::Qxxxxxxxx33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Q::Qxxxxxxxx33::Action",
+        "id": "action"
+      },
       "context": {
         "lbbW": {
           "__entity": {
@@ -139,9 +202,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::Q::Qxxxxxxxx33::a::\"\"",
-      "action": "r::Q::Qxxxxxxxx33::Action::\"action\"",
-      "resource": "r::Q::Qxxxxxxxx33::a::\"\"",
+      "principal": {
+        "type": "r::Q::Qxxxxxxxx33::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::Q::Qxxxxxxxx33::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Q::Qxxxxxxxx33::Action",
+        "id": "action"
+      },
       "context": {
         "lbbW": {
           "__entity": {
diff --git a/cedar-integration-tests/corpus_tests/c085520d000d77c2667260fbacc08d70aac0dd96.json b/cedar-integration-tests/corpus_tests/c085520d000d77c2667260fbacc08d70aac0dd96.json
index 39ec6c472..e849366e4 100644
--- a/cedar-integration-tests/corpus_tests/c085520d000d77c2667260fbacc08d70aac0dd96.json
+++ b/cedar-integration-tests/corpus_tests/c085520d000d77c2667260fbacc08d70aac0dd96.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"j\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"j\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"j\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"j\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"j\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"j\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"j\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c0dcf2fe310fe43127a335434b687a3838a12e79.json b/cedar-integration-tests/corpus_tests/c0dcf2fe310fe43127a335434b687a3838a12e79.json
index 09bd7664f..fe1c5df85 100644
--- a/cedar-integration-tests/corpus_tests/c0dcf2fe310fe43127a335434b687a3838a12e79.json
+++ b/cedar-integration-tests/corpus_tests/c0dcf2fe310fe43127a335434b687a3838a12e79.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c10aa3b07f492919881b4b1c365353efff902a68.json b/cedar-integration-tests/corpus_tests/c10aa3b07f492919881b4b1c365353efff902a68.json
index e6e8e8a32..0a15d11a3 100644
--- a/cedar-integration-tests/corpus_tests/c10aa3b07f492919881b4b1c365353efff902a68.json
+++ b/cedar-integration-tests/corpus_tests/c10aa3b07f492919881b4b1c365353efff902a68.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c11155edcd9d349266c30abc408a7a69e36baa63.json b/cedar-integration-tests/corpus_tests/c11155edcd9d349266c30abc408a7a69e36baa63.json
index 437fd4fef..7da396dbb 100644
--- a/cedar-integration-tests/corpus_tests/c11155edcd9d349266c30abc408a7a69e36baa63.json
+++ b/cedar-integration-tests/corpus_tests/c11155edcd9d349266c30abc408a7a69e36baa63.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c16bf1576fc516da59b95787c4e86e22bceaa2f2.json b/cedar-integration-tests/corpus_tests/c16bf1576fc516da59b95787c4e86e22bceaa2f2.json
index af5dc7110..4d2d8751d 100644
--- a/cedar-integration-tests/corpus_tests/c16bf1576fc516da59b95787c4e86e22bceaa2f2.json
+++ b/cedar-integration-tests/corpus_tests/c16bf1576fc516da59b95787c4e86e22bceaa2f2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"+\\0\\0\\0\\0\\0\\0\\0\\0da\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"+\\0\\0\\0\\0\\0\\0\\0\\0da\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000da\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000da\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c17e0eacd91a90aef1f5a41cd0c44cb32814bd4c.json b/cedar-integration-tests/corpus_tests/c17e0eacd91a90aef1f5a41cd0c44cb32814bd4c.json
index 24f7b0975..fad67d257 100644
--- a/cedar-integration-tests/corpus_tests/c17e0eacd91a90aef1f5a41cd0c44cb32814bd4c.json
+++ b/cedar-integration-tests/corpus_tests/c17e0eacd91a90aef1f5a41cd0c44cb32814bd4c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/c1884023c6fee7b6a8d8b93dd10119065e46edfd.json b/cedar-integration-tests/corpus_tests/c1884023c6fee7b6a8d8b93dd10119065e46edfd.json
index 1dac98bd8..ca1ab71d2 100644
--- a/cedar-integration-tests/corpus_tests/c1884023c6fee7b6a8d8b93dd10119065e46edfd.json
+++ b/cedar-integration-tests/corpus_tests/c1884023c6fee7b6a8d8b93dd10119065e46edfd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{15}&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}&\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{15}&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}&\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{15}&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}&\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{15}&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}&\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{15}&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}&\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{15}&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}&\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{15}&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}&\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{15}&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{15}&\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0015&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0015&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/c1b7e2298e77b88e1c25cf5efb2f048a18475ba3.json b/cedar-integration-tests/corpus_tests/c1b7e2298e77b88e1c25cf5efb2f048a18475ba3.json
index 081bc9e6a..1f674a274 100644
--- a/cedar-integration-tests/corpus_tests/c1b7e2298e77b88e1c25cf5efb2f048a18475ba3.json
+++ b/cedar-integration-tests/corpus_tests/c1b7e2298e77b88e1c25cf5efb2f048a18475ba3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/c1c19d5d03c6d67f35702459eaf182a1b36471ad.json b/cedar-integration-tests/corpus_tests/c1c19d5d03c6d67f35702459eaf182a1b36471ad.json
index 9dfeb2790..366f4489d 100644
--- a/cedar-integration-tests/corpus_tests/c1c19d5d03c6d67f35702459eaf182a1b36471ad.json
+++ b/cedar-integration-tests/corpus_tests/c1c19d5d03c6d67f35702459eaf182a1b36471ad.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/c2348e68db99c71ec27a21d912a4b0233d9328d2.json b/cedar-integration-tests/corpus_tests/c2348e68db99c71ec27a21d912a4b0233d9328d2.json
index 227b987e7..b4404a368 100644
--- a/cedar-integration-tests/corpus_tests/c2348e68db99c71ec27a21d912a4b0233d9328d2.json
+++ b/cedar-integration-tests/corpus_tests/c2348e68db99c71ec27a21d912a4b0233d9328d2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c25e11d829036d6e027f4a4227fa9c8a9f0cff08.json b/cedar-integration-tests/corpus_tests/c25e11d829036d6e027f4a4227fa9c8a9f0cff08.json
index e782e7321..9042a593c 100644
--- a/cedar-integration-tests/corpus_tests/c25e11d829036d6e027f4a4227fa9c8a9f0cff08.json
+++ b/cedar-integration-tests/corpus_tests/c25e11d829036d6e027f4a4227fa9c8a9f0cff08.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c28c8db96265dbac4913b5b6292e3146c515e073.json b/cedar-integration-tests/corpus_tests/c28c8db96265dbac4913b5b6292e3146c515e073.json
index 8f4450182..f8f73a8f3 100644
--- a/cedar-integration-tests/corpus_tests/c28c8db96265dbac4913b5b6292e3146c515e073.json
+++ b/cedar-integration-tests/corpus_tests/c28c8db96265dbac4913b5b6292e3146c515e073.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "R77::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "R77::\"\\0\"",
+      "principal": {
+        "type": "R77",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "R77",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "R77::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "R77::\"\\0\"",
+      "principal": {
+        "type": "R77",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "R77",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "R77::\"\\0\\n\"",
-      "action": "Action::\"action\"",
-      "resource": "R77::\"\\0\"",
+      "principal": {
+        "type": "R77",
+        "id": "\u0000\n"
+      },
+      "resource": {
+        "type": "R77",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "R77::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "R77::\"\\0\"",
+      "principal": {
+        "type": "R77",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "R77",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "R77::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "R77::\"\\0\"",
+      "principal": {
+        "type": "R77",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "R77",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "R77::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "R77::\"\\0\"",
+      "principal": {
+        "type": "R77",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "R77",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "R77::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "R77::\"\\0\"",
+      "principal": {
+        "type": "R77",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "R77",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "R77::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "R77::\"\\0\"",
+      "principal": {
+        "type": "R77",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "R77",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c2a56cb9be56068dd0dafea4ea23cf7f44c7afc9.json b/cedar-integration-tests/corpus_tests/c2a56cb9be56068dd0dafea4ea23cf7f44c7afc9.json
index 098d49f16..9cf225dba 100644
--- a/cedar-integration-tests/corpus_tests/c2a56cb9be56068dd0dafea4ea23cf7f44c7afc9.json
+++ b/cedar-integration-tests/corpus_tests/c2a56cb9be56068dd0dafea4ea23cf7f44c7afc9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{3}\\0\\0\\0\\0\\0\\0\\u{3}\\0\\0\\0\\0\\0\\0\\0fnyFc\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{3}\\0\\0\\0\\0\\0\\0\\u{3}\\0\\0\\0\\0\\0\\0\\0fnyFc\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0000fnyFc"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0000fnyFc"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{3}\\0\\0\\0\\0\\0\\0\\u{3}\\0\\0\\0\\0\\0\\0\\0fnyFc\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{3}\\0\\0\\0\\0\\0\\0\\u{3}\\0\\0\\0\\0\\0\\0\\0fnyFc\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0000fnyFc"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0000fnyFc"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{3}\\0\\0\\0\\0\\0\\0\\u{3}\\0\\0\\0\\0\\0\\0\\0fnyFc\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{3}\\0\\0\\0\\0\\0\\0\\u{3}\\0\\0\\0\\0\\0\\0\\0fnyFc\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0000fnyFc"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0000fnyFc"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{3}\\0\\0\\0\\0\\0\\0\\u{3}\\0\\0\\0\\0\\0\\0\\0fnyFc\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{3}\\0\\0\\0\\0\\0\\0\\u{3}\\0\\0\\0\\0\\0\\0\\0fnyFc\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0000fnyFc"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0000fnyFc"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{3}\\0\\0\\0\\0\\0\\0\\u{3}\\0\\0\\0\\0\\0\\0\\0fnyFc\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{3}\\0\\0\\0\\0\\0\\0\\u{3}\\0\\0\\0\\0\\0\\0\\0fnyFc\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0000fnyFc"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0000fnyFc"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{3}\\0\\0\\0\\0\\0\\0\\u{3}\\0\\0\\0\\0\\0\\0\\0fnyFc\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{3}\\0\\0\\0\\0\\0\\0\\u{3}\\0\\0\\0\\0\\0\\0\\0fnyFc\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0000fnyFc"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0000fnyFc"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{3}\\0\\0\\0\\0\\0\\0\\u{3}\\0\\0\\0\\0\\0\\0\\0fnyFc\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{3}\\0\\0\\0\\0\\0\\0\\u{3}\\0\\0\\0\\0\\0\\0\\0fnyFc\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0000fnyFc"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0000fnyFc"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{3}\\0\\0\\0\\0\\0\\0\\u{3}\\0\\0\\0\\0\\0\\0\\0fnyFc\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{3}\\0\\0\\0\\0\\0\\0\\u{3}\\0\\0\\0\\0\\0\\0\\0fnyFc\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0000fnyFc"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0000fnyFc"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c355a2b4b6b737adf181d3ef1dadaa55a446dbd1.json b/cedar-integration-tests/corpus_tests/c355a2b4b6b737adf181d3ef1dadaa55a446dbd1.json
index f8cf2e59c..5f39afcce 100644
--- a/cedar-integration-tests/corpus_tests/c355a2b4b6b737adf181d3ef1dadaa55a446dbd1.json
+++ b/cedar-integration-tests/corpus_tests/c355a2b4b6b737adf181d3ef1dadaa55a446dbd1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "": "",
@@ -26,9 +35,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "": "",
@@ -46,9 +64,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "": "",
@@ -66,9 +93,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "": "",
@@ -86,9 +122,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "": "",
@@ -106,9 +151,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "": "",
@@ -126,9 +180,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "": "",
@@ -146,9 +209,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": {
           "": "",
diff --git a/cedar-integration-tests/corpus_tests/c3a88a8bb1f154853a4c0b04e2cd2443f650d71f.json b/cedar-integration-tests/corpus_tests/c3a88a8bb1f154853a4c0b04e2cd2443f650d71f.json
index 7b7652c4f..7578fac0d 100644
--- a/cedar-integration-tests/corpus_tests/c3a88a8bb1f154853a4c0b04e2cd2443f650d71f.json
+++ b/cedar-integration-tests/corpus_tests/c3a88a8bb1f154853a4c0b04e2cd2443f650d71f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "nO8888hI::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "nO8888hI::\"\"",
+      "principal": {
+        "type": "nO8888hI",
+        "id": ""
+      },
+      "resource": {
+        "type": "nO8888hI",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fwwwwwwq": "",
         "i": "",
@@ -23,9 +32,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "nO8888hI::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "nO8888hI::\"\"",
+      "principal": {
+        "type": "nO8888hI",
+        "id": ""
+      },
+      "resource": {
+        "type": "nO8888hI",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fwwwwwwq": "",
         "i": "",
@@ -40,9 +58,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "nO8888hI::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "nO8888hI::\"\"",
+      "principal": {
+        "type": "nO8888hI",
+        "id": ""
+      },
+      "resource": {
+        "type": "nO8888hI",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fwwwwwwq": "",
         "i": "",
@@ -57,9 +84,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "nO8888hI::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "nO8888hI::\"\"",
+      "principal": {
+        "type": "nO8888hI",
+        "id": ""
+      },
+      "resource": {
+        "type": "nO8888hI",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fwwwwwwq": "",
         "i": "",
@@ -74,9 +110,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "nO8888hI::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "nO8888hI::\"\"",
+      "principal": {
+        "type": "nO8888hI",
+        "id": ""
+      },
+      "resource": {
+        "type": "nO8888hI",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fwwwwwwq": "",
         "i": "",
@@ -91,9 +136,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "nO8888hI::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "nO8888hI::\"\"",
+      "principal": {
+        "type": "nO8888hI",
+        "id": ""
+      },
+      "resource": {
+        "type": "nO8888hI",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fwwwwwwq": "",
         "i": "",
@@ -108,9 +162,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "nO8888hI::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "nO8888hI::\"\"",
+      "principal": {
+        "type": "nO8888hI",
+        "id": ""
+      },
+      "resource": {
+        "type": "nO8888hI",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fwwwwwwq": "",
         "i": "",
@@ -125,9 +188,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "nO8888hI::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "nO8888hI::\"\"",
+      "principal": {
+        "type": "nO8888hI",
+        "id": ""
+      },
+      "resource": {
+        "type": "nO8888hI",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Fwwwwwwq": "",
         "i": "",
diff --git a/cedar-integration-tests/corpus_tests/c46bb5bece5ee9a65e9cf7f2095446fc2b37677e.json b/cedar-integration-tests/corpus_tests/c46bb5bece5ee9a65e9cf7f2095446fc2b37677e.json
index 3e417e21a..d40d482b8 100644
--- a/cedar-integration-tests/corpus_tests/c46bb5bece5ee9a65e9cf7f2095446fc2b37677e.json
+++ b/cedar-integration-tests/corpus_tests/c46bb5bece5ee9a65e9cf7f2095446fc2b37677e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"rzjjj\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "rzjjj"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/c48188b8ac4d4f2191db06c508ee38bd1eda54a3.json b/cedar-integration-tests/corpus_tests/c48188b8ac4d4f2191db06c508ee38bd1eda54a3.json
index b6444fd8e..b7d8bd5fb 100644
--- a/cedar-integration-tests/corpus_tests/c48188b8ac4d4f2191db06c508ee38bd1eda54a3.json
+++ b/cedar-integration-tests/corpus_tests/c48188b8ac4d4f2191db06c508ee38bd1eda54a3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/c4af8d81aaa78ecbd1a7548fb809518d851d4153.json b/cedar-integration-tests/corpus_tests/c4af8d81aaa78ecbd1a7548fb809518d851d4153.json
index 2cecf311f..1db60035f 100644
--- a/cedar-integration-tests/corpus_tests/c4af8d81aaa78ecbd1a7548fb809518d851d4153.json
+++ b/cedar-integration-tests/corpus_tests/c4af8d81aaa78ecbd1a7548fb809518d851d4153.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "FwFHLDww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "FwFHLDww::\"\"",
+      "principal": {
+        "type": "FwFHLDww",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwFHLDww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlodYqrcpw": {
           "j": ""
@@ -22,9 +31,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "FwFHLDww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "FwFHLDww::\"\"",
+      "principal": {
+        "type": "FwFHLDww",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwFHLDww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlodYqrcpw": {
           "j": ""
@@ -38,9 +56,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "FwFHLDww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "FwFHLDww::\"\"",
+      "principal": {
+        "type": "FwFHLDww",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwFHLDww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlodYqrcpw": {
           "j": ""
@@ -54,9 +81,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "FwFHLDww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "FwFHLDww::\"\"",
+      "principal": {
+        "type": "FwFHLDww",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwFHLDww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlodYqrcpw": {
           "j": ""
@@ -70,9 +106,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "FwFHLDww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "FwFHLDww::\"\"",
+      "principal": {
+        "type": "FwFHLDww",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwFHLDww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlodYqrcpw": {
           "j": ""
@@ -86,9 +131,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "FwFHLDww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "FwFHLDww::\"\"",
+      "principal": {
+        "type": "FwFHLDww",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwFHLDww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlodYqrcpw": {
           "j": ""
@@ -102,9 +156,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "FwFHLDww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "FwFHLDww::\"\"",
+      "principal": {
+        "type": "FwFHLDww",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwFHLDww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlodYqrcpw": {
           "j": ""
@@ -118,9 +181,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "FwFHLDww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "FwFHLDww::\"\"",
+      "principal": {
+        "type": "FwFHLDww",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwFHLDww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlodYqrcpw": {
           "j": ""
diff --git a/cedar-integration-tests/corpus_tests/c4b350c687fa4a5bace39a9e449eb98f3e5d829b.json b/cedar-integration-tests/corpus_tests/c4b350c687fa4a5bace39a9e449eb98f3e5d829b.json
index f4dde1dba..b680471eb 100644
--- a/cedar-integration-tests/corpus_tests/c4b350c687fa4a5bace39a9e449eb98f3e5d829b.json
+++ b/cedar-integration-tests/corpus_tests/c4b350c687fa4a5bace39a9e449eb98f3e5d829b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c4e59c0c01de0263f75cfe881d291c300e921716.json b/cedar-integration-tests/corpus_tests/c4e59c0c01de0263f75cfe881d291c300e921716.json
index 16d63d3bb..b5106f2e2 100644
--- a/cedar-integration-tests/corpus_tests/c4e59c0c01de0263f75cfe881d291c300e921716.json
+++ b/cedar-integration-tests/corpus_tests/c4e59c0c01de0263f75cfe881d291c300e921716.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/c50d23d149e88f8c1f22e7ff754ea830991fc3bc.json b/cedar-integration-tests/corpus_tests/c50d23d149e88f8c1f22e7ff754ea830991fc3bc.json
index 9dfddd76b..5b08a0c90 100644
--- a/cedar-integration-tests/corpus_tests/c50d23d149e88f8c1f22e7ff754ea830991fc3bc.json
+++ b/cedar-integration-tests/corpus_tests/c50d23d149e88f8c1f22e7ff754ea830991fc3bc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\":::\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\":::\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\":::\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\":::\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\":::\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\":::\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\":::\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\":::\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c5160087a8383d30a43c88bb5343997f73973e18.json b/cedar-integration-tests/corpus_tests/c5160087a8383d30a43c88bb5343997f73973e18.json
index 206790a33..ef7b6e04e 100644
--- a/cedar-integration-tests/corpus_tests/c5160087a8383d30a43c88bb5343997f73973e18.json
+++ b/cedar-integration-tests/corpus_tests/c5160087a8383d30a43c88bb5343997f73973e18.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qnnnnn": []
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qnnnnn": []
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qnnnnn": []
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qnnnnn": []
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qnnnnn": []
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qnnnnn": []
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qnnnnn": []
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Qnnnnn": []
       },
diff --git a/cedar-integration-tests/corpus_tests/c589f1386d9a37a56828e2f7adcde859ff2e7573.json b/cedar-integration-tests/corpus_tests/c589f1386d9a37a56828e2f7adcde859ff2e7573.json
index 8f03a1ac9..f74246414 100644
--- a/cedar-integration-tests/corpus_tests/c589f1386d9a37a56828e2f7adcde859ff2e7573.json
+++ b/cedar-integration-tests/corpus_tests/c589f1386d9a37a56828e2f7adcde859ff2e7573.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/c58bd14e00106a71304c6235f5086baf3967b3c0.json b/cedar-integration-tests/corpus_tests/c58bd14e00106a71304c6235f5086baf3967b3c0.json
index d02ecab76..1c9cb5071 100644
--- a/cedar-integration-tests/corpus_tests/c58bd14e00106a71304c6235f5086baf3967b3c0.json
+++ b/cedar-integration-tests/corpus_tests/c58bd14e00106a71304c6235f5086baf3967b3c0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{10}0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00100"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00100"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{10}0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00100"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00100"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{10}0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00100"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00100"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{10}0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00100"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00100"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{10}0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00100"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00100"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{10}0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00100"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00100"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{10}0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{10}0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00100"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00100"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/c58f2dcfcaf1078ac26d626b32fe4e55d108a62a.json b/cedar-integration-tests/corpus_tests/c58f2dcfcaf1078ac26d626b32fe4e55d108a62a.json
index 77775d1dd..737f1f5a6 100644
--- a/cedar-integration-tests/corpus_tests/c58f2dcfcaf1078ac26d626b32fe4e55d108a62a.json
+++ b/cedar-integration-tests/corpus_tests/c58f2dcfcaf1078ac26d626b32fe4e55d108a62a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"6000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "6000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"6000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"6000\"",
+      "principal": {
+        "type": "a",
+        "id": "6000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "6000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"6000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"6000\"",
+      "principal": {
+        "type": "a",
+        "id": "6000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "6000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"6000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"6000\"",
+      "principal": {
+        "type": "a",
+        "id": "6000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "6000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"6000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"6000\"",
+      "principal": {
+        "type": "a",
+        "id": "6000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "6000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"6000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"6000\"",
+      "principal": {
+        "type": "a",
+        "id": "6000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "6000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"6000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"6000\"",
+      "principal": {
+        "type": "a",
+        "id": "6000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "6000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"6000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"6000\"",
+      "principal": {
+        "type": "a",
+        "id": "6000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "6000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/c5aac7e6da4d23ff344137eebfa4ca251676b6cd.json b/cedar-integration-tests/corpus_tests/c5aac7e6da4d23ff344137eebfa4ca251676b6cd.json
index 0c9fc1f2f..040b9fba2 100644
--- a/cedar-integration-tests/corpus_tests/c5aac7e6da4d23ff344137eebfa4ca251676b6cd.json
+++ b/cedar-integration-tests/corpus_tests/c5aac7e6da4d23ff344137eebfa4ca251676b6cd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0b\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000b"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0b\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0b\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000b"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0b\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0b\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000b"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0b\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0b\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000b"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0b\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0b\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000b"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0b\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0b\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000b"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0b\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0b\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000b"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0b\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0b\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000b"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/c5dea430902a547482bc3ff849be108adf4ab799.json b/cedar-integration-tests/corpus_tests/c5dea430902a547482bc3ff849be108adf4ab799.json
index 44a959149..72ead4f69 100644
--- a/cedar-integration-tests/corpus_tests/c5dea430902a547482bc3ff849be108adf4ab799.json
+++ b/cedar-integration-tests/corpus_tests/c5dea430902a547482bc3ff849be108adf4ab799.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/c5ea476517cba574bfa6cec43675c0e83e2ff88e.json b/cedar-integration-tests/corpus_tests/c5ea476517cba574bfa6cec43675c0e83e2ff88e.json
index a82185a28..bd217ae6c 100644
--- a/cedar-integration-tests/corpus_tests/c5ea476517cba574bfa6cec43675c0e83e2ff88e.json
+++ b/cedar-integration-tests/corpus_tests/c5ea476517cba574bfa6cec43675c0e83e2ff88e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::\" \"",
-      "action": "Action::\"action\"",
-      "resource": "A::\" \"",
+      "principal": {
+        "type": "A",
+        "id": " "
+      },
+      "resource": {
+        "type": "A",
+        "id": " "
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::\" \"",
-      "action": "Action::\"action\"",
-      "resource": "A::\" \"",
+      "principal": {
+        "type": "A",
+        "id": " "
+      },
+      "resource": {
+        "type": "A",
+        "id": " "
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::\" \"",
-      "action": "Action::\"action\"",
-      "resource": "A::\" \"",
+      "principal": {
+        "type": "A",
+        "id": " "
+      },
+      "resource": {
+        "type": "A",
+        "id": " "
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::\" \"",
-      "action": "Action::\"action\"",
-      "resource": "A::\" \"",
+      "principal": {
+        "type": "A",
+        "id": " "
+      },
+      "resource": {
+        "type": "A",
+        "id": " "
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::\" \"",
-      "action": "Action::\"action\"",
-      "resource": "A::\" \"",
+      "principal": {
+        "type": "A",
+        "id": " "
+      },
+      "resource": {
+        "type": "A",
+        "id": " "
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::\" \"",
-      "action": "Action::\"action\"",
-      "resource": "A::\" \"",
+      "principal": {
+        "type": "A",
+        "id": " "
+      },
+      "resource": {
+        "type": "A",
+        "id": " "
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::\" \"",
-      "action": "Action::\"action\"",
-      "resource": "A::\" \"",
+      "principal": {
+        "type": "A",
+        "id": " "
+      },
+      "resource": {
+        "type": "A",
+        "id": " "
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::\" \"",
-      "action": "Action::\"action\"",
-      "resource": "A::\" \"",
+      "principal": {
+        "type": "A",
+        "id": " "
+      },
+      "resource": {
+        "type": "A",
+        "id": " "
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c61ef4bc690f842dab4e57f05e83ba0331adc190.json b/cedar-integration-tests/corpus_tests/c61ef4bc690f842dab4e57f05e83ba0331adc190.json
index a81f87492..a25776018 100644
--- a/cedar-integration-tests/corpus_tests/c61ef4bc690f842dab4e57f05e83ba0331adc190.json
+++ b/cedar-integration-tests/corpus_tests/c61ef4bc690f842dab4e57f05e83ba0331adc190.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/c62cb36b5454c8f63855d5c424ff8232c048da87.json b/cedar-integration-tests/corpus_tests/c62cb36b5454c8f63855d5c424ff8232c048da87.json
index 306d139a1..3b4656251 100644
--- a/cedar-integration-tests/corpus_tests/c62cb36b5454c8f63855d5c424ff8232c048da87.json
+++ b/cedar-integration-tests/corpus_tests/c62cb36b5454c8f63855d5c424ff8232c048da87.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"I\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"I\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "I\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "I\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"I\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "I\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/c6a7fb3b8b37d643ee901083e797a4b99fad0724.json b/cedar-integration-tests/corpus_tests/c6a7fb3b8b37d643ee901083e797a4b99fad0724.json
index fff05ba3e..8a429ba02 100644
--- a/cedar-integration-tests/corpus_tests/c6a7fb3b8b37d643ee901083e797a4b99fad0724.json
+++ b/cedar-integration-tests/corpus_tests/c6a7fb3b8b37d643ee901083e797a4b99fad0724.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\t\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\t\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\t\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\t\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\t\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\t\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\t\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\t\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\t\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\t\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\t\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\t\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\t\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\t\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\t\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\t\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\t\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\t\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\t\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\t\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\t\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\t\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\t\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\t\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\t\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\t\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\t\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\t\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\t\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\t\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\t\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\t\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c6bcd471cae5ad7ab536c06e6ddc78badb805266.json b/cedar-integration-tests/corpus_tests/c6bcd471cae5ad7ab536c06e6ddc78badb805266.json
index 1422e9a67..85e83e80d 100644
--- a/cedar-integration-tests/corpus_tests/c6bcd471cae5ad7ab536c06e6ddc78badb805266.json
+++ b/cedar-integration-tests/corpus_tests/c6bcd471cae5ad7ab536c06e6ddc78badb805266.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/c6e8fbb855e21cdb1c869dfe918d50f54c5a75b9.json b/cedar-integration-tests/corpus_tests/c6e8fbb855e21cdb1c869dfe918d50f54c5a75b9.json
index a9835b1a5..071a40370 100644
--- a/cedar-integration-tests/corpus_tests/c6e8fbb855e21cdb1c869dfe918d50f54c5a75b9.json
+++ b/cedar-integration-tests/corpus_tests/c6e8fbb855e21cdb1c869dfe918d50f54c5a75b9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/c6f43b856eef1bb3d96c6dc51e54d4c46672842b.json b/cedar-integration-tests/corpus_tests/c6f43b856eef1bb3d96c6dc51e54d4c46672842b.json
index 3b3e73d9a..0dd3a10a0 100644
--- a/cedar-integration-tests/corpus_tests/c6f43b856eef1bb3d96c6dc51e54d4c46672842b.json
+++ b/cedar-integration-tests/corpus_tests/c6f43b856eef1bb3d96c6dc51e54d4c46672842b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": false
       },
diff --git a/cedar-integration-tests/corpus_tests/c71ff5a505f8daaa53753fbc50a295f82ac9cc01.json b/cedar-integration-tests/corpus_tests/c71ff5a505f8daaa53753fbc50a295f82ac9cc01.json
index b5b0f3c85..a348dc8db 100644
--- a/cedar-integration-tests/corpus_tests/c71ff5a505f8daaa53753fbc50a295f82ac9cc01.json
+++ b/cedar-integration-tests/corpus_tests/c71ff5a505f8daaa53753fbc50a295f82ac9cc01.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c741999c22aeadc0ebf9ec3ba1f3fc2a8c0089ee.json b/cedar-integration-tests/corpus_tests/c741999c22aeadc0ebf9ec3ba1f3fc2a8c0089ee.json
index 600577e9f..c4ed58c96 100644
--- a/cedar-integration-tests/corpus_tests/c741999c22aeadc0ebf9ec3ba1f3fc2a8c0089ee.json
+++ b/cedar-integration-tests/corpus_tests/c741999c22aeadc0ebf9ec3ba1f3fc2a8c0089ee.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "vt::A::a::\"fF\"",
-      "action": "vt::A::Action::\"action\"",
-      "resource": "vt::A::a::\"fF\"",
+      "principal": {
+        "type": "vt::A::a",
+        "id": "fF"
+      },
+      "resource": {
+        "type": "vt::A::a",
+        "id": "fF"
+      },
+      "action": {
+        "type": "vt::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "vt::A::a::\"fF\"",
-      "action": "vt::A::Action::\"action\"",
-      "resource": "vt::A::a::\"fF\"",
+      "principal": {
+        "type": "vt::A::a",
+        "id": "fF"
+      },
+      "resource": {
+        "type": "vt::A::a",
+        "id": "fF"
+      },
+      "action": {
+        "type": "vt::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "vt::A::a::\"fF\"",
-      "action": "vt::A::Action::\"action\"",
-      "resource": "vt::A::a::\"fF\"",
+      "principal": {
+        "type": "vt::A::a",
+        "id": "fF"
+      },
+      "resource": {
+        "type": "vt::A::a",
+        "id": "fF"
+      },
+      "action": {
+        "type": "vt::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "vt::A::a::\"fF\"",
-      "action": "vt::A::Action::\"action\"",
-      "resource": "vt::A::a::\"fF\"",
+      "principal": {
+        "type": "vt::A::a",
+        "id": "fF"
+      },
+      "resource": {
+        "type": "vt::A::a",
+        "id": "fF"
+      },
+      "action": {
+        "type": "vt::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "vt::A::a::\"fF\"",
-      "action": "vt::A::Action::\"action\"",
-      "resource": "vt::A::a::\"fF\"",
+      "principal": {
+        "type": "vt::A::a",
+        "id": "fF"
+      },
+      "resource": {
+        "type": "vt::A::a",
+        "id": "fF"
+      },
+      "action": {
+        "type": "vt::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "vt::A::a::\"fF\"",
-      "action": "vt::A::Action::\"action\"",
-      "resource": "vt::A::a::\"fF\"",
+      "principal": {
+        "type": "vt::A::a",
+        "id": "fF"
+      },
+      "resource": {
+        "type": "vt::A::a",
+        "id": "fF"
+      },
+      "action": {
+        "type": "vt::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "vt::A::a::\"fF\"",
-      "action": "vt::A::Action::\"action\"",
-      "resource": "vt::A::a::\"fF\"",
+      "principal": {
+        "type": "vt::A::a",
+        "id": "fF"
+      },
+      "resource": {
+        "type": "vt::A::a",
+        "id": "fF"
+      },
+      "action": {
+        "type": "vt::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "vt::A::a::\"fF\"",
-      "action": "vt::A::Action::\"action\"",
-      "resource": "vt::A::a::\"fF\"",
+      "principal": {
+        "type": "vt::A::a",
+        "id": "fF"
+      },
+      "resource": {
+        "type": "vt::A::a",
+        "id": "fF"
+      },
+      "action": {
+        "type": "vt::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c741d4289e152b51cb11aa164cd6bf24920fe4b2.json b/cedar-integration-tests/corpus_tests/c741d4289e152b51cb11aa164cd6bf24920fe4b2.json
index aa95f26a3..eebf908ed 100644
--- a/cedar-integration-tests/corpus_tests/c741d4289e152b51cb11aa164cd6bf24920fe4b2.json
+++ b/cedar-integration-tests/corpus_tests/c741d4289e152b51cb11aa164cd6bf24920fe4b2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"d\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "d"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/c78adcfd6e77d66bef3e752d68b059d250b428ed.json b/cedar-integration-tests/corpus_tests/c78adcfd6e77d66bef3e752d68b059d250b428ed.json
index 6d76ffb61..1360e39ce 100644
--- a/cedar-integration-tests/corpus_tests/c78adcfd6e77d66bef3e752d68b059d250b428ed.json
+++ b/cedar-integration-tests/corpus_tests/c78adcfd6e77d66bef3e752d68b059d250b428ed.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::r::T::r::A::\"\"",
-      "action": "r::r::r::T::r::Action::\"action\"",
-      "resource": "r::r::r::T::r::A::\"\"",
+      "principal": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::T::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::r::T::r::A::\"\"",
-      "action": "r::r::r::T::r::Action::\"action\"",
-      "resource": "r::r::r::T::r::A::\"\"",
+      "principal": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::T::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::r::T::r::A::\"\"",
-      "action": "r::r::r::T::r::Action::\"action\"",
-      "resource": "r::r::r::T::r::A::\"\"",
+      "principal": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::T::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::r::T::r::A::\"\"",
-      "action": "r::r::r::T::r::Action::\"action\"",
-      "resource": "r::r::r::T::r::A::\"\"",
+      "principal": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::T::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::r::T::r::A::\"\"",
-      "action": "r::r::r::T::r::Action::\"action\"",
-      "resource": "r::r::r::T::r::A::\"\"",
+      "principal": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::T::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::r::T::r::A::\"\"",
-      "action": "r::r::r::T::r::Action::\"action\"",
-      "resource": "r::r::r::T::r::A::\"\"",
+      "principal": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::T::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::r::T::r::A::\"\"",
-      "action": "r::r::r::T::r::Action::\"action\"",
-      "resource": "r::r::r::T::r::A::\"\"",
+      "principal": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::T::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::r::T::r::A::\"\"",
-      "action": "r::r::r::T::r::Action::\"action\"",
-      "resource": "r::r::r::T::r::A::\"\"",
+      "principal": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::T::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::T::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c8038441b7a3773023463c49719d465909d868d6.json b/cedar-integration-tests/corpus_tests/c8038441b7a3773023463c49719d465909d868d6.json
index 0c4d4fe5f..afaeb4a31 100644
--- a/cedar-integration-tests/corpus_tests/c8038441b7a3773023463c49719d465909d868d6.json
+++ b/cedar-integration-tests/corpus_tests/c8038441b7a3773023463c49719d465909d868d6.json
@@ -6,9 +6,15 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{1f}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "\u001f"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +22,15 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{1f}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "\u001f"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +38,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -38,9 +59,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -50,9 +80,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -62,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -74,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -86,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c80a1d4b4df4746dc42a9f0cb848799bebbe9eea.json b/cedar-integration-tests/corpus_tests/c80a1d4b4df4746dc42a9f0cb848799bebbe9eea.json
index 660bf2f81..04f8dd105 100644
--- a/cedar-integration-tests/corpus_tests/c80a1d4b4df4746dc42a9f0cb848799bebbe9eea.json
+++ b/cedar-integration-tests/corpus_tests/c80a1d4b4df4746dc42a9f0cb848799bebbe9eea.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "CZjg": "",
         "Q120": false,
@@ -26,9 +35,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "CZjg": "",
         "Q120": false,
@@ -46,9 +64,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "CZjg": "",
         "Q120": false,
@@ -66,9 +93,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "CZjg": "",
         "Q120": false,
@@ -86,9 +122,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "CZjg": "",
         "Q120": false,
@@ -106,9 +151,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "CZjg": "",
         "Q120": false,
@@ -126,9 +180,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "CZjg": "",
         "Q120": false,
@@ -146,9 +209,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "CZjg": "",
         "Q120": false,
diff --git a/cedar-integration-tests/corpus_tests/c846886fb46344cb1ed2440eb7d9159e714fd488.json b/cedar-integration-tests/corpus_tests/c846886fb46344cb1ed2440eb7d9159e714fd488.json
index ebfb5edef..d4b06c9c1 100644
--- a/cedar-integration-tests/corpus_tests/c846886fb46344cb1ed2440eb7d9159e714fd488.json
+++ b/cedar-integration-tests/corpus_tests/c846886fb46344cb1ed2440eb7d9159e714fd488.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"f\\u{3}\\0\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"f\\u{3}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"f\\u{3}\\0\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"f\\u{3}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"f\\u{3}\\0\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"f\\u{3}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"f\\u{3}\\0\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"f\\u{3}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"f\\u{3}\\0\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"f\\u{3}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"f\\u{3}\\0\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"f\\u{3}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"f\\u{3}\\0\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"f\\u{3}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"f\\u{3}\\0\\0\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"f\\u{3}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c85960cb2c1b2196b11d513b4046b6fe3c8871fa.json b/cedar-integration-tests/corpus_tests/c85960cb2c1b2196b11d513b4046b6fe3c8871fa.json
index e0bc8f692..3aaeb7e70 100644
--- a/cedar-integration-tests/corpus_tests/c85960cb2c1b2196b11d513b4046b6fe3c8871fa.json
+++ b/cedar-integration-tests/corpus_tests/c85960cb2c1b2196b11d513b4046b6fe3c8871fa.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"kl\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "kl"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"kl\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "kl"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"kl\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "kl"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"kl\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "kl"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"kl\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "kl"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"kl\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "kl"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"kl\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "kl"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"kl\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "kl"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c87b23324533d74351af9d1d3287815fb80f4daa.json b/cedar-integration-tests/corpus_tests/c87b23324533d74351af9d1d3287815fb80f4daa.json
index e2b089aee..05cac593d 100644
--- a/cedar-integration-tests/corpus_tests/c87b23324533d74351af9d1d3287815fb80f4daa.json
+++ b/cedar-integration-tests/corpus_tests/c87b23324533d74351af9d1d3287815fb80f4daa.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "g::\"\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "Z4MM::\"\"",
+      "principal": {
+        "type": "g",
+        "id": "\u0000R"
+      },
+      "resource": {
+        "type": "Z4MM",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "g::\"\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "Z4MM::\"\"",
+      "principal": {
+        "type": "g",
+        "id": "\u0000R"
+      },
+      "resource": {
+        "type": "Z4MM",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "g::\"\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "Z4MM::\"\"",
+      "principal": {
+        "type": "g",
+        "id": "\u0000R"
+      },
+      "resource": {
+        "type": "Z4MM",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "g::\"\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "Z4MM::\"\"",
+      "principal": {
+        "type": "g",
+        "id": "\u0000R"
+      },
+      "resource": {
+        "type": "Z4MM",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "g::\"\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "Z4MM::\"\"",
+      "principal": {
+        "type": "g",
+        "id": "\u0000R"
+      },
+      "resource": {
+        "type": "Z4MM",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "g::\"\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "Z4MM::\"\"",
+      "principal": {
+        "type": "g",
+        "id": "\u0000R"
+      },
+      "resource": {
+        "type": "Z4MM",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "g::\"\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "Z4MM::\"\"",
+      "principal": {
+        "type": "g",
+        "id": "\u0000R"
+      },
+      "resource": {
+        "type": "Z4MM",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "g::\"\\0R\"",
-      "action": "Action::\"action\"",
-      "resource": "Z4MM::\"\"",
+      "principal": {
+        "type": "g",
+        "id": "\u0000R"
+      },
+      "resource": {
+        "type": "Z4MM",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c8aa8f4d875d4a3a34381e1c24c60db9dbcfd5e4.json b/cedar-integration-tests/corpus_tests/c8aa8f4d875d4a3a34381e1c24c60db9dbcfd5e4.json
index b06af3f82..408c9ebc4 100644
--- a/cedar-integration-tests/corpus_tests/c8aa8f4d875d4a3a34381e1c24c60db9dbcfd5e4.json
+++ b/cedar-integration-tests/corpus_tests/c8aa8f4d875d4a3a34381e1c24c60db9dbcfd5e4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Q::A::w::V::a::\"000000\"",
-      "action": "Q::A::w::V::Action::\"action\"",
-      "resource": "Q::A::w::V::a::\"000000\"",
+      "principal": {
+        "type": "Q::A::w::V::a",
+        "id": "000000"
+      },
+      "resource": {
+        "type": "Q::A::w::V::a",
+        "id": "000000"
+      },
+      "action": {
+        "type": "Q::A::w::V::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Q::A::w::V::a::\"000000\"",
-      "action": "Q::A::w::V::Action::\"action\"",
-      "resource": "Q::A::w::V::a::\"000000\"",
+      "principal": {
+        "type": "Q::A::w::V::a",
+        "id": "000000"
+      },
+      "resource": {
+        "type": "Q::A::w::V::a",
+        "id": "000000"
+      },
+      "action": {
+        "type": "Q::A::w::V::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Q::A::w::V::a::\"000000\"",
-      "action": "Q::A::w::V::Action::\"action\"",
-      "resource": "Q::A::w::V::a::\"000000\"",
+      "principal": {
+        "type": "Q::A::w::V::a",
+        "id": "000000"
+      },
+      "resource": {
+        "type": "Q::A::w::V::a",
+        "id": "000000"
+      },
+      "action": {
+        "type": "Q::A::w::V::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Q::A::w::V::a::\"000000\"",
-      "action": "Q::A::w::V::Action::\"action\"",
-      "resource": "Q::A::w::V::a::\"000000\"",
+      "principal": {
+        "type": "Q::A::w::V::a",
+        "id": "000000"
+      },
+      "resource": {
+        "type": "Q::A::w::V::a",
+        "id": "000000"
+      },
+      "action": {
+        "type": "Q::A::w::V::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Q::A::w::V::a::\"000000\"",
-      "action": "Q::A::w::V::Action::\"action\"",
-      "resource": "Q::A::w::V::a::\"000000\"",
+      "principal": {
+        "type": "Q::A::w::V::a",
+        "id": "000000"
+      },
+      "resource": {
+        "type": "Q::A::w::V::a",
+        "id": "000000"
+      },
+      "action": {
+        "type": "Q::A::w::V::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Q::A::w::V::a::\"000000\"",
-      "action": "Q::A::w::V::Action::\"action\"",
-      "resource": "Q::A::w::V::a::\"000000\"",
+      "principal": {
+        "type": "Q::A::w::V::a",
+        "id": "000000"
+      },
+      "resource": {
+        "type": "Q::A::w::V::a",
+        "id": "000000"
+      },
+      "action": {
+        "type": "Q::A::w::V::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Q::A::w::V::a::\"000000\"",
-      "action": "Q::A::w::V::Action::\"action\"",
-      "resource": "Q::A::w::V::a::\"000000\"",
+      "principal": {
+        "type": "Q::A::w::V::a",
+        "id": "000000"
+      },
+      "resource": {
+        "type": "Q::A::w::V::a",
+        "id": "000000"
+      },
+      "action": {
+        "type": "Q::A::w::V::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Q::A::w::V::a::\"000000\"",
-      "action": "Q::A::w::V::Action::\"action\"",
-      "resource": "Q::A::w::V::a::\"000000\"",
+      "principal": {
+        "type": "Q::A::w::V::a",
+        "id": "000000"
+      },
+      "resource": {
+        "type": "Q::A::w::V::a",
+        "id": "000000"
+      },
+      "action": {
+        "type": "Q::A::w::V::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c8d3de0be6b995f789a4670cd16f4614de8b907e.json b/cedar-integration-tests/corpus_tests/c8d3de0be6b995f789a4670cd16f4614de8b907e.json
index c870d7d23..53de8dbb6 100644
--- a/cedar-integration-tests/corpus_tests/c8d3de0be6b995f789a4670cd16f4614de8b907e.json
+++ b/cedar-integration-tests/corpus_tests/c8d3de0be6b995f789a4670cd16f4614de8b907e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/c8fe27949148dd0012f348801d64b30d9b27ea90.json b/cedar-integration-tests/corpus_tests/c8fe27949148dd0012f348801d64b30d9b27ea90.json
index 6838ade7e..dcff0f712 100644
--- a/cedar-integration-tests/corpus_tests/c8fe27949148dd0012f348801d64b30d9b27ea90.json
+++ b/cedar-integration-tests/corpus_tests/c8fe27949148dd0012f348801d64b30d9b27ea90.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ya\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "ya"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ya\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "ya"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/c9451af914da80278adceae4b34153a068f7d572.json b/cedar-integration-tests/corpus_tests/c9451af914da80278adceae4b34153a068f7d572.json
index 4db214b53..176455e8d 100644
--- a/cedar-integration-tests/corpus_tests/c9451af914da80278adceae4b34153a068f7d572.json
+++ b/cedar-integration-tests/corpus_tests/c9451af914da80278adceae4b34153a068f7d572.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "FwwwQwww::A::a::\"\"",
-      "action": "FwwwQwww::A::Action::\"action\"",
-      "resource": "FwwwQwww::A::a::\"\"",
+      "principal": {
+        "type": "FwwwQwww::A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwQwww::A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "FwwwQwww::A::Action",
+        "id": "action"
+      },
       "context": {
         "AY00000000": "",
         "DlcYqrwwww": ""
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "FwwwQwww::A::a::\"\"",
-      "action": "FwwwQwww::A::Action::\"action\"",
-      "resource": "FwwwQwww::A::a::\"\"",
+      "principal": {
+        "type": "FwwwQwww::A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwQwww::A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "FwwwQwww::A::Action",
+        "id": "action"
+      },
       "context": {
         "AY00000000": "",
         "DlcYqrwwww": ""
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "FwwwQwww::A::a::\"\"",
-      "action": "FwwwQwww::A::Action::\"action\"",
-      "resource": "FwwwQwww::A::a::\"\"",
+      "principal": {
+        "type": "FwwwQwww::A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwQwww::A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "FwwwQwww::A::Action",
+        "id": "action"
+      },
       "context": {
         "AY00000000": "",
         "DlcYqrwwww": ""
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "FwwwQwww::A::a::\"\"",
-      "action": "FwwwQwww::A::Action::\"action\"",
-      "resource": "FwwwQwww::A::a::\"\"",
+      "principal": {
+        "type": "FwwwQwww::A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwQwww::A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "FwwwQwww::A::Action",
+        "id": "action"
+      },
       "context": {
         "AY00000000": "",
         "DlcYqrwwww": ""
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "FwwwQwww::A::a::\"\"",
-      "action": "FwwwQwww::A::Action::\"action\"",
-      "resource": "FwwwQwww::A::a::\"\"",
+      "principal": {
+        "type": "FwwwQwww::A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwQwww::A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "FwwwQwww::A::Action",
+        "id": "action"
+      },
       "context": {
         "AY00000000": "",
         "DlcYqrwwww": ""
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "FwwwQwww::A::a::\"\"",
-      "action": "FwwwQwww::A::Action::\"action\"",
-      "resource": "FwwwQwww::A::a::\"\"",
+      "principal": {
+        "type": "FwwwQwww::A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwQwww::A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "FwwwQwww::A::Action",
+        "id": "action"
+      },
       "context": {
         "AY00000000": "",
         "DlcYqrwwww": ""
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "FwwwQwww::A::a::\"\"",
-      "action": "FwwwQwww::A::Action::\"action\"",
-      "resource": "FwwwQwww::A::a::\"\"",
+      "principal": {
+        "type": "FwwwQwww::A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwQwww::A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "FwwwQwww::A::Action",
+        "id": "action"
+      },
       "context": {
         "AY00000000": "",
         "DlcYqrwwww": ""
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "FwwwQwww::A::a::\"\"",
-      "action": "FwwwQwww::A::Action::\"action\"",
-      "resource": "FwwwQwww::A::a::\"\"",
+      "principal": {
+        "type": "FwwwQwww::A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwQwww::A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "FwwwQwww::A::Action",
+        "id": "action"
+      },
       "context": {
         "AY00000000": "",
         "DlcYqrwwww": ""
diff --git a/cedar-integration-tests/corpus_tests/c9513d54dc9241fb4d2ea7704d4bc0f57c533ee4.json b/cedar-integration-tests/corpus_tests/c9513d54dc9241fb4d2ea7704d4bc0f57c533ee4.json
index bd5d6a3ce..cfa5c4f1d 100644
--- a/cedar-integration-tests/corpus_tests/c9513d54dc9241fb4d2ea7704d4bc0f57c533ee4.json
+++ b/cedar-integration-tests/corpus_tests/c9513d54dc9241fb4d2ea7704d4bc0f57c533ee4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "_MMM::_MMMAzzq::QIII::a::\"\"",
-      "action": "_MMM::_MMMAzzq::QIII::Action::\"action\"",
-      "resource": "_MMM::_MMMAzzq::QIII::a::\"\"",
+      "principal": {
+        "type": "_MMM::_MMMAzzq::QIII::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "_MMM::_MMMAzzq::QIII::a",
+        "id": ""
+      },
+      "action": {
+        "type": "_MMM::_MMMAzzq::QIII::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "_MMM::_MMMAzzq::QIII::a::\"\"",
-      "action": "_MMM::_MMMAzzq::QIII::Action::\"action\"",
-      "resource": "_MMM::_MMMAzzq::QIII::a::\"\"",
+      "principal": {
+        "type": "_MMM::_MMMAzzq::QIII::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "_MMM::_MMMAzzq::QIII::a",
+        "id": ""
+      },
+      "action": {
+        "type": "_MMM::_MMMAzzq::QIII::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "_MMM::_MMMAzzq::QIII::a::\"\"",
-      "action": "_MMM::_MMMAzzq::QIII::Action::\"action\"",
-      "resource": "_MMM::_MMMAzzq::QIII::a::\"\"",
+      "principal": {
+        "type": "_MMM::_MMMAzzq::QIII::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "_MMM::_MMMAzzq::QIII::a",
+        "id": ""
+      },
+      "action": {
+        "type": "_MMM::_MMMAzzq::QIII::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "_MMM::_MMMAzzq::QIII::a::\"\"",
-      "action": "_MMM::_MMMAzzq::QIII::Action::\"action\"",
-      "resource": "_MMM::_MMMAzzq::QIII::a::\"\"",
+      "principal": {
+        "type": "_MMM::_MMMAzzq::QIII::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "_MMM::_MMMAzzq::QIII::a",
+        "id": ""
+      },
+      "action": {
+        "type": "_MMM::_MMMAzzq::QIII::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "_MMM::_MMMAzzq::QIII::a::\"\"",
-      "action": "_MMM::_MMMAzzq::QIII::Action::\"action\"",
-      "resource": "_MMM::_MMMAzzq::QIII::a::\"\"",
+      "principal": {
+        "type": "_MMM::_MMMAzzq::QIII::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "_MMM::_MMMAzzq::QIII::a",
+        "id": ""
+      },
+      "action": {
+        "type": "_MMM::_MMMAzzq::QIII::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "_MMM::_MMMAzzq::QIII::a::\"\"",
-      "action": "_MMM::_MMMAzzq::QIII::Action::\"action\"",
-      "resource": "_MMM::_MMMAzzq::QIII::a::\"\"",
+      "principal": {
+        "type": "_MMM::_MMMAzzq::QIII::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "_MMM::_MMMAzzq::QIII::a",
+        "id": ""
+      },
+      "action": {
+        "type": "_MMM::_MMMAzzq::QIII::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "_MMM::_MMMAzzq::QIII::a::\"\"",
-      "action": "_MMM::_MMMAzzq::QIII::Action::\"action\"",
-      "resource": "_MMM::_MMMAzzq::QIII::a::\"\"",
+      "principal": {
+        "type": "_MMM::_MMMAzzq::QIII::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "_MMM::_MMMAzzq::QIII::a",
+        "id": ""
+      },
+      "action": {
+        "type": "_MMM::_MMMAzzq::QIII::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "_MMM::_MMMAzzq::QIII::a::\"\"",
-      "action": "_MMM::_MMMAzzq::QIII::Action::\"action\"",
-      "resource": "_MMM::_MMMAzzq::QIII::a::\"\"",
+      "principal": {
+        "type": "_MMM::_MMMAzzq::QIII::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "_MMM::_MMMAzzq::QIII::a",
+        "id": ""
+      },
+      "action": {
+        "type": "_MMM::_MMMAzzq::QIII::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c9544d8da6332ce73e4e6e93fd80b99246c9504e.json b/cedar-integration-tests/corpus_tests/c9544d8da6332ce73e4e6e93fd80b99246c9504e.json
index 4bf27876e..d702712dd 100644
--- a/cedar-integration-tests/corpus_tests/c9544d8da6332ce73e4e6e93fd80b99246c9504e.json
+++ b/cedar-integration-tests/corpus_tests/c9544d8da6332ce73e4e6e93fd80b99246c9504e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/c9ce04d4744930aa5c288e89dbd296ae9a51ab27.json b/cedar-integration-tests/corpus_tests/c9ce04d4744930aa5c288e89dbd296ae9a51ab27.json
index 6b527df7b..4e787168c 100644
--- a/cedar-integration-tests/corpus_tests/c9ce04d4744930aa5c288e89dbd296ae9a51ab27.json
+++ b/cedar-integration-tests/corpus_tests/c9ce04d4744930aa5c288e89dbd296ae9a51ab27.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/c9d785d24decdab39f65bd89d74169d6cae6a4c4.json b/cedar-integration-tests/corpus_tests/c9d785d24decdab39f65bd89d74169d6cae6a4c4.json
index 20e571deb..4af259fbf 100644
--- a/cedar-integration-tests/corpus_tests/c9d785d24decdab39f65bd89d74169d6cae6a4c4.json
+++ b/cedar-integration-tests/corpus_tests/c9d785d24decdab39f65bd89d74169d6cae6a4c4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}?\\u{13}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002?\u0013\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}?\\u{13}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002?\u0013\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}?\\u{13}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}?\\u{13}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002?\u0013\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002?\u0013\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}?\\u{13}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}?\\u{13}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002?\u0013\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002?\u0013\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}?\\u{13}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}?\\u{13}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002?\u0013\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002?\u0013\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}?\\u{13}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}?\\u{13}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002?\u0013\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002?\u0013\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}?\\u{13}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}?\\u{13}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002?\u0013\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002?\u0013\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}?\\u{13}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}?\\u{13}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002?\u0013\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002?\u0013\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/c9fd461dff91be35baf80482fe3405defbcaf17c.json b/cedar-integration-tests/corpus_tests/c9fd461dff91be35baf80482fe3405defbcaf17c.json
index 0a1047ab1..226341c3d 100644
--- a/cedar-integration-tests/corpus_tests/c9fd461dff91be35baf80482fe3405defbcaf17c.json
+++ b/cedar-integration-tests/corpus_tests/c9fd461dff91be35baf80482fe3405defbcaf17c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "l6yyUI306666::a::\"\"",
-      "action": "l6yyUI306666::Action::\"action\"",
-      "resource": "l6yyUI306666::a::\"\"",
+      "principal": {
+        "type": "l6yyUI306666::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l6yyUI306666::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l6yyUI306666::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "l6yyUI306666::a::\"\"",
-      "action": "l6yyUI306666::Action::\"action\"",
-      "resource": "l6yyUI306666::a::\"\"",
+      "principal": {
+        "type": "l6yyUI306666::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l6yyUI306666::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l6yyUI306666::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "l6yyUI306666::a::\"\"",
-      "action": "l6yyUI306666::Action::\"action\"",
-      "resource": "l6yyUI306666::a::\"\"",
+      "principal": {
+        "type": "l6yyUI306666::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l6yyUI306666::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l6yyUI306666::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "l6yyUI306666::a::\"\"",
-      "action": "l6yyUI306666::Action::\"action\"",
-      "resource": "l6yyUI306666::a::\"\"",
+      "principal": {
+        "type": "l6yyUI306666::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l6yyUI306666::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l6yyUI306666::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "l6yyUI306666::a::\"\"",
-      "action": "l6yyUI306666::Action::\"action\"",
-      "resource": "l6yyUI306666::a::\"\"",
+      "principal": {
+        "type": "l6yyUI306666::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l6yyUI306666::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l6yyUI306666::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "l6yyUI306666::a::\"\"",
-      "action": "l6yyUI306666::Action::\"action\"",
-      "resource": "l6yyUI306666::a::\"\"",
+      "principal": {
+        "type": "l6yyUI306666::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l6yyUI306666::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l6yyUI306666::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "l6yyUI306666::a::\"\"",
-      "action": "l6yyUI306666::Action::\"action\"",
-      "resource": "l6yyUI306666::a::\"\"",
+      "principal": {
+        "type": "l6yyUI306666::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l6yyUI306666::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l6yyUI306666::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "l6yyUI306666::a::\"\"",
-      "action": "l6yyUI306666::Action::\"action\"",
-      "resource": "l6yyUI306666::a::\"\"",
+      "principal": {
+        "type": "l6yyUI306666::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "l6yyUI306666::a",
+        "id": ""
+      },
+      "action": {
+        "type": "l6yyUI306666::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ca010ae77009ab1e7e6ead8fc87549c4adacc30a.json b/cedar-integration-tests/corpus_tests/ca010ae77009ab1e7e6ead8fc87549c4adacc30a.json
index 35d5b28de..7ebe57d10 100644
--- a/cedar-integration-tests/corpus_tests/ca010ae77009ab1e7e6ead8fc87549c4adacc30a.json
+++ b/cedar-integration-tests/corpus_tests/ca010ae77009ab1e7e6ead8fc87549c4adacc30a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"f\\u{3}\\0\\0\\0\\0\\0~\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"f\\u{3}\\0\\0\\0\\0\\0~\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000\u0000\u0000~"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000\u0000\u0000~"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"f\\u{3}\\0\\0\\0\\0\\0~\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"f\\u{3}\\0\\0\\0\\0\\0~\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000\u0000\u0000~"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000\u0000\u0000~"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"f\\u{3}\\0\\0\\0\\0\\0~\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"f\\u{3}\\0\\0\\0\\0\\0~\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000\u0000\u0000~"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000\u0000\u0000~"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"f\\u{3}\\0\\0\\0\\0\\0~\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"f\\u{3}\\0\\0\\0\\0\\0~\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000\u0000\u0000~"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000\u0000\u0000~"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"f\\u{3}\\0\\0\\0\\0\\0~\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"f\\u{3}\\0\\0\\0\\0\\0~\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000\u0000\u0000~"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000\u0000\u0000~"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"f\\u{3}\\0\\0\\0\\0\\0~\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"f\\u{3}\\0\\0\\0\\0\\0~\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000\u0000\u0000~"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000\u0000\u0000~"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"f\\u{3}\\0\\0\\0\\0\\0~\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"f\\u{3}\\0\\0\\0\\0\\0~\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000\u0000\u0000~"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000\u0000\u0000~"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"f\\u{3}\\0\\0\\0\\0\\0~\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"f\\u{3}\\0\\0\\0\\0\\0~\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000\u0000\u0000~"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0003\u0000\u0000\u0000\u0000\u0000~"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ca06a51555f15300dd186e65a89306449da750f0.json b/cedar-integration-tests/corpus_tests/ca06a51555f15300dd186e65a89306449da750f0.json
index 4cbc7434b..fadcc8498 100644
--- a/cedar-integration-tests/corpus_tests/ca06a51555f15300dd186e65a89306449da750f0.json
+++ b/cedar-integration-tests/corpus_tests/ca06a51555f15300dd186e65a89306449da750f0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0jj#\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000jj#\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0jj#\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000jj#\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0jj#\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0jj#\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000jj#\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000jj#\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0jj#\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0jj#\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000jj#\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000jj#\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0jj#\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0jj#\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000jj#\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000jj#\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0jj#\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0jj#\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000jj#\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000jj#\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0jj#\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0jj#\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000jj#\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000jj#\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ca2a5665590dadaa410ae37be42cf8c38ebf5228.json b/cedar-integration-tests/corpus_tests/ca2a5665590dadaa410ae37be42cf8c38ebf5228.json
index dd7545e26..9f7fe4860 100644
--- a/cedar-integration-tests/corpus_tests/ca2a5665590dadaa410ae37be42cf8c38ebf5228.json
+++ b/cedar-integration-tests/corpus_tests/ca2a5665590dadaa410ae37be42cf8c38ebf5228.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ca3865c2e9e9f967ec6c1d85bd1ec6b9ce81d326.json b/cedar-integration-tests/corpus_tests/ca3865c2e9e9f967ec6c1d85bd1ec6b9ce81d326.json
index ac00af9b1..2b0275e6b 100644
--- a/cedar-integration-tests/corpus_tests/ca3865c2e9e9f967ec6c1d85bd1ec6b9ce81d326.json
+++ b/cedar-integration-tests/corpus_tests/ca3865c2e9e9f967ec6c1d85bd1ec6b9ce81d326.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +21,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"zzzz\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "zzzz"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +42,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"zzzz\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "zzzz"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"zzzz\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "zzzz"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"zzzz\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "zzzz"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"zzzz\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "zzzz"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"zzzz\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "zzzz"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +147,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"zzzz\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "zzzz"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ca4a7fbd3617faa7e877b6038d722296a4b9d27d.json b/cedar-integration-tests/corpus_tests/ca4a7fbd3617faa7e877b6038d722296a4b9d27d.json
index 2fb2ad7ce..81e396337 100644
--- a/cedar-integration-tests/corpus_tests/ca4a7fbd3617faa7e877b6038d722296a4b9d27d.json
+++ b/cedar-integration-tests/corpus_tests/ca4a7fbd3617faa7e877b6038d722296a4b9d27d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ca4af84c84f851f8ad08f0d1c165ac756ff361f5.json b/cedar-integration-tests/corpus_tests/ca4af84c84f851f8ad08f0d1c165ac756ff361f5.json
index 8e12adb4e..8f97efafa 100644
--- a/cedar-integration-tests/corpus_tests/ca4af84c84f851f8ad08f0d1c165ac756ff361f5.json
+++ b/cedar-integration-tests/corpus_tests/ca4af84c84f851f8ad08f0d1c165ac756ff361f5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "g::r::A::Q::a::\"\"",
-      "action": "g::r::A::Q::Action::\"action\"",
-      "resource": "g::r::A::Q::a::\"\"",
+      "principal": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "g::r::A::Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "g::r::A::Q::a::\"\"",
-      "action": "g::r::A::Q::Action::\"action\"",
-      "resource": "g::r::A::Q::a::\"\"",
+      "principal": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "g::r::A::Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "g::r::A::Q::a::\"\"",
-      "action": "g::r::A::Q::Action::\"action\"",
-      "resource": "g::r::A::Q::a::\"\"",
+      "principal": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "g::r::A::Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "g::r::A::Q::a::\"\"",
-      "action": "g::r::A::Q::Action::\"action\"",
-      "resource": "g::r::A::Q::a::\"\"",
+      "principal": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "g::r::A::Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "g::r::A::Q::a::\"\"",
-      "action": "g::r::A::Q::Action::\"action\"",
-      "resource": "g::r::A::Q::a::\"\"",
+      "principal": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "g::r::A::Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "g::r::A::Q::a::\"\"",
-      "action": "g::r::A::Q::Action::\"action\"",
-      "resource": "g::r::A::Q::a::\"\"",
+      "principal": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "g::r::A::Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "g::r::A::Q::a::\"\"",
-      "action": "g::r::A::Q::Action::\"action\"",
-      "resource": "g::r::A::Q::a::\"\"",
+      "principal": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "g::r::A::Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "g::r::A::Q::a::\"\"",
-      "action": "g::r::A::Q::Action::\"action\"",
-      "resource": "g::r::A::Q::a::\"\"",
+      "principal": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "g::r::A::Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "g::r::A::Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ca6a97aeccaccf888e717ebcac44c4ee680705b1.json b/cedar-integration-tests/corpus_tests/ca6a97aeccaccf888e717ebcac44c4ee680705b1.json
index 5fb9f7e50..6fa9576a1 100644
--- a/cedar-integration-tests/corpus_tests/ca6a97aeccaccf888e717ebcac44c4ee680705b1.json
+++ b/cedar-integration-tests/corpus_tests/ca6a97aeccaccf888e717ebcac44c4ee680705b1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ca6bf4ceb4c21f136ef5564dc649eaabe796d2af.json b/cedar-integration-tests/corpus_tests/ca6bf4ceb4c21f136ef5564dc649eaabe796d2af.json
index c077acce0..e10222c2c 100644
--- a/cedar-integration-tests/corpus_tests/ca6bf4ceb4c21f136ef5564dc649eaabe796d2af.json
+++ b/cedar-integration-tests/corpus_tests/ca6bf4ceb4c21f136ef5564dc649eaabe796d2af.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ca8c65d6a0d28a825efa2260b21fb646da2d7305.json b/cedar-integration-tests/corpus_tests/ca8c65d6a0d28a825efa2260b21fb646da2d7305.json
index 1e618b5a8..90d05612e 100644
--- a/cedar-integration-tests/corpus_tests/ca8c65d6a0d28a825efa2260b21fb646da2d7305.json
+++ b/cedar-integration-tests/corpus_tests/ca8c65d6a0d28a825efa2260b21fb646da2d7305.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"RRRRRR\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "RRRRRR"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"RRRRRR\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "RRRRRR"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"RRRRRR\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "RRRRRR"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"RRRRRR\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "RRRRRR"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"RRRRRR\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "RRRRRR"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"RRRRRR\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "RRRRRR"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"RRRRRR\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "RRRRRR"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"RRRRRR\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "RRRRRR"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/caa3b175b406fa918945038b82d980fddc8fb8be.json b/cedar-integration-tests/corpus_tests/caa3b175b406fa918945038b82d980fddc8fb8be.json
index cddc4e6e8..8da1c8915 100644
--- a/cedar-integration-tests/corpus_tests/caa3b175b406fa918945038b82d980fddc8fb8be.json
+++ b/cedar-integration-tests/corpus_tests/caa3b175b406fa918945038b82d980fddc8fb8be.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\")\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": ")"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/caa9c09c494d1fe4e3afd20fe702cef632f492b0.json b/cedar-integration-tests/corpus_tests/caa9c09c494d1fe4e3afd20fe702cef632f492b0.json
index 56caaff39..f9e997628 100644
--- a/cedar-integration-tests/corpus_tests/caa9c09c494d1fe4e3afd20fe702cef632f492b0.json
+++ b/cedar-integration-tests/corpus_tests/caa9c09c494d1fe4e3afd20fe702cef632f492b0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/cb37f1c7f23871d56b18153d9f46612f39189a65.json b/cedar-integration-tests/corpus_tests/cb37f1c7f23871d56b18153d9f46612f39189a65.json
index 71e509fc0..7395d8150 100644
--- a/cedar-integration-tests/corpus_tests/cb37f1c7f23871d56b18153d9f46612f39189a65.json
+++ b/cedar-integration-tests/corpus_tests/cb37f1c7f23871d56b18153d9f46612f39189a65.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{6}`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006`"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{6}`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}`\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}`\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{6}`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}`\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{6}`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}`\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{6}`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}`\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{6}`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}`\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/cb4b59edfc9f9d6201f583176e0a6cf4445aafe4.json b/cedar-integration-tests/corpus_tests/cb4b59edfc9f9d6201f583176e0a6cf4445aafe4.json
index 8f8c91d21..49edeaae6 100644
--- a/cedar-integration-tests/corpus_tests/cb4b59edfc9f9d6201f583176e0a6cf4445aafe4.json
+++ b/cedar-integration-tests/corpus_tests/cb4b59edfc9f9d6201f583176e0a6cf4445aafe4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/cb69cec9fa08db715b220aaf9ab251898986e8a8.json b/cedar-integration-tests/corpus_tests/cb69cec9fa08db715b220aaf9ab251898986e8a8.json
index f731e52d8..b08b1b2f0 100644
--- a/cedar-integration-tests/corpus_tests/cb69cec9fa08db715b220aaf9ab251898986e8a8.json
+++ b/cedar-integration-tests/corpus_tests/cb69cec9fa08db715b220aaf9ab251898986e8a8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{6}\\0\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0006\u0000\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0i\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0i\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000i\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/cb91f70a3b580008e79ad7d2f79c554604d4bf4f.json b/cedar-integration-tests/corpus_tests/cb91f70a3b580008e79ad7d2f79c554604d4bf4f.json
index 19a24c0cd..5caca04b3 100644
--- a/cedar-integration-tests/corpus_tests/cb91f70a3b580008e79ad7d2f79c554604d4bf4f.json
+++ b/cedar-integration-tests/corpus_tests/cb91f70a3b580008e79ad7d2f79c554604d4bf4f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/cb9736c90c6e91da980b4286805b8759e8140360.json b/cedar-integration-tests/corpus_tests/cb9736c90c6e91da980b4286805b8759e8140360.json
index dd2eadfc1..ba9317462 100644
--- a/cedar-integration-tests/corpus_tests/cb9736c90c6e91da980b4286805b8759e8140360.json
+++ b/cedar-integration-tests/corpus_tests/cb9736c90c6e91da980b4286805b8759e8140360.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::l77::r::a::\"\"",
-      "action": "r::l77::r::Action::\"action\"",
-      "resource": "r::l77::r::a::\"\"",
+      "principal": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::l77::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::l77::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/cc030557bcc567d0adf8ce6866d7979ff1d48256.json b/cedar-integration-tests/corpus_tests/cc030557bcc567d0adf8ce6866d7979ff1d48256.json
index 285fc53c3..0f96e3e79 100644
--- a/cedar-integration-tests/corpus_tests/cc030557bcc567d0adf8ce6866d7979ff1d48256.json
+++ b/cedar-integration-tests/corpus_tests/cc030557bcc567d0adf8ce6866d7979ff1d48256.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/cc28740c4d1065a1f7db2d69103dea6bd50cbb4e.json b/cedar-integration-tests/corpus_tests/cc28740c4d1065a1f7db2d69103dea6bd50cbb4e.json
index 96559783a..a7d44ed4f 100644
--- a/cedar-integration-tests/corpus_tests/cc28740c4d1065a1f7db2d69103dea6bd50cbb4e.json
+++ b/cedar-integration-tests/corpus_tests/cc28740c4d1065a1f7db2d69103dea6bd50cbb4e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"om\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "om"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/cc4b17e6930e959806dc8dfd9a31c36831009e86.json b/cedar-integration-tests/corpus_tests/cc4b17e6930e959806dc8dfd9a31c36831009e86.json
index fd6a5076a..a0d7ab031 100644
--- a/cedar-integration-tests/corpus_tests/cc4b17e6930e959806dc8dfd9a31c36831009e86.json
+++ b/cedar-integration-tests/corpus_tests/cc4b17e6930e959806dc8dfd9a31c36831009e86.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0CCC\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"l/\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000CCC\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "l/"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"l/\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0CCC\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "l/"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000CCC\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0CCC\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0CCC\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000CCC\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000CCC\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0CCC\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0CCC\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000CCC\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000CCC\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0CCC\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0CCC\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000CCC\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000CCC\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0CCC\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0CCC\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000CCC\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000CCC\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0CCC\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0CCC\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000CCC\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000CCC\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0CCC\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0CCC\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000CCC\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000CCC\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/cc6cce3a415f8f5dfc2b237feb7cc124c01ebc5d.json b/cedar-integration-tests/corpus_tests/cc6cce3a415f8f5dfc2b237feb7cc124c01ebc5d.json
index 837728521..2a3c3bc76 100644
--- a/cedar-integration-tests/corpus_tests/cc6cce3a415f8f5dfc2b237feb7cc124c01ebc5d.json
+++ b/cedar-integration-tests/corpus_tests/cc6cce3a415f8f5dfc2b237feb7cc124c01ebc5d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"a\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"a\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "a\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "a\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DldY222222": []
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"a\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"a\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "a\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "a\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DldY222222": []
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"a\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"a\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "a\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "a\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DldY222222": []
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"a\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"a\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "a\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "a\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DldY222222": []
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"a\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"a\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "a\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "a\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DldY222222": []
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"a\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"a\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "a\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "a\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DldY222222": []
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"a\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"a\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "a\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "a\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DldY222222": []
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"a\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"a\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "a\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "a\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DldY222222": []
       },
diff --git a/cedar-integration-tests/corpus_tests/cd02c1dbe98db92a4c97fd462eb40a797cc10903.json b/cedar-integration-tests/corpus_tests/cd02c1dbe98db92a4c97fd462eb40a797cc10903.json
index a50fe31ee..95b97ab2a 100644
--- a/cedar-integration-tests/corpus_tests/cd02c1dbe98db92a4c97fd462eb40a797cc10903.json
+++ b/cedar-integration-tests/corpus_tests/cd02c1dbe98db92a4c97fd462eb40a797cc10903.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ya\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "ya"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/cd24b45d64e569bf8a44d0cb26cadd19d02bb896.json b/cedar-integration-tests/corpus_tests/cd24b45d64e569bf8a44d0cb26cadd19d02bb896.json
index 95ec95c1b..9f7689e10 100644
--- a/cedar-integration-tests/corpus_tests/cd24b45d64e569bf8a44d0cb26cadd19d02bb896.json
+++ b/cedar-integration-tests/corpus_tests/cd24b45d64e569bf8a44d0cb26cadd19d02bb896.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/cd68929ac20c52e6a5b9f212a83241ae6638e5ae.json b/cedar-integration-tests/corpus_tests/cd68929ac20c52e6a5b9f212a83241ae6638e5ae.json
index 59f289bd8..c8c7419e6 100644
--- a/cedar-integration-tests/corpus_tests/cd68929ac20c52e6a5b9f212a83241ae6638e5ae.json
+++ b/cedar-integration-tests/corpus_tests/cd68929ac20c52e6a5b9f212a83241ae6638e5ae.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "."
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "."
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/cdc3a1be26de1d55c9a999fcd2bca635ab0994ae.json b/cedar-integration-tests/corpus_tests/cdc3a1be26de1d55c9a999fcd2bca635ab0994ae.json
index 6d0d28c9b..f8d0f7eac 100644
--- a/cedar-integration-tests/corpus_tests/cdc3a1be26de1d55c9a999fcd2bca635ab0994ae.json
+++ b/cedar-integration-tests/corpus_tests/cdc3a1be26de1d55c9a999fcd2bca635ab0994ae.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "p2kk00000": "",
         "r": "",
@@ -22,9 +31,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "p2kk00000": "",
         "r": "",
@@ -38,9 +56,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "p2kk00000": "",
         "r": "",
@@ -54,9 +81,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "p2kk00000": "",
         "r": "",
@@ -70,9 +106,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "p2kk00000": "",
         "r": "",
@@ -86,9 +131,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "p2kk00000": "",
         "r": "",
@@ -102,9 +156,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "p2kk00000": "",
         "r": "",
@@ -118,9 +181,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "A::\"\"",
+      "principal": {
+        "type": "A",
+        "id": ""
+      },
+      "resource": {
+        "type": "A",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "p2kk00000": "",
         "r": "",
diff --git a/cedar-integration-tests/corpus_tests/ce29db8c629bdec52719f2c8d30dd323fbb2ba2e.json b/cedar-integration-tests/corpus_tests/ce29db8c629bdec52719f2c8d30dd323fbb2ba2e.json
index 2f81b0642..c369fe9bc 100644
--- a/cedar-integration-tests/corpus_tests/ce29db8c629bdec52719f2c8d30dd323fbb2ba2e.json
+++ b/cedar-integration-tests/corpus_tests/ce29db8c629bdec52719f2c8d30dd323fbb2ba2e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"?\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"?\"",
+      "principal": {
+        "type": "a",
+        "id": "?"
+      },
+      "resource": {
+        "type": "a",
+        "id": "?"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"?\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"?\"",
+      "principal": {
+        "type": "a",
+        "id": "?"
+      },
+      "resource": {
+        "type": "a",
+        "id": "?"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"?\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"?\"",
+      "principal": {
+        "type": "a",
+        "id": "?"
+      },
+      "resource": {
+        "type": "a",
+        "id": "?"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"?\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"?\"",
+      "principal": {
+        "type": "a",
+        "id": "?"
+      },
+      "resource": {
+        "type": "a",
+        "id": "?"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"?\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"?\"",
+      "principal": {
+        "type": "a",
+        "id": "?"
+      },
+      "resource": {
+        "type": "a",
+        "id": "?"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"?\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"?\"",
+      "principal": {
+        "type": "a",
+        "id": "?"
+      },
+      "resource": {
+        "type": "a",
+        "id": "?"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"?\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"?\"",
+      "principal": {
+        "type": "a",
+        "id": "?"
+      },
+      "resource": {
+        "type": "a",
+        "id": "?"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"?\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"?\"",
+      "principal": {
+        "type": "a",
+        "id": "?"
+      },
+      "resource": {
+        "type": "a",
+        "id": "?"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ce2e4c92116904b0fb6d9e3a5f5fbf168d05b7d9.json b/cedar-integration-tests/corpus_tests/ce2e4c92116904b0fb6d9e3a5f5fbf168d05b7d9.json
index 4b22a0ea9..d4bbd7db9 100644
--- a/cedar-integration-tests/corpus_tests/ce2e4c92116904b0fb6d9e3a5f5fbf168d05b7d9.json
+++ b/cedar-integration-tests/corpus_tests/ce2e4c92116904b0fb6d9e3a5f5fbf168d05b7d9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "C2z::a::\"\\u{2}\\u{2}\\0\\u{2}\\u{2}\\0\"",
-      "action": "C2z::Action::\"action\"",
-      "resource": "C2z::a::\"\"",
+      "principal": {
+        "type": "C2z::a",
+        "id": "\u0002\u0002\u0000\u0002\u0002\u0000"
+      },
+      "resource": {
+        "type": "C2z::a",
+        "id": ""
+      },
+      "action": {
+        "type": "C2z::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "C2z::a::\"\"",
-      "action": "C2z::Action::\"action\"",
-      "resource": "C2z::a::\"\"",
+      "principal": {
+        "type": "C2z::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C2z::a",
+        "id": ""
+      },
+      "action": {
+        "type": "C2z::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "C2z::a::\"\"",
-      "action": "C2z::Action::\"action\"",
-      "resource": "C2z::a::\"\"",
+      "principal": {
+        "type": "C2z::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C2z::a",
+        "id": ""
+      },
+      "action": {
+        "type": "C2z::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "C2z::a::\"\"",
-      "action": "C2z::Action::\"action\"",
-      "resource": "C2z::a::\"\"",
+      "principal": {
+        "type": "C2z::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C2z::a",
+        "id": ""
+      },
+      "action": {
+        "type": "C2z::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "C2z::a::\"\"",
-      "action": "C2z::Action::\"action\"",
-      "resource": "C2z::a::\"\"",
+      "principal": {
+        "type": "C2z::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C2z::a",
+        "id": ""
+      },
+      "action": {
+        "type": "C2z::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "C2z::a::\"\"",
-      "action": "C2z::Action::\"action\"",
-      "resource": "C2z::a::\"\"",
+      "principal": {
+        "type": "C2z::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C2z::a",
+        "id": ""
+      },
+      "action": {
+        "type": "C2z::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "C2z::a::\"\"",
-      "action": "C2z::Action::\"action\"",
-      "resource": "C2z::a::\"\"",
+      "principal": {
+        "type": "C2z::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C2z::a",
+        "id": ""
+      },
+      "action": {
+        "type": "C2z::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "C2z::a::\"\"",
-      "action": "C2z::Action::\"action\"",
-      "resource": "C2z::a::\"\"",
+      "principal": {
+        "type": "C2z::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C2z::a",
+        "id": ""
+      },
+      "action": {
+        "type": "C2z::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ce56cd89a9f467a753248fecdab1afce4c35b6e4.json b/cedar-integration-tests/corpus_tests/ce56cd89a9f467a753248fecdab1afce4c35b6e4.json
index 75a74c967..a2be71458 100644
--- a/cedar-integration-tests/corpus_tests/ce56cd89a9f467a753248fecdab1afce4c35b6e4.json
+++ b/cedar-integration-tests/corpus_tests/ce56cd89a9f467a753248fecdab1afce4c35b6e4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Fwww::Ay::a::\"::\\u{1a}\"",
-      "action": "Fwww::Ay::Action::\"action\"",
-      "resource": "Fwww::Ay::a::\"::\\u{1a}\"",
+      "principal": {
+        "type": "Fwww::Ay::a",
+        "id": "::\u001a"
+      },
+      "resource": {
+        "type": "Fwww::Ay::a",
+        "id": "::\u001a"
+      },
+      "action": {
+        "type": "Fwww::Ay::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Fwww::Ay::a::\"::\\u{1a}\"",
-      "action": "Fwww::Ay::Action::\"action\"",
-      "resource": "Fwww::Ay::a::\"::\\u{1a}\"",
+      "principal": {
+        "type": "Fwww::Ay::a",
+        "id": "::\u001a"
+      },
+      "resource": {
+        "type": "Fwww::Ay::a",
+        "id": "::\u001a"
+      },
+      "action": {
+        "type": "Fwww::Ay::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Fwww::Ay::a::\"::\\u{1a}\"",
-      "action": "Fwww::Ay::Action::\"action\"",
-      "resource": "Fwww::Ay::a::\"::\\u{1a}\"",
+      "principal": {
+        "type": "Fwww::Ay::a",
+        "id": "::\u001a"
+      },
+      "resource": {
+        "type": "Fwww::Ay::a",
+        "id": "::\u001a"
+      },
+      "action": {
+        "type": "Fwww::Ay::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Fwww::Ay::a::\"::\\u{1a}\"",
-      "action": "Fwww::Ay::Action::\"action\"",
-      "resource": "Fwww::Ay::a::\"::\\u{1a}\"",
+      "principal": {
+        "type": "Fwww::Ay::a",
+        "id": "::\u001a"
+      },
+      "resource": {
+        "type": "Fwww::Ay::a",
+        "id": "::\u001a"
+      },
+      "action": {
+        "type": "Fwww::Ay::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Fwww::Ay::a::\"::\\u{1a}\"",
-      "action": "Fwww::Ay::Action::\"action\"",
-      "resource": "Fwww::Ay::a::\"::\\u{1a}\"",
+      "principal": {
+        "type": "Fwww::Ay::a",
+        "id": "::\u001a"
+      },
+      "resource": {
+        "type": "Fwww::Ay::a",
+        "id": "::\u001a"
+      },
+      "action": {
+        "type": "Fwww::Ay::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Fwww::Ay::a::\"::\\u{1a}\"",
-      "action": "Fwww::Ay::Action::\"action\"",
-      "resource": "Fwww::Ay::a::\"::\\u{1a}\"",
+      "principal": {
+        "type": "Fwww::Ay::a",
+        "id": "::\u001a"
+      },
+      "resource": {
+        "type": "Fwww::Ay::a",
+        "id": "::\u001a"
+      },
+      "action": {
+        "type": "Fwww::Ay::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Fwww::Ay::a::\"::\\u{1a}\"",
-      "action": "Fwww::Ay::Action::\"action\"",
-      "resource": "Fwww::Ay::a::\"::\\u{1a}\"",
+      "principal": {
+        "type": "Fwww::Ay::a",
+        "id": "::\u001a"
+      },
+      "resource": {
+        "type": "Fwww::Ay::a",
+        "id": "::\u001a"
+      },
+      "action": {
+        "type": "Fwww::Ay::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Fwww::Ay::a::\"::\\u{1a}\"",
-      "action": "Fwww::Ay::Action::\"action\"",
-      "resource": "Fwww::Ay::a::\"::\\u{1a}\"",
+      "principal": {
+        "type": "Fwww::Ay::a",
+        "id": "::\u001a"
+      },
+      "resource": {
+        "type": "Fwww::Ay::a",
+        "id": "::\u001a"
+      },
+      "action": {
+        "type": "Fwww::Ay::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ce937b05f78203ed138b10bafa0bcaecb8240e5c.json b/cedar-integration-tests/corpus_tests/ce937b05f78203ed138b10bafa0bcaecb8240e5c.json
index 14e9eb3f9..8f828fd7d 100644
--- a/cedar-integration-tests/corpus_tests/ce937b05f78203ed138b10bafa0bcaecb8240e5c.json
+++ b/cedar-integration-tests/corpus_tests/ce937b05f78203ed138b10bafa0bcaecb8240e5c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{7}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0007\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ceb5a1ff1b0982afc158333c77c32248f432b958.json b/cedar-integration-tests/corpus_tests/ceb5a1ff1b0982afc158333c77c32248f432b958.json
index 6dccc1f64..f7ea3d4bc 100644
--- a/cedar-integration-tests/corpus_tests/ceb5a1ff1b0982afc158333c77c32248f432b958.json
+++ b/cedar-integration-tests/corpus_tests/ceb5a1ff1b0982afc158333c77c32248f432b958.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/cecb369a6be00d8de248438225943338bdc28ad3.json b/cedar-integration-tests/corpus_tests/cecb369a6be00d8de248438225943338bdc28ad3.json
index 006969bed..4c5d7fbd8 100644
--- a/cedar-integration-tests/corpus_tests/cecb369a6be00d8de248438225943338bdc28ad3.json
+++ b/cedar-integration-tests/corpus_tests/cecb369a6be00d8de248438225943338bdc28ad3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"F\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "F"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/cefaca00ac959a2b9fc2f68db187e24290d6fa39.json b/cedar-integration-tests/corpus_tests/cefaca00ac959a2b9fc2f68db187e24290d6fa39.json
index 0d37e388f..f940d252e 100644
--- a/cedar-integration-tests/corpus_tests/cefaca00ac959a2b9fc2f68db187e24290d6fa39.json
+++ b/cedar-integration-tests/corpus_tests/cefaca00ac959a2b9fc2f68db187e24290d6fa39.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ffffffbff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffbff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffbff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffbff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ffffffbff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffbff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffbff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffbff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"ffffffbff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffbff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffbff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffbff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ffffffbff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffbff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffbff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffbff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ffffffbff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffbff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffbff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffbff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ffffffbff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffbff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffbff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffbff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ffffffbff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffbff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffbff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffbff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ffffffbff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffffffbff\"",
+      "principal": {
+        "type": "a",
+        "id": "ffffffbff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffffffbff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/cf04c3babc42128066c12b2e61fc3f1e4f361333.json b/cedar-integration-tests/corpus_tests/cf04c3babc42128066c12b2e61fc3f1e4f361333.json
index fbe92233c..9c4f7c471 100644
--- a/cedar-integration-tests/corpus_tests/cf04c3babc42128066c12b2e61fc3f1e4f361333.json
+++ b/cedar-integration-tests/corpus_tests/cf04c3babc42128066c12b2e61fc3f1e4f361333.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"j\\u{10}::::ov\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\u{10}::::ov\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0010::::ov\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0010::::ov\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"j\\u{10}::::ov\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\u{10}::::ov\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0010::::ov\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0010::::ov\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"j\\u{10}::::ov\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0010::::ov\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"j\\u{10}::::ov\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\u{10}::::ov\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0010::::ov\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0010::::ov\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"j\\u{10}::::ov\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\u{10}::::ov\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0010::::ov\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0010::::ov\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"j\\u{10}::::ov\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\u{10}::::ov\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0010::::ov\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0010::::ov\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"j\\u{10}::::ov\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\u{10}::::ov\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0010::::ov\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0010::::ov\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"j\\u{10}::::ov\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\u{10}::::ov\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0010::::ov\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0010::::ov\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/cf8e0b821a33183bb1b27c5204c767cf73046ff2.json b/cedar-integration-tests/corpus_tests/cf8e0b821a33183bb1b27c5204c767cf73046ff2.json
index 487da27f2..f28a0c8be 100644
--- a/cedar-integration-tests/corpus_tests/cf8e0b821a33183bb1b27c5204c767cf73046ff2.json
+++ b/cedar-integration-tests/corpus_tests/cf8e0b821a33183bb1b27c5204c767cf73046ff2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"V\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"V\"",
+      "principal": {
+        "type": "a",
+        "id": "V"
+      },
+      "resource": {
+        "type": "a",
+        "id": "V"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"V\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"V\"",
+      "principal": {
+        "type": "a",
+        "id": "V"
+      },
+      "resource": {
+        "type": "a",
+        "id": "V"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"V\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"V\"",
+      "principal": {
+        "type": "a",
+        "id": "V"
+      },
+      "resource": {
+        "type": "a",
+        "id": "V"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"V\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"V\"",
+      "principal": {
+        "type": "a",
+        "id": "V"
+      },
+      "resource": {
+        "type": "a",
+        "id": "V"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"V\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"V\"",
+      "principal": {
+        "type": "a",
+        "id": "V"
+      },
+      "resource": {
+        "type": "a",
+        "id": "V"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"V\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"V\"",
+      "principal": {
+        "type": "a",
+        "id": "V"
+      },
+      "resource": {
+        "type": "a",
+        "id": "V"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"V\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"V\"",
+      "principal": {
+        "type": "a",
+        "id": "V"
+      },
+      "resource": {
+        "type": "a",
+        "id": "V"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"V\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"V\"",
+      "principal": {
+        "type": "a",
+        "id": "V"
+      },
+      "resource": {
+        "type": "a",
+        "id": "V"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/cfb3c703fbb3741577a9fb16f3199d65bd6d7757.json b/cedar-integration-tests/corpus_tests/cfb3c703fbb3741577a9fb16f3199d65bd6d7757.json
index 47bccc302..af33c3448 100644
--- a/cedar-integration-tests/corpus_tests/cfb3c703fbb3741577a9fb16f3199d65bd6d7757.json
+++ b/cedar-integration-tests/corpus_tests/cfb3c703fbb3741577a9fb16f3199d65bd6d7757.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "inac10z00j00011": 7022872558093468160
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "inac10z00j00011": 7022872558093468160
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "inac10z00j00011": 7022872558093468160
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "inac10z00j00011": 7022872558093468160
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "inac10z00j00011": 7022872558093468160
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "inac10z00j00011": 7022872558093468160
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "inac10z00j00011": 7022872558093468160
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "inac10z00j00011": 7022872558093468160
       },
diff --git a/cedar-integration-tests/corpus_tests/cfdc0aa13f242dd5caecf75aed878d8bdf5015c0.json b/cedar-integration-tests/corpus_tests/cfdc0aa13f242dd5caecf75aed878d8bdf5015c0.json
index 11bc5fe55..5bea9d061 100644
--- a/cedar-integration-tests/corpus_tests/cfdc0aa13f242dd5caecf75aed878d8bdf5015c0.json
+++ b/cedar-integration-tests/corpus_tests/cfdc0aa13f242dd5caecf75aed878d8bdf5015c0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d021608663ac1df71c7a9a3508941597a8b87570.json b/cedar-integration-tests/corpus_tests/d021608663ac1df71c7a9a3508941597a8b87570.json
index 2e7d36fdd..342a1ebcb 100644
--- a/cedar-integration-tests/corpus_tests/d021608663ac1df71c7a9a3508941597a8b87570.json
+++ b/cedar-integration-tests/corpus_tests/d021608663ac1df71c7a9a3508941597a8b87570.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"FF%%\\0\\0FF\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0FF\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000FF\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000FF\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"FF%%\\0\\0FF\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0FF\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000FF\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000FF\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"FF%%\\0\\0FF\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0FF\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000FF\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000FF\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"FF%%\\0\\0FF\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0FF\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000FF\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000FF\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"FF%%\\0\\0FF\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0FF\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000FF\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000FF\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"FF%%\\0\\0FF\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0FF\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000FF\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000FF\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"FF%%\\0\\0FF\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0FF\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000FF\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000FF\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"FF%%\\0\\0FF\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FF%%\\0\\0FF\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000FF\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FF%%\u0000\u0000FF\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d069b0f4f26c6da3de746e83a900168433acaf04.json b/cedar-integration-tests/corpus_tests/d069b0f4f26c6da3de746e83a900168433acaf04.json
index 95228b433..f7d0ec43c 100644
--- a/cedar-integration-tests/corpus_tests/d069b0f4f26c6da3de746e83a900168433acaf04.json
+++ b/cedar-integration-tests/corpus_tests/d069b0f4f26c6da3de746e83a900168433acaf04.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F": {},
         "vnw": {},
@@ -22,9 +31,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F": {},
         "vnw": {},
@@ -38,9 +56,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F": {},
         "vnw": {},
@@ -54,9 +81,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F": {},
         "vnw": {},
@@ -70,9 +106,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F": {},
         "vnw": {},
@@ -86,9 +131,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F": {},
         "vnw": {},
@@ -102,9 +156,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F": {},
         "vnw": {},
@@ -118,9 +181,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F": {},
         "vnw": {},
diff --git a/cedar-integration-tests/corpus_tests/d07bc0de4ce3765c0db88eaa29075e491c9924d1.json b/cedar-integration-tests/corpus_tests/d07bc0de4ce3765c0db88eaa29075e491c9924d1.json
index 495e12764..a6348a4d4 100644
--- a/cedar-integration-tests/corpus_tests/d07bc0de4ce3765c0db88eaa29075e491c9924d1.json
+++ b/cedar-integration-tests/corpus_tests/d07bc0de4ce3765c0db88eaa29075e491c9924d1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"om/f\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "om/f"
+      },
       "context": {
         "saik0": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"om/f\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "om/f"
+      },
       "context": {
         "saik0": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"om/f\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "om/f"
+      },
       "context": {
         "saik0": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"om/f\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "om/f"
+      },
       "context": {
         "saik0": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"om/f\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "om/f"
+      },
       "context": {
         "saik0": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"om/f\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "om/f"
+      },
       "context": {
         "saik0": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"om/f\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "om/f"
+      },
       "context": {
         "saik0": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"om/f\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "om/f"
+      },
       "context": {
         "saik0": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/d07c1baa0ff4d7bf182af9d758aff489eb53b342.json b/cedar-integration-tests/corpus_tests/d07c1baa0ff4d7bf182af9d758aff489eb53b342.json
index 22c3c08f1..73641d996 100644
--- a/cedar-integration-tests/corpus_tests/d07c1baa0ff4d7bf182af9d758aff489eb53b342.json
+++ b/cedar-integration-tests/corpus_tests/d07c1baa0ff4d7bf182af9d758aff489eb53b342.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "rbjjjijjjjjgjj::a::\"\\0\"",
-      "action": "rbjjjijjjjjgjj::Action::\"action\"",
-      "resource": "rbjjjijjjjjgjj::a::\"\\0\"",
+      "principal": {
+        "type": "rbjjjijjjjjgjj::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "rbjjjijjjjjgjj::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "rbjjjijjjjjgjj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "rbjjjijjjjjgjj::a::\"\\0\"",
-      "action": "rbjjjijjjjjgjj::Action::\"action\"",
-      "resource": "rbjjjijjjjjgjj::a::\"\\0\"",
+      "principal": {
+        "type": "rbjjjijjjjjgjj::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "rbjjjijjjjjgjj::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "rbjjjijjjjjgjj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "rbjjjijjjjjgjj::a::\"\\0\"",
-      "action": "rbjjjijjjjjgjj::Action::\"action\"",
-      "resource": "rbjjjijjjjjgjj::a::\"\\0\"",
+      "principal": {
+        "type": "rbjjjijjjjjgjj::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "rbjjjijjjjjgjj::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "rbjjjijjjjjgjj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "rbjjjijjjjjgjj::a::\"\\0\"",
-      "action": "rbjjjijjjjjgjj::Action::\"action\"",
-      "resource": "rbjjjijjjjjgjj::a::\"\\0\"",
+      "principal": {
+        "type": "rbjjjijjjjjgjj::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "rbjjjijjjjjgjj::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "rbjjjijjjjjgjj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "rbjjjijjjjjgjj::a::\"\\0\"",
-      "action": "rbjjjijjjjjgjj::Action::\"action\"",
-      "resource": "rbjjjijjjjjgjj::a::\"\\0\"",
+      "principal": {
+        "type": "rbjjjijjjjjgjj::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "rbjjjijjjjjgjj::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "rbjjjijjjjjgjj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "rbjjjijjjjjgjj::a::\"\\0\"",
-      "action": "rbjjjijjjjjgjj::Action::\"action\"",
-      "resource": "rbjjjijjjjjgjj::a::\"\\0\"",
+      "principal": {
+        "type": "rbjjjijjjjjgjj::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "rbjjjijjjjjgjj::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "rbjjjijjjjjgjj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "rbjjjijjjjjgjj::a::\"\\0\"",
-      "action": "rbjjjijjjjjgjj::Action::\"action\"",
-      "resource": "rbjjjijjjjjgjj::a::\"\\0\"",
+      "principal": {
+        "type": "rbjjjijjjjjgjj::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "rbjjjijjjjjgjj::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "rbjjjijjjjjgjj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "rbjjjijjjjjgjj::a::\"\\0\"",
-      "action": "rbjjjijjjjjgjj::Action::\"action\"",
-      "resource": "rbjjjijjjjjgjj::a::\"\\0\"",
+      "principal": {
+        "type": "rbjjjijjjjjgjj::a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "rbjjjijjjjjgjj::a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "rbjjjijjjjjgjj::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d09c3c69af274d51d9b2e1b8cca81aa059307a68.json b/cedar-integration-tests/corpus_tests/d09c3c69af274d51d9b2e1b8cca81aa059307a68.json
index 1023fc691..106f736b1 100644
--- a/cedar-integration-tests/corpus_tests/d09c3c69af274d51d9b2e1b8cca81aa059307a68.json
+++ b/cedar-integration-tests/corpus_tests/d09c3c69af274d51d9b2e1b8cca81aa059307a68.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"8\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "8"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -84,9 +147,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d12354a9098237c973efdf51fabca99ad508435a.json b/cedar-integration-tests/corpus_tests/d12354a9098237c973efdf51fabca99ad508435a.json
index 139db7c7f..de1c4df6f 100644
--- a/cedar-integration-tests/corpus_tests/d12354a9098237c973efdf51fabca99ad508435a.json
+++ b/cedar-integration-tests/corpus_tests/d12354a9098237c973efdf51fabca99ad508435a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d14a34ca93f49c044fe6bd267eb6e42e56704ade.json b/cedar-integration-tests/corpus_tests/d14a34ca93f49c044fe6bd267eb6e42e56704ade.json
index 18df0d73d..fff994e7d 100644
--- a/cedar-integration-tests/corpus_tests/d14a34ca93f49c044fe6bd267eb6e42e56704ade.json
+++ b/cedar-integration-tests/corpus_tests/d14a34ca93f49c044fe6bd267eb6e42e56704ade.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"%\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "%"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d175868edf86eb28e5cd6b133b0b4f093d8f24d9.json b/cedar-integration-tests/corpus_tests/d175868edf86eb28e5cd6b133b0b4f093d8f24d9.json
index 24489a0a4..a308eb1ec 100644
--- a/cedar-integration-tests/corpus_tests/d175868edf86eb28e5cd6b133b0b4f093d8f24d9.json
+++ b/cedar-integration-tests/corpus_tests/d175868edf86eb28e5cd6b133b0b4f093d8f24d9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0#\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000#\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d1832cc54d36e8a945ff67e28ed9aecce85c38bf.json b/cedar-integration-tests/corpus_tests/d1832cc54d36e8a945ff67e28ed9aecce85c38bf.json
index ed76cb0ce..3fb80a1bf 100644
--- a/cedar-integration-tests/corpus_tests/d1832cc54d36e8a945ff67e28ed9aecce85c38bf.json
+++ b/cedar-integration-tests/corpus_tests/d1832cc54d36e8a945ff67e28ed9aecce85c38bf.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d1aa4eb8fa4700e7a7a3070a9e457845783747e7.json b/cedar-integration-tests/corpus_tests/d1aa4eb8fa4700e7a7a3070a9e457845783747e7.json
index 06978b3b0..bb2a7da25 100644
--- a/cedar-integration-tests/corpus_tests/d1aa4eb8fa4700e7a7a3070a9e457845783747e7.json
+++ b/cedar-integration-tests/corpus_tests/d1aa4eb8fa4700e7a7a3070a9e457845783747e7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Hyyyy26666::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "k66666666::\"\"",
+      "principal": {
+        "type": "Hyyyy26666",
+        "id": ""
+      },
+      "resource": {
+        "type": "k66666666",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Hyyyy26666::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "k66666666::\"\"",
+      "principal": {
+        "type": "Hyyyy26666",
+        "id": ""
+      },
+      "resource": {
+        "type": "k66666666",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Hyyyy26666::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "k66666666::\"\"",
+      "principal": {
+        "type": "Hyyyy26666",
+        "id": ""
+      },
+      "resource": {
+        "type": "k66666666",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Hyyyy26666::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "k66666666::\"\"",
+      "principal": {
+        "type": "Hyyyy26666",
+        "id": ""
+      },
+      "resource": {
+        "type": "k66666666",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Hyyyy26666::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "k66666666::\"\"",
+      "principal": {
+        "type": "Hyyyy26666",
+        "id": ""
+      },
+      "resource": {
+        "type": "k66666666",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Hyyyy26666::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "k66666666::\"\"",
+      "principal": {
+        "type": "Hyyyy26666",
+        "id": ""
+      },
+      "resource": {
+        "type": "k66666666",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Hyyyy26666::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "k66666666::\"\"",
+      "principal": {
+        "type": "Hyyyy26666",
+        "id": ""
+      },
+      "resource": {
+        "type": "k66666666",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Hyyyy26666::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "k66666666::\"\"",
+      "principal": {
+        "type": "Hyyyy26666",
+        "id": ""
+      },
+      "resource": {
+        "type": "k66666666",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d1ab2b8b520d689f91156782544ce685a8131254.json b/cedar-integration-tests/corpus_tests/d1ab2b8b520d689f91156782544ce685a8131254.json
index dbe3921bb..2685e7377 100644
--- a/cedar-integration-tests/corpus_tests/d1ab2b8b520d689f91156782544ce685a8131254.json
+++ b/cedar-integration-tests/corpus_tests/d1ab2b8b520d689f91156782544ce685a8131254.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C22amklq": false,
         "vrpYaglel": false
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C22amklq": false,
         "vrpYaglel": false
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C22amklq": false,
         "vrpYaglel": false
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C22amklq": false,
         "vrpYaglel": false
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C22amklq": false,
         "vrpYaglel": false
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C22amklq": false,
         "vrpYaglel": false
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C22amklq": false,
         "vrpYaglel": false
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C22amklq": false,
         "vrpYaglel": false
diff --git a/cedar-integration-tests/corpus_tests/d1c32f30179c22ca32ee6b9a78b6467c4609e103.json b/cedar-integration-tests/corpus_tests/d1c32f30179c22ca32ee6b9a78b6467c4609e103.json
index 604686d58..8561e99d9 100644
--- a/cedar-integration-tests/corpus_tests/d1c32f30179c22ca32ee6b9a78b6467c4609e103.json
+++ b/cedar-integration-tests/corpus_tests/d1c32f30179c22ca32ee6b9a78b6467c4609e103.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"/t:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"/t:\"",
+      "principal": {
+        "type": "a",
+        "id": "/t:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/t:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"/t:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"/t:\"",
+      "principal": {
+        "type": "a",
+        "id": "/t:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/t:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"/t:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"/t:\"",
+      "principal": {
+        "type": "a",
+        "id": "/t:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/t:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"/t:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"/t:\"",
+      "principal": {
+        "type": "a",
+        "id": "/t:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/t:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"/t:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"/t:\"",
+      "principal": {
+        "type": "a",
+        "id": "/t:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/t:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"/t:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"/t:\"",
+      "principal": {
+        "type": "a",
+        "id": "/t:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "/t:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d213fa7ac5bebd6af38878484430f71fca86286a.json b/cedar-integration-tests/corpus_tests/d213fa7ac5bebd6af38878484430f71fca86286a.json
index e5a26b938..e3c954fc9 100644
--- a/cedar-integration-tests/corpus_tests/d213fa7ac5bebd6af38878484430f71fca86286a.json
+++ b/cedar-integration-tests/corpus_tests/d213fa7ac5bebd6af38878484430f71fca86286a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "C22::a::\"a\"",
-      "action": "C22::Action::\"action\"",
-      "resource": "C22::a::\"a\"",
+      "principal": {
+        "type": "C22::a",
+        "id": "a"
+      },
+      "resource": {
+        "type": "C22::a",
+        "id": "a"
+      },
+      "action": {
+        "type": "C22::Action",
+        "id": "action"
+      },
       "context": {
         "A00Y21RRRRRRS2": false
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "C22::a::\"a\"",
-      "action": "C22::Action::\"action\"",
-      "resource": "C22::a::\"a\"",
+      "principal": {
+        "type": "C22::a",
+        "id": "a"
+      },
+      "resource": {
+        "type": "C22::a",
+        "id": "a"
+      },
+      "action": {
+        "type": "C22::Action",
+        "id": "action"
+      },
       "context": {
         "A00Y21RRRRRRS2": false
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "C22::a::\"a\"",
-      "action": "C22::Action::\"action\"",
-      "resource": "C22::a::\"a\"",
+      "principal": {
+        "type": "C22::a",
+        "id": "a"
+      },
+      "resource": {
+        "type": "C22::a",
+        "id": "a"
+      },
+      "action": {
+        "type": "C22::Action",
+        "id": "action"
+      },
       "context": {
         "A00Y21RRRRRRS2": false
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "C22::a::\"a\"",
-      "action": "C22::Action::\"action\"",
-      "resource": "C22::a::\"a\"",
+      "principal": {
+        "type": "C22::a",
+        "id": "a"
+      },
+      "resource": {
+        "type": "C22::a",
+        "id": "a"
+      },
+      "action": {
+        "type": "C22::Action",
+        "id": "action"
+      },
       "context": {
         "A00Y21RRRRRRS2": false
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "C22::a::\"a\"",
-      "action": "C22::Action::\"action\"",
-      "resource": "C22::a::\"a\"",
+      "principal": {
+        "type": "C22::a",
+        "id": "a"
+      },
+      "resource": {
+        "type": "C22::a",
+        "id": "a"
+      },
+      "action": {
+        "type": "C22::Action",
+        "id": "action"
+      },
       "context": {
         "A00Y21RRRRRRS2": false
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "C22::a::\"a\"",
-      "action": "C22::Action::\"action\"",
-      "resource": "C22::a::\"a\"",
+      "principal": {
+        "type": "C22::a",
+        "id": "a"
+      },
+      "resource": {
+        "type": "C22::a",
+        "id": "a"
+      },
+      "action": {
+        "type": "C22::Action",
+        "id": "action"
+      },
       "context": {
         "A00Y21RRRRRRS2": false
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "C22::a::\"a\"",
-      "action": "C22::Action::\"action\"",
-      "resource": "C22::a::\"a\"",
+      "principal": {
+        "type": "C22::a",
+        "id": "a"
+      },
+      "resource": {
+        "type": "C22::a",
+        "id": "a"
+      },
+      "action": {
+        "type": "C22::Action",
+        "id": "action"
+      },
       "context": {
         "A00Y21RRRRRRS2": false
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "C22::a::\"a\"",
-      "action": "C22::Action::\"action\"",
-      "resource": "C22::a::\"a\"",
+      "principal": {
+        "type": "C22::a",
+        "id": "a"
+      },
+      "resource": {
+        "type": "C22::a",
+        "id": "a"
+      },
+      "action": {
+        "type": "C22::Action",
+        "id": "action"
+      },
       "context": {
         "A00Y21RRRRRRS2": false
       },
diff --git a/cedar-integration-tests/corpus_tests/d248c3b001402a861d5b7fa618d637b132abe8c3.json b/cedar-integration-tests/corpus_tests/d248c3b001402a861d5b7fa618d637b132abe8c3.json
index 33cd06f86..e62d5cf9a 100644
--- a/cedar-integration-tests/corpus_tests/d248c3b001402a861d5b7fa618d637b132abe8c3.json
+++ b/cedar-integration-tests/corpus_tests/d248c3b001402a861d5b7fa618d637b132abe8c3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0a\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0a\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000a"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000a"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0a\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0a\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000a"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000a"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"zza\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zza\"",
+      "principal": {
+        "type": "a",
+        "id": "zza"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zza"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"zza\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zza\"",
+      "principal": {
+        "type": "a",
+        "id": "zza"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zza"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"zza\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zza\"",
+      "principal": {
+        "type": "a",
+        "id": "zza"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zza"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"zza\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zza\"",
+      "principal": {
+        "type": "a",
+        "id": "zza"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zza"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"zza\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zza\"",
+      "principal": {
+        "type": "a",
+        "id": "zza"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zza"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"zza\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zza\"",
+      "principal": {
+        "type": "a",
+        "id": "zza"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zza"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d28c88c97d3574fd3d9db3eb23d531316717d49b.json b/cedar-integration-tests/corpus_tests/d28c88c97d3574fd3d9db3eb23d531316717d49b.json
index 28eb90b4f..cab86d7e6 100644
--- a/cedar-integration-tests/corpus_tests/d28c88c97d3574fd3d9db3eb23d531316717d49b.json
+++ b/cedar-integration-tests/corpus_tests/d28c88c97d3574fd3d9db3eb23d531316717d49b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d299f39a7eb5e9da51373ff547790271ab553d63.json b/cedar-integration-tests/corpus_tests/d299f39a7eb5e9da51373ff547790271ab553d63.json
index 9106ec10f..fdd44d8ae 100644
--- a/cedar-integration-tests/corpus_tests/d299f39a7eb5e9da51373ff547790271ab553d63.json
+++ b/cedar-integration-tests/corpus_tests/d299f39a7eb5e9da51373ff547790271ab553d63.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"FF\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "FF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"FF\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "FF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"FF\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "FF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"FF\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "FF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"FF\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "FF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"FF\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "FF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"FF\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "FF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"FF\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "FF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d2cfd1c0506202b975092074ed485a6c72de7c35.json b/cedar-integration-tests/corpus_tests/d2cfd1c0506202b975092074ed485a6c72de7c35.json
index 06bc66b10..1a61550bc 100644
--- a/cedar-integration-tests/corpus_tests/d2cfd1c0506202b975092074ed485a6c72de7c35.json
+++ b/cedar-integration-tests/corpus_tests/d2cfd1c0506202b975092074ed485a6c72de7c35.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F55555ww": 0
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F55555ww": 0
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F55555ww": 0
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F55555ww": 0
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F55555ww": 0
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F55555ww": 0
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F55555ww": 0
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "F55555ww": 0
       },
diff --git a/cedar-integration-tests/corpus_tests/d2d070eea367ec82a3ccfbba21a7585c51cb63a3.json b/cedar-integration-tests/corpus_tests/d2d070eea367ec82a3ccfbba21a7585c51cb63a3.json
index 8dd0f8537..caf4962da 100644
--- a/cedar-integration-tests/corpus_tests/d2d070eea367ec82a3ccfbba21a7585c51cb63a3.json
+++ b/cedar-integration-tests/corpus_tests/d2d070eea367ec82a3ccfbba21a7585c51cb63a3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d2fa250e2aba06b4c57ebe4937327d3ef25aa6be.json b/cedar-integration-tests/corpus_tests/d2fa250e2aba06b4c57ebe4937327d3ef25aa6be.json
index fb3b0ffa4..5bfa31317 100644
--- a/cedar-integration-tests/corpus_tests/d2fa250e2aba06b4c57ebe4937327d3ef25aa6be.json
+++ b/cedar-integration-tests/corpus_tests/d2fa250e2aba06b4c57ebe4937327d3ef25aa6be.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d360682a39bf8b9563147f3e620f51b03a765bd6.json b/cedar-integration-tests/corpus_tests/d360682a39bf8b9563147f3e620f51b03a765bd6.json
index 7369fae78..4dbaf8bab 100644
--- a/cedar-integration-tests/corpus_tests/d360682a39bf8b9563147f3e620f51b03a765bd6.json
+++ b/cedar-integration-tests/corpus_tests/d360682a39bf8b9563147f3e620f51b03a765bd6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "wttt::RLjj0::\"\"",
-      "action": "wttt::Action::\"action\"",
-      "resource": "wttt::Bmii5h::\"\\0\"",
+      "principal": {
+        "type": "wttt::RLjj0",
+        "id": ""
+      },
+      "resource": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "wttt::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "wttt::RLjj0::\"\"",
-      "action": "wttt::Action::\"action\"",
-      "resource": "wttt::Bmii5h::\"\\0\"",
+      "principal": {
+        "type": "wttt::RLjj0",
+        "id": ""
+      },
+      "resource": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "wttt::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "wttt::RLjj0::\"\"",
-      "action": "wttt::Action::\"action\"",
-      "resource": "wttt::Bmii5h::\"\\0\"",
+      "principal": {
+        "type": "wttt::RLjj0",
+        "id": ""
+      },
+      "resource": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "wttt::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "wttt::RLjj0::\"\"",
-      "action": "wttt::Action::\"action\"",
-      "resource": "wttt::Bmii5h::\"\\0\"",
+      "principal": {
+        "type": "wttt::RLjj0",
+        "id": ""
+      },
+      "resource": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "wttt::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "wttt::RLjj0::\"\"",
-      "action": "wttt::Action::\"action\"",
-      "resource": "wttt::Bmii5h::\"\\0\"",
+      "principal": {
+        "type": "wttt::RLjj0",
+        "id": ""
+      },
+      "resource": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "wttt::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "wttt::RLjj0::\"\"",
-      "action": "wttt::Action::\"action\"",
-      "resource": "wttt::Bmii5h::\"\\0\"",
+      "principal": {
+        "type": "wttt::RLjj0",
+        "id": ""
+      },
+      "resource": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "wttt::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "wttt::RLjj0::\"\"",
-      "action": "wttt::Action::\"action\"",
-      "resource": "wttt::Bmii5h::\"\\0\"",
+      "principal": {
+        "type": "wttt::RLjj0",
+        "id": ""
+      },
+      "resource": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "wttt::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "wttt::RLjj0::\"\"",
-      "action": "wttt::Action::\"action\"",
-      "resource": "wttt::Bmii5h::\"\\0\"",
+      "principal": {
+        "type": "wttt::RLjj0",
+        "id": ""
+      },
+      "resource": {
+        "type": "wttt::Bmii5h",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "wttt::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d377fedb7fc99865c1e8c13c2fdd812fa041f905.json b/cedar-integration-tests/corpus_tests/d377fedb7fc99865c1e8c13c2fdd812fa041f905.json
index dd7ca01e1..89fb9c151 100644
--- a/cedar-integration-tests/corpus_tests/d377fedb7fc99865c1e8c13c2fdd812fa041f905.json
+++ b/cedar-integration-tests/corpus_tests/d377fedb7fc99865c1e8c13c2fdd812fa041f905.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"@\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "@"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d37938f9d55ff46236ddb3f7481644229ea84619.json b/cedar-integration-tests/corpus_tests/d37938f9d55ff46236ddb3f7481644229ea84619.json
index f12d5d4a4..37162f27e 100644
--- a/cedar-integration-tests/corpus_tests/d37938f9d55ff46236ddb3f7481644229ea84619.json
+++ b/cedar-integration-tests/corpus_tests/d37938f9d55ff46236ddb3f7481644229ea84619.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000n"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0n\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000n"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d382a671c24db31d5920a4219abaebd38738820f.json b/cedar-integration-tests/corpus_tests/d382a671c24db31d5920a4219abaebd38738820f.json
index d726cb269..2ae4948ba 100644
--- a/cedar-integration-tests/corpus_tests/d382a671c24db31d5920a4219abaebd38738820f.json
+++ b/cedar-integration-tests/corpus_tests/d382a671c24db31d5920a4219abaebd38738820f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "zppWEj::AZ330::Hqj::r::\"\"",
-      "action": "zppWEj::AZ330::Hqj::Action::\"action\"",
-      "resource": "zppWEj::AZ330::Hqj::r::\"\"",
+      "principal": {
+        "type": "zppWEj::AZ330::Hqj::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "zppWEj::AZ330::Hqj::r",
+        "id": ""
+      },
+      "action": {
+        "type": "zppWEj::AZ330::Hqj::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "zppWEj::AZ330::Hqj::r::\"\"",
-      "action": "zppWEj::AZ330::Hqj::Action::\"action\"",
-      "resource": "zppWEj::AZ330::Hqj::r::\"\"",
+      "principal": {
+        "type": "zppWEj::AZ330::Hqj::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "zppWEj::AZ330::Hqj::r",
+        "id": ""
+      },
+      "action": {
+        "type": "zppWEj::AZ330::Hqj::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "zppWEj::AZ330::Hqj::r::\"\"",
-      "action": "zppWEj::AZ330::Hqj::Action::\"action\"",
-      "resource": "zppWEj::AZ330::Hqj::r::\"\"",
+      "principal": {
+        "type": "zppWEj::AZ330::Hqj::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "zppWEj::AZ330::Hqj::r",
+        "id": ""
+      },
+      "action": {
+        "type": "zppWEj::AZ330::Hqj::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "zppWEj::AZ330::Hqj::r::\"\"",
-      "action": "zppWEj::AZ330::Hqj::Action::\"action\"",
-      "resource": "zppWEj::AZ330::Hqj::r::\"\"",
+      "principal": {
+        "type": "zppWEj::AZ330::Hqj::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "zppWEj::AZ330::Hqj::r",
+        "id": ""
+      },
+      "action": {
+        "type": "zppWEj::AZ330::Hqj::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "zppWEj::AZ330::Hqj::r::\"\"",
-      "action": "zppWEj::AZ330::Hqj::Action::\"action\"",
-      "resource": "zppWEj::AZ330::Hqj::r::\"\"",
+      "principal": {
+        "type": "zppWEj::AZ330::Hqj::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "zppWEj::AZ330::Hqj::r",
+        "id": ""
+      },
+      "action": {
+        "type": "zppWEj::AZ330::Hqj::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "zppWEj::AZ330::Hqj::r::\"\"",
-      "action": "zppWEj::AZ330::Hqj::Action::\"action\"",
-      "resource": "zppWEj::AZ330::Hqj::r::\"\"",
+      "principal": {
+        "type": "zppWEj::AZ330::Hqj::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "zppWEj::AZ330::Hqj::r",
+        "id": ""
+      },
+      "action": {
+        "type": "zppWEj::AZ330::Hqj::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "zppWEj::AZ330::Hqj::r::\"\"",
-      "action": "zppWEj::AZ330::Hqj::Action::\"action\"",
-      "resource": "zppWEj::AZ330::Hqj::r::\"\"",
+      "principal": {
+        "type": "zppWEj::AZ330::Hqj::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "zppWEj::AZ330::Hqj::r",
+        "id": ""
+      },
+      "action": {
+        "type": "zppWEj::AZ330::Hqj::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "zppWEj::AZ330::Hqj::r::\"\"",
-      "action": "zppWEj::AZ330::Hqj::Action::\"action\"",
-      "resource": "zppWEj::AZ330::Hqj::r::\"\"",
+      "principal": {
+        "type": "zppWEj::AZ330::Hqj::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "zppWEj::AZ330::Hqj::r",
+        "id": ""
+      },
+      "action": {
+        "type": "zppWEj::AZ330::Hqj::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/d3d751f8974775fad771c94efabf90348ff5c0c8.json b/cedar-integration-tests/corpus_tests/d3d751f8974775fad771c94efabf90348ff5c0c8.json
index 6d2a57204..96426436c 100644
--- a/cedar-integration-tests/corpus_tests/d3d751f8974775fad771c94efabf90348ff5c0c8.json
+++ b/cedar-integration-tests/corpus_tests/d3d751f8974775fad771c94efabf90348ff5c0c8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"RR\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RR\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "RR\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RR\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"RR\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RR\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "RR\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RR\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"RR\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RR\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "RR\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RR\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"RR\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RR\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "RR\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RR\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"RR\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RR\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "RR\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RR\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"RR\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RR\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "RR\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RR\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"RR\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RR\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "RR\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RR\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"RR\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RR\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "RR\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RR\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d3da33d57bbf524986b5ad8e9c77e862b1c60394.json b/cedar-integration-tests/corpus_tests/d3da33d57bbf524986b5ad8e9c77e862b1c60394.json
index 638bb36a4..0f4577e37 100644
--- a/cedar-integration-tests/corpus_tests/d3da33d57bbf524986b5ad8e9c77e862b1c60394.json
+++ b/cedar-integration-tests/corpus_tests/d3da33d57bbf524986b5ad8e9c77e862b1c60394.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d3df52fde414d6b60cc8266d7cd0f8a85523d43d.json b/cedar-integration-tests/corpus_tests/d3df52fde414d6b60cc8266d7cd0f8a85523d43d.json
index fed550f10..7c80f2460 100644
--- a/cedar-integration-tests/corpus_tests/d3df52fde414d6b60cc8266d7cd0f8a85523d43d.json
+++ b/cedar-integration-tests/corpus_tests/d3df52fde414d6b60cc8266d7cd0f8a85523d43d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0jdk/\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0jdk/\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000jdk/\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000jdk/\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0jdk/\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0jdk/\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000jdk/\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000jdk/\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0jdk/\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0jdk/\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000jdk/\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000jdk/\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0jdk/\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0jdk/\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000jdk/\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000jdk/\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0jdk/\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0jdk/\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000jdk/\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000jdk/\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0jdk/\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0jdk/\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000jdk/\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000jdk/\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d446451b547ec42b894a88ac8049782ed9c8fcde.json b/cedar-integration-tests/corpus_tests/d446451b547ec42b894a88ac8049782ed9c8fcde.json
index f41f7cc9e..d6944d03f 100644
--- a/cedar-integration-tests/corpus_tests/d446451b547ec42b894a88ac8049782ed9c8fcde.json
+++ b/cedar-integration-tests/corpus_tests/d446451b547ec42b894a88ac8049782ed9c8fcde.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d472d084ca3788830980ecb74e2c12afa681a1d5.json b/cedar-integration-tests/corpus_tests/d472d084ca3788830980ecb74e2c12afa681a1d5.json
index 0b243bcb3..b9d2a7966 100644
--- a/cedar-integration-tests/corpus_tests/d472d084ca3788830980ecb74e2c12afa681a1d5.json
+++ b/cedar-integration-tests/corpus_tests/d472d084ca3788830980ecb74e2c12afa681a1d5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::q\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":::q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::q\"",
+      "principal": {
+        "type": "a",
+        "id": ":::q"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\":::q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::q\"",
+      "principal": {
+        "type": "a",
+        "id": ":::q"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\":::q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::q\"",
+      "principal": {
+        "type": "a",
+        "id": ":::q"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\":::q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::q\"",
+      "principal": {
+        "type": "a",
+        "id": ":::q"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\":::q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::q\"",
+      "principal": {
+        "type": "a",
+        "id": ":::q"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\":::q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::q\"",
+      "principal": {
+        "type": "a",
+        "id": ":::q"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\":::q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::q\"",
+      "principal": {
+        "type": "a",
+        "id": ":::q"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d49b906de5b1bb46479ccc6d660b3a56205d46e2.json b/cedar-integration-tests/corpus_tests/d49b906de5b1bb46479ccc6d660b3a56205d46e2.json
index 863bccd5f..1e28168b8 100644
--- a/cedar-integration-tests/corpus_tests/d49b906de5b1bb46479ccc6d660b3a56205d46e2.json
+++ b/cedar-integration-tests/corpus_tests/d49b906de5b1bb46479ccc6d660b3a56205d46e2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "R::B::AJ1f::a::\"f\"",
-      "action": "R::B::AJ1f::Action::\"action\"",
-      "resource": "R::B::AJ1f::a::\"f\"",
+      "principal": {
+        "type": "R::B::AJ1f::a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "R::B::AJ1f::a",
+        "id": "f"
+      },
+      "action": {
+        "type": "R::B::AJ1f::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "R::B::AJ1f::a::\"f\"",
-      "action": "R::B::AJ1f::Action::\"action\"",
-      "resource": "R::B::AJ1f::a::\"f\"",
+      "principal": {
+        "type": "R::B::AJ1f::a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "R::B::AJ1f::a",
+        "id": "f"
+      },
+      "action": {
+        "type": "R::B::AJ1f::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "R::B::AJ1f::a::\"f\"",
-      "action": "R::B::AJ1f::Action::\"action\"",
-      "resource": "R::B::AJ1f::a::\"f\"",
+      "principal": {
+        "type": "R::B::AJ1f::a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "R::B::AJ1f::a",
+        "id": "f"
+      },
+      "action": {
+        "type": "R::B::AJ1f::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "R::B::AJ1f::a::\"f\"",
-      "action": "R::B::AJ1f::Action::\"action\"",
-      "resource": "R::B::AJ1f::a::\"f\"",
+      "principal": {
+        "type": "R::B::AJ1f::a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "R::B::AJ1f::a",
+        "id": "f"
+      },
+      "action": {
+        "type": "R::B::AJ1f::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "R::B::AJ1f::a::\"f\"",
-      "action": "R::B::AJ1f::Action::\"action\"",
-      "resource": "R::B::AJ1f::a::\"f\"",
+      "principal": {
+        "type": "R::B::AJ1f::a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "R::B::AJ1f::a",
+        "id": "f"
+      },
+      "action": {
+        "type": "R::B::AJ1f::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "R::B::AJ1f::a::\"f\"",
-      "action": "R::B::AJ1f::Action::\"action\"",
-      "resource": "R::B::AJ1f::a::\"f\"",
+      "principal": {
+        "type": "R::B::AJ1f::a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "R::B::AJ1f::a",
+        "id": "f"
+      },
+      "action": {
+        "type": "R::B::AJ1f::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "R::B::AJ1f::a::\"f\"",
-      "action": "R::B::AJ1f::Action::\"action\"",
-      "resource": "R::B::AJ1f::a::\"f\"",
+      "principal": {
+        "type": "R::B::AJ1f::a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "R::B::AJ1f::a",
+        "id": "f"
+      },
+      "action": {
+        "type": "R::B::AJ1f::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "R::B::AJ1f::a::\"f\"",
-      "action": "R::B::AJ1f::Action::\"action\"",
-      "resource": "R::B::AJ1f::a::\"f\"",
+      "principal": {
+        "type": "R::B::AJ1f::a",
+        "id": "f"
+      },
+      "resource": {
+        "type": "R::B::AJ1f::a",
+        "id": "f"
+      },
+      "action": {
+        "type": "R::B::AJ1f::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d4d0e75ce2a11931b27717f0628d176ba24ccb4f.json b/cedar-integration-tests/corpus_tests/d4d0e75ce2a11931b27717f0628d176ba24ccb4f.json
index db228082f..2825dfd49 100644
--- a/cedar-integration-tests/corpus_tests/d4d0e75ce2a11931b27717f0628d176ba24ccb4f.json
+++ b/cedar-integration-tests/corpus_tests/d4d0e75ce2a11931b27717f0628d176ba24ccb4f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d4d27c36fd7c9c018ad27a106fa99044a7cc1c69.json b/cedar-integration-tests/corpus_tests/d4d27c36fd7c9c018ad27a106fa99044a7cc1c69.json
index faa4c974a..539159e5e 100644
--- a/cedar-integration-tests/corpus_tests/d4d27c36fd7c9c018ad27a106fa99044a7cc1c69.json
+++ b/cedar-integration-tests/corpus_tests/d4d27c36fd7c9c018ad27a106fa99044a7cc1c69.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"(0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": "(0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"(0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": "(0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"(0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": "(0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"(0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": "(0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"(0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": "(0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"(0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(0\"",
+      "principal": {
+        "type": "a",
+        "id": "(0"
+      },
+      "resource": {
+        "type": "a",
+        "id": "(0"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d534f64a39365338a80032452226d39343fb93c3.json b/cedar-integration-tests/corpus_tests/d534f64a39365338a80032452226d39343fb93c3.json
index 8343012f2..36f25dabf 100644
--- a/cedar-integration-tests/corpus_tests/d534f64a39365338a80032452226d39343fb93c3.json
+++ b/cedar-integration-tests/corpus_tests/d534f64a39365338a80032452226d39343fb93c3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "`"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "`"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d5dccca1808c2ca94e0a53914637692a5f70c677.json b/cedar-integration-tests/corpus_tests/d5dccca1808c2ca94e0a53914637692a5f70c677.json
index d4bbb2272..197bc897e 100644
--- a/cedar-integration-tests/corpus_tests/d5dccca1808c2ca94e0a53914637692a5f70c677.json
+++ b/cedar-integration-tests/corpus_tests/d5dccca1808c2ca94e0a53914637692a5f70c677.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d5eea9e4cbdd9d1bb0d1a310ea9722fa8aef6438.json b/cedar-integration-tests/corpus_tests/d5eea9e4cbdd9d1bb0d1a310ea9722fa8aef6438.json
index ffa422c08..7ecb6e89b 100644
--- a/cedar-integration-tests/corpus_tests/d5eea9e4cbdd9d1bb0d1a310ea9722fa8aef6438.json
+++ b/cedar-integration-tests/corpus_tests/d5eea9e4cbdd9d1bb0d1a310ea9722fa8aef6438.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": {
           "": "",
@@ -26,9 +35,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": {
           "": "",
@@ -46,9 +64,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": {
           "": "",
@@ -66,9 +93,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": {
           "": "",
@@ -86,9 +122,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": {
           "": "",
@@ -106,9 +151,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": {
           "": "",
@@ -126,9 +180,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": {
           "": "",
@@ -146,9 +209,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "r": {
           "": "",
diff --git a/cedar-integration-tests/corpus_tests/d640758bb47cfede252c0aff279ca8f395b51ac2.json b/cedar-integration-tests/corpus_tests/d640758bb47cfede252c0aff279ca8f395b51ac2.json
index 940451984..ba99a4160 100644
--- a/cedar-integration-tests/corpus_tests/d640758bb47cfede252c0aff279ca8f395b51ac2.json
+++ b/cedar-integration-tests/corpus_tests/d640758bb47cfede252c0aff279ca8f395b51ac2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"26+4\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "26+4"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d6585fb7a37ed5d97beee8eef1c78c8d584bfd23.json b/cedar-integration-tests/corpus_tests/d6585fb7a37ed5d97beee8eef1c78c8d584bfd23.json
index 262e29bac..0273c8709 100644
--- a/cedar-integration-tests/corpus_tests/d6585fb7a37ed5d97beee8eef1c78c8d584bfd23.json
+++ b/cedar-integration-tests/corpus_tests/d6585fb7a37ed5d97beee8eef1c78c8d584bfd23.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A000::p::a::\"\"",
-      "action": "A000::p::Action::\"action\"",
-      "resource": "A000::p::a::\"\"",
+      "principal": {
+        "type": "A000::p::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::p::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::p::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A000::p::a::\"\"",
-      "action": "A000::p::Action::\"action\"",
-      "resource": "A000::p::a::\"\"",
+      "principal": {
+        "type": "A000::p::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::p::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::p::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A000::p::a::\"\"",
-      "action": "A000::p::Action::\"action\"",
-      "resource": "A000::p::a::\"\"",
+      "principal": {
+        "type": "A000::p::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::p::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::p::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A000::p::a::\"\"",
-      "action": "A000::p::Action::\"action\"",
-      "resource": "A000::p::a::\"\"",
+      "principal": {
+        "type": "A000::p::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::p::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::p::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A000::p::a::\"\"",
-      "action": "A000::p::Action::\"action\"",
-      "resource": "A000::p::a::\"\"",
+      "principal": {
+        "type": "A000::p::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::p::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::p::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A000::p::a::\"\"",
-      "action": "A000::p::Action::\"action\"",
-      "resource": "A000::p::a::\"\"",
+      "principal": {
+        "type": "A000::p::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::p::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::p::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A000::p::a::\"\"",
-      "action": "A000::p::Action::\"action\"",
-      "resource": "A000::p::a::\"\"",
+      "principal": {
+        "type": "A000::p::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::p::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::p::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A000::p::a::\"\"",
-      "action": "A000::p::Action::\"action\"",
-      "resource": "A000::p::a::\"\"",
+      "principal": {
+        "type": "A000::p::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::p::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::p::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d66406ba3a77c11c5dd3fe24989da26551820f92.json b/cedar-integration-tests/corpus_tests/d66406ba3a77c11c5dd3fe24989da26551820f92.json
index b84535f1e..709c5ef6e 100644
--- a/cedar-integration-tests/corpus_tests/d66406ba3a77c11c5dd3fe24989da26551820f92.json
+++ b/cedar-integration-tests/corpus_tests/d66406ba3a77c11c5dd3fe24989da26551820f92.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d668bea882eaa5293763b6a7135c271ea4155505.json b/cedar-integration-tests/corpus_tests/d668bea882eaa5293763b6a7135c271ea4155505.json
index e43ffd583..510a0c64c 100644
--- a/cedar-integration-tests/corpus_tests/d668bea882eaa5293763b6a7135c271ea4155505.json
+++ b/cedar-integration-tests/corpus_tests/d668bea882eaa5293763b6a7135c271ea4155505.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d67a2107b6ab6cce42b2160b170aef3b528cd4da.json b/cedar-integration-tests/corpus_tests/d67a2107b6ab6cce42b2160b170aef3b528cd4da.json
index c31aecc53..f426a8e00 100644
--- a/cedar-integration-tests/corpus_tests/d67a2107b6ab6cce42b2160b170aef3b528cd4da.json
+++ b/cedar-integration-tests/corpus_tests/d67a2107b6ab6cce42b2160b170aef3b528cd4da.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\t\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\t"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\t\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\t"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\t\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\t"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d69a5e50101bb3dad855bf18f8b67c157144eb41.json b/cedar-integration-tests/corpus_tests/d69a5e50101bb3dad855bf18f8b67c157144eb41.json
index 2743cf889..5feac3129 100644
--- a/cedar-integration-tests/corpus_tests/d69a5e50101bb3dad855bf18f8b67c157144eb41.json
+++ b/cedar-integration-tests/corpus_tests/d69a5e50101bb3dad855bf18f8b67c157144eb41.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\"",
+      "principal": {
+        "type": "a",
+        "id": "::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d6c65d3dfbb960c519f29e3906307d611ffaae15.json b/cedar-integration-tests/corpus_tests/d6c65d3dfbb960c519f29e3906307d611ffaae15.json
index 865924754..3fd420ebe 100644
--- a/cedar-integration-tests/corpus_tests/d6c65d3dfbb960c519f29e3906307d611ffaae15.json
+++ b/cedar-integration-tests/corpus_tests/d6c65d3dfbb960c519f29e3906307d611ffaae15.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\rRPR80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\rRPR80\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\rRPR80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\rRPR80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\rRPR80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\rRPR80"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\rRPR80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\rRPR80\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\rRPR80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\rRPR80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\rRPR80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\rRPR80\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\rRPR80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\rRPR80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\rRPR80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\rRPR80\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\rRPR80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\rRPR80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\rRPR80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\rRPR80\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\rRPR80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\rRPR80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\rRPR80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\rRPR80\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\rRPR80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\rRPR80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\rRPR80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\rRPR80\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\rRPR80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\rRPR80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d6ebe39a0e8ca56b7f860c24d898a862ce7b1641.json b/cedar-integration-tests/corpus_tests/d6ebe39a0e8ca56b7f860c24d898a862ce7b1641.json
index 0122d3a27..daea41381 100644
--- a/cedar-integration-tests/corpus_tests/d6ebe39a0e8ca56b7f860c24d898a862ce7b1641.json
+++ b/cedar-integration-tests/corpus_tests/d6ebe39a0e8ca56b7f860c24d898a862ce7b1641.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"is\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "is"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"is\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "is"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"is\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "is"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"is\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "is"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"is\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "is"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"is\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "is"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"is\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "is"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"is\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "is"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d709a674e6517e62909672096a240026f2c9b7da.json b/cedar-integration-tests/corpus_tests/d709a674e6517e62909672096a240026f2c9b7da.json
index 28d43ca9f..3ebbf245c 100644
--- a/cedar-integration-tests/corpus_tests/d709a674e6517e62909672096a240026f2c9b7da.json
+++ b/cedar-integration-tests/corpus_tests/d709a674e6517e62909672096a240026f2c9b7da.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d726a4220e6c8f359b14a71ad4dde4392685f4fe.json b/cedar-integration-tests/corpus_tests/d726a4220e6c8f359b14a71ad4dde4392685f4fe.json
index 21eac88ac..150f14047 100644
--- a/cedar-integration-tests/corpus_tests/d726a4220e6c8f359b14a71ad4dde4392685f4fe.json
+++ b/cedar-integration-tests/corpus_tests/d726a4220e6c8f359b14a71ad4dde4392685f4fe.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"z\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "z\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"z\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "z\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"z\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "z\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"z\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "z\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"z\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "z\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"z\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "z\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"z\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "z\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d74e197beb7238d43a1ad2a90dbd42c9d9cfc44f.json b/cedar-integration-tests/corpus_tests/d74e197beb7238d43a1ad2a90dbd42c9d9cfc44f.json
index a6aece7cc..9e116a07e 100644
--- a/cedar-integration-tests/corpus_tests/d74e197beb7238d43a1ad2a90dbd42c9d9cfc44f.json
+++ b/cedar-integration-tests/corpus_tests/d74e197beb7238d43a1ad2a90dbd42c9d9cfc44f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d778ca0053e915eb0aaf2034c5a18bcd8194605f.json b/cedar-integration-tests/corpus_tests/d778ca0053e915eb0aaf2034c5a18bcd8194605f.json
index ea8dd50da..13c0c3aea 100644
--- a/cedar-integration-tests/corpus_tests/d778ca0053e915eb0aaf2034c5a18bcd8194605f.json
+++ b/cedar-integration-tests/corpus_tests/d778ca0053e915eb0aaf2034c5a18bcd8194605f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d7f429d1a07862e1d1dbdcc9d67d7b1122bd7887.json b/cedar-integration-tests/corpus_tests/d7f429d1a07862e1d1dbdcc9d67d7b1122bd7887.json
index 75a39eb5a..945988e64 100644
--- a/cedar-integration-tests/corpus_tests/d7f429d1a07862e1d1dbdcc9d67d7b1122bd7887.json
+++ b/cedar-integration-tests/corpus_tests/d7f429d1a07862e1d1dbdcc9d67d7b1122bd7887.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0#\\u{8}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000#\b\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d7f8fbf3df419726990afb22a94eff94e1aad654.json b/cedar-integration-tests/corpus_tests/d7f8fbf3df419726990afb22a94eff94e1aad654.json
index b63686eec..afb8e6bfe 100644
--- a/cedar-integration-tests/corpus_tests/d7f8fbf3df419726990afb22a94eff94e1aad654.json
+++ b/cedar-integration-tests/corpus_tests/d7f8fbf3df419726990afb22a94eff94e1aad654.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d805f68cb4896eb79d0581c2d210692d1f2a3b2a.json b/cedar-integration-tests/corpus_tests/d805f68cb4896eb79d0581c2d210692d1f2a3b2a.json
index b8f6af516..fd0c3cc25 100644
--- a/cedar-integration-tests/corpus_tests/d805f68cb4896eb79d0581c2d210692d1f2a3b2a.json
+++ b/cedar-integration-tests/corpus_tests/d805f68cb4896eb79d0581c2d210692d1f2a3b2a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A3::a::\"\"",
-      "action": "A3::Action::\"\"",
-      "resource": "A3::a::\"\"",
+      "principal": {
+        "type": "A3::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A3::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A3::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A3::a::\"\"",
-      "action": "A3::Action::\"\"",
-      "resource": "A3::a::\"\"",
+      "principal": {
+        "type": "A3::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A3::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A3::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A3::a::\"\"",
-      "action": "A3::Action::\"\"",
-      "resource": "A3::a::\"\"",
+      "principal": {
+        "type": "A3::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A3::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A3::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A3::a::\"\"",
-      "action": "A3::Action::\"\"",
-      "resource": "A3::a::\"\"",
+      "principal": {
+        "type": "A3::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A3::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A3::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A3::a::\"\"",
-      "action": "A3::Action::\"\"",
-      "resource": "A3::a::\"\"",
+      "principal": {
+        "type": "A3::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A3::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A3::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A3::a::\"\"",
-      "action": "A3::Action::\"\"",
-      "resource": "A3::a::\"\"",
+      "principal": {
+        "type": "A3::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A3::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A3::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A3::a::\"\"",
-      "action": "A3::Action::\"\"",
-      "resource": "A3::a::\"\"",
+      "principal": {
+        "type": "A3::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A3::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A3::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A3::a::\"\"",
-      "action": "A3::Action::\"\"",
-      "resource": "A3::a::\"\"",
+      "principal": {
+        "type": "A3::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A3::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A3::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d84a7265aa02ddd517afbe801504d45528c6473b.json b/cedar-integration-tests/corpus_tests/d84a7265aa02ddd517afbe801504d45528c6473b.json
index 106268654..f931029b6 100644
--- a/cedar-integration-tests/corpus_tests/d84a7265aa02ddd517afbe801504d45528c6473b.json
+++ b/cedar-integration-tests/corpus_tests/d84a7265aa02ddd517afbe801504d45528c6473b.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"\\u{2}\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "\u0002"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"\\u{2}\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "\u0002"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"\\u{2}\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "\u0002"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"\\u{2}\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "\u0002"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"\\u{2}\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "\u0002"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"\\u{2}\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "\u0002"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"\\u{2}\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "\u0002"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"\\u{2}\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "\u0002"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d86e4a3e117b0768333fa1cfb9511ef928b61e45.json b/cedar-integration-tests/corpus_tests/d86e4a3e117b0768333fa1cfb9511ef928b61e45.json
index a2879740f..4268dda18 100644
--- a/cedar-integration-tests/corpus_tests/d86e4a3e117b0768333fa1cfb9511ef928b61e45.json
+++ b/cedar-integration-tests/corpus_tests/d86e4a3e117b0768333fa1cfb9511ef928b61e45.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"˴\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "˴"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d874dce35c50c45ac609f378a680b7b8caaeba71.json b/cedar-integration-tests/corpus_tests/d874dce35c50c45ac609f378a680b7b8caaeba71.json
index bcafa4c6c..7750ec960 100644
--- a/cedar-integration-tests/corpus_tests/d874dce35c50c45ac609f378a680b7b8caaeba71.json
+++ b/cedar-integration-tests/corpus_tests/d874dce35c50c45ac609f378a680b7b8caaeba71.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d88d28618e57781b90b2cb062eb2e0c35074968b.json b/cedar-integration-tests/corpus_tests/d88d28618e57781b90b2cb062eb2e0c35074968b.json
index da479fddc..81dddb339 100644
--- a/cedar-integration-tests/corpus_tests/d88d28618e57781b90b2cb062eb2e0c35074968b.json
+++ b/cedar-integration-tests/corpus_tests/d88d28618e57781b90b2cb062eb2e0c35074968b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "F33w::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "F33w",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "F33w::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "F33w",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "F33w::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "F33w",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "F33w::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "F33w",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "F33w::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "F33w",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "F33w::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "F33w",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "F33w::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "F33w",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "F33w::\"::\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\"\"",
+      "principal": {
+        "type": "F33w",
+        "id": "::"
+      },
+      "resource": {
+        "type": "r",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d8d09ed3ce3ca1bbb7581ba1f5035cff45ea969d.json b/cedar-integration-tests/corpus_tests/d8d09ed3ce3ca1bbb7581ba1f5035cff45ea969d.json
index d0fb8e5a5..b3c76c79f 100644
--- a/cedar-integration-tests/corpus_tests/d8d09ed3ce3ca1bbb7581ba1f5035cff45ea969d.json
+++ b/cedar-integration-tests/corpus_tests/d8d09ed3ce3ca1bbb7581ba1f5035cff45ea969d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/d96f63399d160023562bcf5317506bf049959ef6.json b/cedar-integration-tests/corpus_tests/d96f63399d160023562bcf5317506bf049959ef6.json
index aa59e00af..9aa9b8fe7 100644
--- a/cedar-integration-tests/corpus_tests/d96f63399d160023562bcf5317506bf049959ef6.json
+++ b/cedar-integration-tests/corpus_tests/d96f63399d160023562bcf5317506bf049959ef6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
@@ -23,9 +32,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
@@ -40,9 +58,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
@@ -57,9 +84,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
@@ -74,9 +110,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
@@ -91,9 +136,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
@@ -108,9 +162,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
@@ -125,9 +188,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
diff --git a/cedar-integration-tests/corpus_tests/d9babe98f71c08bfabda643b5fdb07ee5be7f6bc.json b/cedar-integration-tests/corpus_tests/d9babe98f71c08bfabda643b5fdb07ee5be7f6bc.json
index a4bb960f7..2d3d83317 100644
--- a/cedar-integration-tests/corpus_tests/d9babe98f71c08bfabda643b5fdb07ee5be7f6bc.json
+++ b/cedar-integration-tests/corpus_tests/d9babe98f71c08bfabda643b5fdb07ee5be7f6bc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"7356322h\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "7356322h\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/d9ed25901f66563e471830cc3992156b6cbd90e3.json b/cedar-integration-tests/corpus_tests/d9ed25901f66563e471830cc3992156b6cbd90e3.json
index 46582f1a6..ea641fb24 100644
--- a/cedar-integration-tests/corpus_tests/d9ed25901f66563e471830cc3992156b6cbd90e3.json
+++ b/cedar-integration-tests/corpus_tests/d9ed25901f66563e471830cc3992156b6cbd90e3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::G::r::A::\"\"",
-      "action": "r::r::G::r::Action::\"action\"",
-      "resource": "r::r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::G::r::A::\"\"",
-      "action": "r::r::G::r::Action::\"action\"",
-      "resource": "r::r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::G::r::A::\"\"",
-      "action": "r::r::G::r::Action::\"action\"",
-      "resource": "r::r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::G::r::A::\"\"",
-      "action": "r::r::G::r::Action::\"action\"",
-      "resource": "r::r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::G::r::A::\"\"",
-      "action": "r::r::G::r::Action::\"action\"",
-      "resource": "r::r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::G::r::A::\"\"",
-      "action": "r::r::G::r::Action::\"action\"",
-      "resource": "r::r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::G::r::A::\"\"",
-      "action": "r::r::G::r::Action::\"action\"",
-      "resource": "r::r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::G::r::A::\"\"",
-      "action": "r::r::G::r::Action::\"action\"",
-      "resource": "r::r::G::r::A::\"\"",
+      "principal": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::G::r::A",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::G::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/da0e00d2c1e3dba4bfcbe7533a16b216860a3b56.json b/cedar-integration-tests/corpus_tests/da0e00d2c1e3dba4bfcbe7533a16b216860a3b56.json
index 9f9f96ef3..6909842d2 100644
--- a/cedar-integration-tests/corpus_tests/da0e00d2c1e3dba4bfcbe7533a16b216860a3b56.json
+++ b/cedar-integration-tests/corpus_tests/da0e00d2c1e3dba4bfcbe7533a16b216860a3b56.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "F1200sww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F1200sww::\"\"",
+      "principal": {
+        "type": "F1200sww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F1200sww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "s0000": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "F1200sww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F1200sww::\"\"",
+      "principal": {
+        "type": "F1200sww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F1200sww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "s0000": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "F1200sww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F1200sww::\"\"",
+      "principal": {
+        "type": "F1200sww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F1200sww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "s0000": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "F1200sww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F1200sww::\"\"",
+      "principal": {
+        "type": "F1200sww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F1200sww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "s0000": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "F1200sww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F1200sww::\"\"",
+      "principal": {
+        "type": "F1200sww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F1200sww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "s0000": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "F1200sww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F1200sww::\"\"",
+      "principal": {
+        "type": "F1200sww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F1200sww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "s0000": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "F1200sww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F1200sww::\"\"",
+      "principal": {
+        "type": "F1200sww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F1200sww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "s0000": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "F1200sww::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "F1200sww::\"\"",
+      "principal": {
+        "type": "F1200sww",
+        "id": ""
+      },
+      "resource": {
+        "type": "F1200sww",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "s0000": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/da188d700d07ee66e9aed294ec88e256f96a0099.json b/cedar-integration-tests/corpus_tests/da188d700d07ee66e9aed294ec88e256f96a0099.json
index 78a8835cd..35602f6b5 100644
--- a/cedar-integration-tests/corpus_tests/da188d700d07ee66e9aed294ec88e256f96a0099.json
+++ b/cedar-integration-tests/corpus_tests/da188d700d07ee66e9aed294ec88e256f96a0099.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/da1c16cdd10dde7bf368be9f66a13d8bfd0c5d7e.json b/cedar-integration-tests/corpus_tests/da1c16cdd10dde7bf368be9f66a13d8bfd0c5d7e.json
index 4b9ecd51f..f42f674d5 100644
--- a/cedar-integration-tests/corpus_tests/da1c16cdd10dde7bf368be9f66a13d8bfd0c5d7e.json
+++ b/cedar-integration-tests/corpus_tests/da1c16cdd10dde7bf368be9f66a13d8bfd0c5d7e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\":\"",
+      "principal": {
+        "type": "r",
+        "id": ":"
+      },
+      "resource": {
+        "type": "r",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\":\"",
+      "principal": {
+        "type": "r",
+        "id": ":"
+      },
+      "resource": {
+        "type": "r",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\":\"",
+      "principal": {
+        "type": "r",
+        "id": ":"
+      },
+      "resource": {
+        "type": "r",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\":\"",
+      "principal": {
+        "type": "r",
+        "id": ":"
+      },
+      "resource": {
+        "type": "r",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\":\"",
+      "principal": {
+        "type": "r",
+        "id": ":"
+      },
+      "resource": {
+        "type": "r",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\":\"",
+      "principal": {
+        "type": "r",
+        "id": ":"
+      },
+      "resource": {
+        "type": "r",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\":\"",
+      "principal": {
+        "type": "r",
+        "id": ":"
+      },
+      "resource": {
+        "type": "r",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "r::\":\"",
+      "principal": {
+        "type": "r",
+        "id": ":"
+      },
+      "resource": {
+        "type": "r",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/da5fe16ab3b3f9798a1508ab1cf6ea701e7cb757.json b/cedar-integration-tests/corpus_tests/da5fe16ab3b3f9798a1508ab1cf6ea701e7cb757.json
index bc68bec99..3959a2a03 100644
--- a/cedar-integration-tests/corpus_tests/da5fe16ab3b3f9798a1508ab1cf6ea701e7cb757.json
+++ b/cedar-integration-tests/corpus_tests/da5fe16ab3b3f9798a1508ab1cf6ea701e7cb757.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"k0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "k0\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0(\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0(\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000("
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000("
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0(\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0(\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000("
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000("
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0(\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0(\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000("
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000("
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0(\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0(\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000("
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000("
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0(\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0(\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000("
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000("
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0(\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0(\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000("
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000("
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0(\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0(\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000("
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000("
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/da715723bd19cfced47a6111f4b00bbd1914cb34.json b/cedar-integration-tests/corpus_tests/da715723bd19cfced47a6111f4b00bbd1914cb34.json
index a3f2320fa..b21057643 100644
--- a/cedar-integration-tests/corpus_tests/da715723bd19cfced47a6111f4b00bbd1914cb34.json
+++ b/cedar-integration-tests/corpus_tests/da715723bd19cfced47a6111f4b00bbd1914cb34.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::a::\"\\0\\0\\0\\0\\0\\0\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::a::\"\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "r::r::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "r::r::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::a::\"\\0\\0\\0\\0\\0\\0\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::a::\"\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "r::r::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "r::r::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::a::\"\\0\\0\\0\\0\\0\\0\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::a::\"\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "r::r::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "r::r::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::a::\"\\0\\0\\0\\0\\0\\0\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::a::\"\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "r::r::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "r::r::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::a::\"\\0\\0\\0\\0\\0\\0\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::a::\"\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "r::r::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "r::r::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::a::\"\\0\\0\\0\\0\\0\\0\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::a::\"\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "r::r::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "r::r::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::a::\"\\0\\0\\0\\0\\0\\0\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::a::\"\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "r::r::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "r::r::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::a::\"\\0\\0\\0\\0\\0\\0\"",
-      "action": "r::r::Action::\"action\"",
-      "resource": "r::r::a::\"\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "r::r::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "r::r::a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "r::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/dac47e38ea5df9441922928f293efcbc4f6ba722.json b/cedar-integration-tests/corpus_tests/dac47e38ea5df9441922928f293efcbc4f6ba722.json
index 522fd7dd7..fb64b764f 100644
--- a/cedar-integration-tests/corpus_tests/dac47e38ea5df9441922928f293efcbc4f6ba722.json
+++ b/cedar-integration-tests/corpus_tests/dac47e38ea5df9441922928f293efcbc4f6ba722.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"6\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "6"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/dad14134aa1ce9af0bb49f8d1fdfea528860903b.json b/cedar-integration-tests/corpus_tests/dad14134aa1ce9af0bb49f8d1fdfea528860903b.json
index e7401de07..7b2d074cf 100644
--- a/cedar-integration-tests/corpus_tests/dad14134aa1ce9af0bb49f8d1fdfea528860903b.json
+++ b/cedar-integration-tests/corpus_tests/dad14134aa1ce9af0bb49f8d1fdfea528860903b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"FFF\"",
-      "action": "Action::\"FFF\"",
-      "resource": "a::\"FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "FFF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"FFF\"",
-      "action": "Action::\"FFF\"",
-      "resource": "a::\"FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "FFF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"FFF\"",
-      "action": "Action::\"FFF\"",
-      "resource": "a::\"FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "FFF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"FFF\"",
-      "action": "Action::\"FFF\"",
-      "resource": "a::\"FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "FFF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"FFF\"",
-      "action": "Action::\"FFF\"",
-      "resource": "a::\"FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "FFF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"FFF\"",
-      "action": "Action::\"FFF\"",
-      "resource": "a::\"FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "FFF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"FFF\"",
-      "action": "Action::\"FFF\"",
-      "resource": "a::\"FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "FFF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"FFF\"",
-      "action": "Action::\"FFF\"",
-      "resource": "a::\"FFF\"",
+      "principal": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFF"
+      },
+      "action": {
+        "type": "Action",
+        "id": "FFF"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/db2cdc2b803fe8afebeac848ef72e20eca2ede2c.json b/cedar-integration-tests/corpus_tests/db2cdc2b803fe8afebeac848ef72e20eca2ede2c.json
index 716faaab2..dad473071 100644
--- a/cedar-integration-tests/corpus_tests/db2cdc2b803fe8afebeac848ef72e20eca2ede2c.json
+++ b/cedar-integration-tests/corpus_tests/db2cdc2b803fe8afebeac848ef72e20eca2ede2c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Gxt833777::a::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::a::\"\"",
+      "principal": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Gxt833777::a::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::a::\"\"",
+      "principal": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Gxt833777::a::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::a::\"\"",
+      "principal": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Gxt833777::a::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::a::\"\"",
+      "principal": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Gxt833777::a::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::a::\"\"",
+      "principal": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Gxt833777::a::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::a::\"\"",
+      "principal": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Gxt833777::a::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::a::\"\"",
+      "principal": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Gxt833777::a::\"\"",
-      "action": "Gxt833777::Action::\"action\"",
-      "resource": "Gxt833777::a::\"\"",
+      "principal": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Gxt833777::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Gxt833777::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/db4a721afbe45d420d3ec127d35435c49e0813df.json b/cedar-integration-tests/corpus_tests/db4a721afbe45d420d3ec127d35435c49e0813df.json
index bab2fe682..a9f696177 100644
--- a/cedar-integration-tests/corpus_tests/db4a721afbe45d420d3ec127d35435c49e0813df.json
+++ b/cedar-integration-tests/corpus_tests/db4a721afbe45d420d3ec127d35435c49e0813df.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{1a}s\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1a}s\"",
+      "principal": {
+        "type": "a",
+        "id": "\u001as"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u001as"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{1a}s\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u001as"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{1a}s\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1a}s\"",
+      "principal": {
+        "type": "a",
+        "id": "\u001as"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u001as"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{1a}s\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u001as"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{1a}s\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1a}s\"",
+      "principal": {
+        "type": "a",
+        "id": "\u001as"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u001as"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{1a}s\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1a}s\"",
+      "principal": {
+        "type": "a",
+        "id": "\u001as"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u001as"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{1a}s\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1a}s\"",
+      "principal": {
+        "type": "a",
+        "id": "\u001as"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u001as"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{1a}s\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{1a}s\"",
+      "principal": {
+        "type": "a",
+        "id": "\u001as"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u001as"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/db83110c98cad112b5100aee32dc1c44bead590f.json b/cedar-integration-tests/corpus_tests/db83110c98cad112b5100aee32dc1c44bead590f.json
index e99c454ba..863800023 100644
--- a/cedar-integration-tests/corpus_tests/db83110c98cad112b5100aee32dc1c44bead590f.json
+++ b/cedar-integration-tests/corpus_tests/db83110c98cad112b5100aee32dc1c44bead590f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"zzzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"zzzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"zzzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"zzzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"zzzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"zzzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"zzzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"zzzzzzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzzzzzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzzzzzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzzzzzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/dba1be0e19ff7c90ca7f8272e5c246f818809428.json b/cedar-integration-tests/corpus_tests/dba1be0e19ff7c90ca7f8272e5c246f818809428.json
index 8be44282d..197107292 100644
--- a/cedar-integration-tests/corpus_tests/dba1be0e19ff7c90ca7f8272e5c246f818809428.json
+++ b/cedar-integration-tests/corpus_tests/dba1be0e19ff7c90ca7f8272e5c246f818809428.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "lUy6y788Fwww::a::\"l:i_ym\\0\\0\\0&\"",
-      "action": "lUy6y788Fwww::Action::\"action\"",
-      "resource": "lUy6y788Fwww::a::\"l:i_ym\\0\\0\\0&\"",
+      "principal": {
+        "type": "lUy6y788Fwww::a",
+        "id": "l:i_ym\u0000\u0000\u0000&"
+      },
+      "resource": {
+        "type": "lUy6y788Fwww::a",
+        "id": "l:i_ym\u0000\u0000\u0000&"
+      },
+      "action": {
+        "type": "lUy6y788Fwww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "lUy6y788Fwww::a::\"l:i_ym\\0\\0\\0&\"",
-      "action": "lUy6y788Fwww::Action::\"action\"",
-      "resource": "lUy6y788Fwww::a::\"l:i_ym\\0\\0\\0&\"",
+      "principal": {
+        "type": "lUy6y788Fwww::a",
+        "id": "l:i_ym\u0000\u0000\u0000&"
+      },
+      "resource": {
+        "type": "lUy6y788Fwww::a",
+        "id": "l:i_ym\u0000\u0000\u0000&"
+      },
+      "action": {
+        "type": "lUy6y788Fwww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "lUy6y788Fwww::a::\"l:i_ym\\0\\0\\0&\"",
-      "action": "lUy6y788Fwww::Action::\"action\"",
-      "resource": "lUy6y788Fwww::a::\"l:i_ym\\0\\0\\0&\"",
+      "principal": {
+        "type": "lUy6y788Fwww::a",
+        "id": "l:i_ym\u0000\u0000\u0000&"
+      },
+      "resource": {
+        "type": "lUy6y788Fwww::a",
+        "id": "l:i_ym\u0000\u0000\u0000&"
+      },
+      "action": {
+        "type": "lUy6y788Fwww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "lUy6y788Fwww::a::\"l:i_ym\\0\\0\\0&\"",
-      "action": "lUy6y788Fwww::Action::\"action\"",
-      "resource": "lUy6y788Fwww::a::\"l:i_ym\\0\\0\\0&\"",
+      "principal": {
+        "type": "lUy6y788Fwww::a",
+        "id": "l:i_ym\u0000\u0000\u0000&"
+      },
+      "resource": {
+        "type": "lUy6y788Fwww::a",
+        "id": "l:i_ym\u0000\u0000\u0000&"
+      },
+      "action": {
+        "type": "lUy6y788Fwww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "lUy6y788Fwww::a::\"l:i_ym\\0\\0\\0&\"",
-      "action": "lUy6y788Fwww::Action::\"action\"",
-      "resource": "lUy6y788Fwww::a::\"l:i_ym\\0\\0\\0&\"",
+      "principal": {
+        "type": "lUy6y788Fwww::a",
+        "id": "l:i_ym\u0000\u0000\u0000&"
+      },
+      "resource": {
+        "type": "lUy6y788Fwww::a",
+        "id": "l:i_ym\u0000\u0000\u0000&"
+      },
+      "action": {
+        "type": "lUy6y788Fwww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "lUy6y788Fwww::a::\"l:i_ym\\0\\0\\0&\"",
-      "action": "lUy6y788Fwww::Action::\"action\"",
-      "resource": "lUy6y788Fwww::a::\"l:i_ym\\0\\0\\0&\"",
+      "principal": {
+        "type": "lUy6y788Fwww::a",
+        "id": "l:i_ym\u0000\u0000\u0000&"
+      },
+      "resource": {
+        "type": "lUy6y788Fwww::a",
+        "id": "l:i_ym\u0000\u0000\u0000&"
+      },
+      "action": {
+        "type": "lUy6y788Fwww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "lUy6y788Fwww::a::\"l:i_ym\\0\\0\\0&\"",
-      "action": "lUy6y788Fwww::Action::\"action\"",
-      "resource": "lUy6y788Fwww::a::\"l:i_ym\\0\\0\\0&\"",
+      "principal": {
+        "type": "lUy6y788Fwww::a",
+        "id": "l:i_ym\u0000\u0000\u0000&"
+      },
+      "resource": {
+        "type": "lUy6y788Fwww::a",
+        "id": "l:i_ym\u0000\u0000\u0000&"
+      },
+      "action": {
+        "type": "lUy6y788Fwww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "lUy6y788Fwww::a::\"l:i_ym\\0\\0\\0&\"",
-      "action": "lUy6y788Fwww::Action::\"action\"",
-      "resource": "lUy6y788Fwww::a::\"l:i_ym\\0\\0\\0&\"",
+      "principal": {
+        "type": "lUy6y788Fwww::a",
+        "id": "l:i_ym\u0000\u0000\u0000&"
+      },
+      "resource": {
+        "type": "lUy6y788Fwww::a",
+        "id": "l:i_ym\u0000\u0000\u0000&"
+      },
+      "action": {
+        "type": "lUy6y788Fwww::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/dbc9f37ef3073f9d001be9f58064951fcd50ac40.json b/cedar-integration-tests/corpus_tests/dbc9f37ef3073f9d001be9f58064951fcd50ac40.json
index dede1900c..d3da00dc2 100644
--- a/cedar-integration-tests/corpus_tests/dbc9f37ef3073f9d001be9f58064951fcd50ac40.json
+++ b/cedar-integration-tests/corpus_tests/dbc9f37ef3073f9d001be9f58064951fcd50ac40.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/dbd6a16ed5b85032a68658f06177c34f6df00014.json b/cedar-integration-tests/corpus_tests/dbd6a16ed5b85032a68658f06177c34f6df00014.json
index 5d57b7409..3ddd6b671 100644
--- a/cedar-integration-tests/corpus_tests/dbd6a16ed5b85032a68658f06177c34f6df00014.json
+++ b/cedar-integration-tests/corpus_tests/dbd6a16ed5b85032a68658f06177c34f6df00014.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::\"\"",
-      "action": "Action::\"\"",
-      "resource": "Wjjjjjjjjukkkk::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjjjjjjjukkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::\"\"",
-      "action": "Action::\"\"",
-      "resource": "Wjjjjjjjjukkkk::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjjjjjjjukkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::\"\"",
-      "action": "Action::\"\"",
-      "resource": "Wjjjjjjjjukkkk::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjjjjjjjukkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::\"\"",
-      "action": "Action::\"\"",
-      "resource": "Wjjjjjjjjukkkk::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjjjjjjjukkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::\"\"",
-      "action": "Action::\"\"",
-      "resource": "Wjjjjjjjjukkkk::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjjjjjjjukkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::\"\"",
-      "action": "Action::\"\"",
-      "resource": "Wjjjjjjjjukkkk::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjjjjjjjukkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::\"\"",
-      "action": "Action::\"\"",
-      "resource": "Wjjjjjjjjukkkk::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjjjjjjjukkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::\"\"",
-      "action": "Action::\"\"",
-      "resource": "Wjjjjjjjjukkkk::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjjjjjjjukkkk",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/dbeca91dba601740aa810e83bf915f68342b4576.json b/cedar-integration-tests/corpus_tests/dbeca91dba601740aa810e83bf915f68342b4576.json
index 29736b7cb..f5ee03cba 100644
--- a/cedar-integration-tests/corpus_tests/dbeca91dba601740aa810e83bf915f68342b4576.json
+++ b/cedar-integration-tests/corpus_tests/dbeca91dba601740aa810e83bf915f68342b4576.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/dbedd956b047b4891bb50fcd1196fe7ff07be347.json b/cedar-integration-tests/corpus_tests/dbedd956b047b4891bb50fcd1196fe7ff07be347.json
index 70681d8bb..0538762d3 100644
--- a/cedar-integration-tests/corpus_tests/dbedd956b047b4891bb50fcd1196fe7ff07be347.json
+++ b/cedar-integration-tests/corpus_tests/dbedd956b047b4891bb50fcd1196fe7ff07be347.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"RRRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"RRRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"RRRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"RRRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"RRRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"RRRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"RRRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"RRRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/dc10006036dd185ebf256e9ff21f88aa2bc720bd.json b/cedar-integration-tests/corpus_tests/dc10006036dd185ebf256e9ff21f88aa2bc720bd.json
index 5414b2461..3743602f4 100644
--- a/cedar-integration-tests/corpus_tests/dc10006036dd185ebf256e9ff21f88aa2bc720bd.json
+++ b/cedar-integration-tests/corpus_tests/dc10006036dd185ebf256e9ff21f88aa2bc720bd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0,ff\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000,ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0,ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0,ff\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000,ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000,ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0,ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0,ff\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000,ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000,ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0,ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0,ff\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000,ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000,ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0,ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0,ff\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000,ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000,ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0,ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0,ff\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000,ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000,ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0,ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0,ff\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000,ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000,ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0,ff\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0,ff\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000,ff"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000,ff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/dc26baf46d0a36f2dfeab8c192cc2d2f05b60593.json b/cedar-integration-tests/corpus_tests/dc26baf46d0a36f2dfeab8c192cc2d2f05b60593.json
index 0fca39ee1..e634141be 100644
--- a/cedar-integration-tests/corpus_tests/dc26baf46d0a36f2dfeab8c192cc2d2f05b60593.json
+++ b/cedar-integration-tests/corpus_tests/dc26baf46d0a36f2dfeab8c192cc2d2f05b60593.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"J\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "J"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"J\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "J"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"J\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "J"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"J\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "J"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"J\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "J"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"J\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "J"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"J\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "J"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"J\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "J"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/dc518fc7ef5b82e44d498355e9f55192dc170914.json b/cedar-integration-tests/corpus_tests/dc518fc7ef5b82e44d498355e9f55192dc170914.json
index df998a659..8cf1cc7e6 100644
--- a/cedar-integration-tests/corpus_tests/dc518fc7ef5b82e44d498355e9f55192dc170914.json
+++ b/cedar-integration-tests/corpus_tests/dc518fc7ef5b82e44d498355e9f55192dc170914.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/dcf094ea4aaaada209c625352c25d5a698376713.json b/cedar-integration-tests/corpus_tests/dcf094ea4aaaada209c625352c25d5a698376713.json
index 4e51d1774..1f46a0aa4 100644
--- a/cedar-integration-tests/corpus_tests/dcf094ea4aaaada209c625352c25d5a698376713.json
+++ b/cedar-integration-tests/corpus_tests/dcf094ea4aaaada209c625352c25d5a698376713.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::KLKKJJ0::r::r::A::r::a::\"\"",
-      "action": "r::r::KLKKJJ0::r::r::A::r::Action::\"action\"",
-      "resource": "r::r::KLKKJJ0::r::r::A::r::a::\"\"",
+      "principal": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::KLKKJJ0::r::r::A::r::a::\"\"",
-      "action": "r::r::KLKKJJ0::r::r::A::r::Action::\"action\"",
-      "resource": "r::r::KLKKJJ0::r::r::A::r::a::\"\"",
+      "principal": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::KLKKJJ0::r::r::A::r::a::\"\"",
-      "action": "r::r::KLKKJJ0::r::r::A::r::Action::\"action\"",
-      "resource": "r::r::KLKKJJ0::r::r::A::r::a::\"\"",
+      "principal": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::KLKKJJ0::r::r::A::r::a::\"\"",
-      "action": "r::r::KLKKJJ0::r::r::A::r::Action::\"action\"",
-      "resource": "r::r::KLKKJJ0::r::r::A::r::a::\"\"",
+      "principal": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::KLKKJJ0::r::r::A::r::a::\"\"",
-      "action": "r::r::KLKKJJ0::r::r::A::r::Action::\"action\"",
-      "resource": "r::r::KLKKJJ0::r::r::A::r::a::\"\"",
+      "principal": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::KLKKJJ0::r::r::A::r::a::\"\"",
-      "action": "r::r::KLKKJJ0::r::r::A::r::Action::\"action\"",
-      "resource": "r::r::KLKKJJ0::r::r::A::r::a::\"\"",
+      "principal": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::KLKKJJ0::r::r::A::r::a::\"\"",
-      "action": "r::r::KLKKJJ0::r::r::A::r::Action::\"action\"",
-      "resource": "r::r::KLKKJJ0::r::r::A::r::a::\"\"",
+      "principal": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::KLKKJJ0::r::r::A::r::a::\"\"",
-      "action": "r::r::KLKKJJ0::r::r::A::r::Action::\"action\"",
-      "resource": "r::r::KLKKJJ0::r::r::A::r::a::\"\"",
+      "principal": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::KLKKJJ0::r::r::A::r::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/dd090f0e0c1e0657f8650dacd5c0672fc6110e0e.json b/cedar-integration-tests/corpus_tests/dd090f0e0c1e0657f8650dacd5c0672fc6110e0e.json
index e41338adc..28ebf8dac 100644
--- a/cedar-integration-tests/corpus_tests/dd090f0e0c1e0657f8650dacd5c0672fc6110e0e.json
+++ b/cedar-integration-tests/corpus_tests/dd090f0e0c1e0657f8650dacd5c0672fc6110e0e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"5218\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "5218\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"5218\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"5218\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "5218\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "5218\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"5218\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"5218\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "5218\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "5218\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"5218\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"5218\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "5218\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "5218\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"5218\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"5218\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "5218\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "5218\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"5218\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"5218\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "5218\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "5218\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"5218\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"5218\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "5218\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "5218\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"5218\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"5218\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "5218\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "5218\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/dd7786bc93ee6c4c89dd6f523f23a2de8a4ee390.json b/cedar-integration-tests/corpus_tests/dd7786bc93ee6c4c89dd6f523f23a2de8a4ee390.json
index b7b076f98..598d5528f 100644
--- a/cedar-integration-tests/corpus_tests/dd7786bc93ee6c4c89dd6f523f23a2de8a4ee390.json
+++ b/cedar-integration-tests/corpus_tests/dd7786bc93ee6c4c89dd6f523f23a2de8a4ee390.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ddcacf2669cc2037f337afa4ba73f1e07b4a9450.json b/cedar-integration-tests/corpus_tests/ddcacf2669cc2037f337afa4ba73f1e07b4a9450.json
index ab53dd950..e08d62b42 100644
--- a/cedar-integration-tests/corpus_tests/ddcacf2669cc2037f337afa4ba73f1e07b4a9450.json
+++ b/cedar-integration-tests/corpus_tests/ddcacf2669cc2037f337afa4ba73f1e07b4a9450.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/de6f90ef4c5f6bf96e92b97b4a919db6d534490e.json b/cedar-integration-tests/corpus_tests/de6f90ef4c5f6bf96e92b97b4a919db6d534490e.json
index 1e48fb62e..2d7015718 100644
--- a/cedar-integration-tests/corpus_tests/de6f90ef4c5f6bf96e92b97b4a919db6d534490e.json
+++ b/cedar-integration-tests/corpus_tests/de6f90ef4c5f6bf96e92b97b4a919db6d534490e.json
@@ -6,9 +6,15 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{1f}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "\u001f"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +24,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +45,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +66,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +87,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +108,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +129,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +150,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/de9a66a5e8d3752b3e3569c04148a8707ae7c42c.json b/cedar-integration-tests/corpus_tests/de9a66a5e8d3752b3e3569c04148a8707ae7c42c.json
index cf51b3ecd..6c3448ee8 100644
--- a/cedar-integration-tests/corpus_tests/de9a66a5e8d3752b3e3569c04148a8707ae7c42c.json
+++ b/cedar-integration-tests/corpus_tests/de9a66a5e8d3752b3e3569c04148a8707ae7c42c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"zz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zz\"",
+      "principal": {
+        "type": "a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "r": []
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"zz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zz\"",
+      "principal": {
+        "type": "a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "r": []
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"zz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zz\"",
+      "principal": {
+        "type": "a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "r": []
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"zz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zz\"",
+      "principal": {
+        "type": "a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "r": []
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"zz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zz\"",
+      "principal": {
+        "type": "a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "r": []
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"zz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zz\"",
+      "principal": {
+        "type": "a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "r": []
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"zz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zz\"",
+      "principal": {
+        "type": "a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "r": []
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"zz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zz\"",
+      "principal": {
+        "type": "a",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "r": []
diff --git a/cedar-integration-tests/corpus_tests/dea7b56767cd2bc51eeb85f5762944619a27c1a6.json b/cedar-integration-tests/corpus_tests/dea7b56767cd2bc51eeb85f5762944619a27c1a6.json
index be270a01a..c39523788 100644
--- a/cedar-integration-tests/corpus_tests/dea7b56767cd2bc51eeb85f5762944619a27c1a6.json
+++ b/cedar-integration-tests/corpus_tests/dea7b56767cd2bc51eeb85f5762944619a27c1a6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\u{6}\\u{2}\\u{2}\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\u{6}\\u{2}\\u{2}\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0006\u0002\u0002\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0006\u0002\u0002\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\u{6}\\u{2}\\u{2}\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\u{6}\\u{2}\\u{2}\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0006\u0002\u0002\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0006\u0002\u0002\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\u{6}\\u{2}\\u{2}\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\u{6}\\u{2}\\u{2}\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0006\u0002\u0002\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0006\u0002\u0002\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\u{6}\\u{2}\\u{2}\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\u{6}\\u{2}\\u{2}\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0006\u0002\u0002\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0006\u0002\u0002\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\u{6}\\u{2}\\u{2}\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\u{6}\\u{2}\\u{2}\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0006\u0002\u0002\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0006\u0002\u0002\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\u{6}\\u{2}\\u{2}\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\u{6}\\u{2}\\u{2}\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0006\u0002\u0002\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0006\u0002\u0002\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\u{6}\\u{2}\\u{2}\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\u{6}\\u{2}\\u{2}\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0006\u0002\u0002\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0006\u0002\u0002\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\u{6}\\u{2}\\u{2}\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}c\\0\\0\\0\\0\\0\\0\\u{6}\\u{2}\\u{2}\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0006\u0002\u0002\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002c\u0000\u0000\u0000\u0000\u0000\u0000\u0006\u0002\u0002\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/decf52fee04d6451c0fbb54fd0e9698a0ed37b65.json b/cedar-integration-tests/corpus_tests/decf52fee04d6451c0fbb54fd0e9698a0ed37b65.json
index bc1904820..d69dc8925 100644
--- a/cedar-integration-tests/corpus_tests/decf52fee04d6451c0fbb54fd0e9698a0ed37b65.json
+++ b/cedar-integration-tests/corpus_tests/decf52fee04d6451c0fbb54fd0e9698a0ed37b65.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ded15c53e94ef93c32b41c2d869961f2cff2f85a.json b/cedar-integration-tests/corpus_tests/ded15c53e94ef93c32b41c2d869961f2cff2f85a.json
index 84ff00ebe..729057ff4 100644
--- a/cedar-integration-tests/corpus_tests/ded15c53e94ef93c32b41c2d869961f2cff2f85a.json
+++ b/cedar-integration-tests/corpus_tests/ded15c53e94ef93c32b41c2d869961f2cff2f85a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "1"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/dedcfd40a2187a7611e6f099db17ad4c61ab0e1e.json b/cedar-integration-tests/corpus_tests/dedcfd40a2187a7611e6f099db17ad4c61ab0e1e.json
index f4f293161..e015791d3 100644
--- a/cedar-integration-tests/corpus_tests/dedcfd40a2187a7611e6f099db17ad4c61ab0e1e.json
+++ b/cedar-integration-tests/corpus_tests/dedcfd40a2187a7611e6f099db17ad4c61ab0e1e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::a::\"\\u{6}\"",
-      "action": "A::Action::\"\"",
-      "resource": "A::a::\"\\u{6}\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::a::\"\\u{6}\"",
-      "action": "A::Action::\"\"",
-      "resource": "A::a::\"\\u{6}\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::a::\"\\u{6}\"",
-      "action": "A::Action::\"\"",
-      "resource": "A::a::\"\\u{6}\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::a::\"\\u{6}\"",
-      "action": "A::Action::\"\"",
-      "resource": "A::a::\"\\u{6}\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::a::\"\\u{6}\"",
-      "action": "A::Action::\"\"",
-      "resource": "A::a::\"\\u{6}\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::a::\"\\u{6}\"",
-      "action": "A::Action::\"\"",
-      "resource": "A::a::\"\\u{6}\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::a::\"\\u{6}\"",
-      "action": "A::Action::\"\"",
-      "resource": "A::a::\"\\u{6}\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::a::\"\\u{6}\"",
-      "action": "A::Action::\"\"",
-      "resource": "A::a::\"\\u{6}\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0006"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "\u0006"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/defd5589c286ff2dda5865ae0a230c9ef13d90ab.json b/cedar-integration-tests/corpus_tests/defd5589c286ff2dda5865ae0a230c9ef13d90ab.json
index 61c4031ec..a626a589b 100644
--- a/cedar-integration-tests/corpus_tests/defd5589c286ff2dda5865ae0a230c9ef13d90ab.json
+++ b/cedar-integration-tests/corpus_tests/defd5589c286ff2dda5865ae0a230c9ef13d90ab.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "C22::C233::a::\"\"",
-      "action": "C22::C233::Action::\"action\"",
-      "resource": "C22::C233::a::\"\"",
+      "principal": {
+        "type": "C22::C233::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C22::C233::a",
+        "id": ""
+      },
+      "action": {
+        "type": "C22::C233::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "C22::C233::a::\"\"",
-      "action": "C22::C233::Action::\"action\"",
-      "resource": "C22::C233::a::\"\"",
+      "principal": {
+        "type": "C22::C233::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C22::C233::a",
+        "id": ""
+      },
+      "action": {
+        "type": "C22::C233::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "C22::C233::a::\"\"",
-      "action": "C22::C233::Action::\"action\"",
-      "resource": "C22::C233::a::\"\"",
+      "principal": {
+        "type": "C22::C233::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C22::C233::a",
+        "id": ""
+      },
+      "action": {
+        "type": "C22::C233::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "C22::C233::a::\"\"",
-      "action": "C22::C233::Action::\"action\"",
-      "resource": "C22::C233::a::\"\"",
+      "principal": {
+        "type": "C22::C233::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C22::C233::a",
+        "id": ""
+      },
+      "action": {
+        "type": "C22::C233::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "C22::C233::a::\"\"",
-      "action": "C22::C233::Action::\"action\"",
-      "resource": "C22::C233::a::\"\"",
+      "principal": {
+        "type": "C22::C233::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C22::C233::a",
+        "id": ""
+      },
+      "action": {
+        "type": "C22::C233::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "C22::C233::a::\"\"",
-      "action": "C22::C233::Action::\"action\"",
-      "resource": "C22::C233::a::\"\"",
+      "principal": {
+        "type": "C22::C233::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C22::C233::a",
+        "id": ""
+      },
+      "action": {
+        "type": "C22::C233::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "C22::C233::a::\"\"",
-      "action": "C22::C233::Action::\"action\"",
-      "resource": "C22::C233::a::\"\"",
+      "principal": {
+        "type": "C22::C233::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C22::C233::a",
+        "id": ""
+      },
+      "action": {
+        "type": "C22::C233::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "C22::C233::a::\"\"",
-      "action": "C22::C233::Action::\"action\"",
-      "resource": "C22::C233::a::\"\"",
+      "principal": {
+        "type": "C22::C233::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "C22::C233::a",
+        "id": ""
+      },
+      "action": {
+        "type": "C22::C233::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/df02c68b117bfe1a2bf107444803980582b649dc.json b/cedar-integration-tests/corpus_tests/df02c68b117bfe1a2bf107444803980582b649dc.json
index 37ba89a48..b66b7234e 100644
--- a/cedar-integration-tests/corpus_tests/df02c68b117bfe1a2bf107444803980582b649dc.json
+++ b/cedar-integration-tests/corpus_tests/df02c68b117bfe1a2bf107444803980582b649dc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
@@ -25,9 +34,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
@@ -44,9 +62,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
@@ -63,9 +90,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
@@ -82,9 +118,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
@@ -101,9 +146,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
@@ -120,9 +174,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
@@ -139,9 +202,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "wgldmlAlA": {
           "": "",
diff --git a/cedar-integration-tests/corpus_tests/df13479cf32a69d57cc90e21031485de6b8aee93.json b/cedar-integration-tests/corpus_tests/df13479cf32a69d57cc90e21031485de6b8aee93.json
index 59509ff28..5b7404136 100644
--- a/cedar-integration-tests/corpus_tests/df13479cf32a69d57cc90e21031485de6b8aee93.json
+++ b/cedar-integration-tests/corpus_tests/df13479cf32a69d57cc90e21031485de6b8aee93.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0jj,\\0\\0#\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0jj,\\0\\0#\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000jj,\u0000\u0000#\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000jj,\u0000\u0000#\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0jj,\\0\\0#\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0jj,\\0\\0#\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000jj,\u0000\u0000#\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000jj,\u0000\u0000#\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0jj,\\0\\0#\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0jj,\\0\\0#\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000jj,\u0000\u0000#\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000jj,\u0000\u0000#\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0jj,\\0\\0#\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0jj,\\0\\0#\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000jj,\u0000\u0000#\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000jj,\u0000\u0000#\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0jj,\\0\\0#\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0jj,\\0\\0#\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000jj,\u0000\u0000#\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000jj,\u0000\u0000#\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0jj,\\0\\0#\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0jj,\\0\\0#\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000jj,\u0000\u0000#\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000jj,\u0000\u0000#\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0jj,\\0\\0#\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0jj,\\0\\0#\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000jj,\u0000\u0000#\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000jj,\u0000\u0000#\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0jj,\\0\\0#\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"j\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0jj,\\0\\0#\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000jj,\u0000\u0000#\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "j\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000jj,\u0000\u0000#\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/df2ea141f627d2600b135b349b67b8865a9510be.json b/cedar-integration-tests/corpus_tests/df2ea141f627d2600b135b349b67b8865a9510be.json
index 7695a39cb..5113d72e1 100644
--- a/cedar-integration-tests/corpus_tests/df2ea141f627d2600b135b349b67b8865a9510be.json
+++ b/cedar-integration-tests/corpus_tests/df2ea141f627d2600b135b349b67b8865a9510be.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\" \"",
-      "action": "Action::\"action\"",
-      "resource": "a::\" \"",
+      "principal": {
+        "type": "a",
+        "id": " "
+      },
+      "resource": {
+        "type": "a",
+        "id": " "
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\" \"",
-      "action": "Action::\"action\"",
-      "resource": "a::\" \"",
+      "principal": {
+        "type": "a",
+        "id": " "
+      },
+      "resource": {
+        "type": "a",
+        "id": " "
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\" \"",
-      "action": "Action::\"action\"",
-      "resource": "a::\" \"",
+      "principal": {
+        "type": "a",
+        "id": " "
+      },
+      "resource": {
+        "type": "a",
+        "id": " "
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\" \"",
-      "action": "Action::\"action\"",
-      "resource": "a::\" \"",
+      "principal": {
+        "type": "a",
+        "id": " "
+      },
+      "resource": {
+        "type": "a",
+        "id": " "
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\" \"",
-      "action": "Action::\"action\"",
-      "resource": "a::\" \"",
+      "principal": {
+        "type": "a",
+        "id": " "
+      },
+      "resource": {
+        "type": "a",
+        "id": " "
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\" \"",
-      "action": "Action::\"action\"",
-      "resource": "a::\" \"",
+      "principal": {
+        "type": "a",
+        "id": " "
+      },
+      "resource": {
+        "type": "a",
+        "id": " "
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\" \"",
-      "action": "Action::\"action\"",
-      "resource": "a::\" \"",
+      "principal": {
+        "type": "a",
+        "id": " "
+      },
+      "resource": {
+        "type": "a",
+        "id": " "
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\" \"",
-      "action": "Action::\"action\"",
-      "resource": "a::\" \"",
+      "principal": {
+        "type": "a",
+        "id": " "
+      },
+      "resource": {
+        "type": "a",
+        "id": " "
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/df717142035535be823880e938720aaf57529996.json b/cedar-integration-tests/corpus_tests/df717142035535be823880e938720aaf57529996.json
index c138e2b18..7c4f39a4f 100644
--- a/cedar-integration-tests/corpus_tests/df717142035535be823880e938720aaf57529996.json
+++ b/cedar-integration-tests/corpus_tests/df717142035535be823880e938720aaf57529996.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\":\\0\\066\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\0\\066\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0000\u000066"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0000\u000066"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":\\0\\066\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\0\\066\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0000\u000066"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0000\u000066"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\":\\0\\066\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\0\\066\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0000\u000066"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0000\u000066"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\0\\066\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0000\u000066"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\":\\0\\066\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\0\\066\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0000\u000066"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0000\u000066"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\":\\0\\066\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\0\\066\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0000\u000066"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0000\u000066"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\":\\0\\066\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\0\\066\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0000\u000066"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0000\u000066"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\":\\0\\066\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\\0\\066\"",
+      "principal": {
+        "type": "a",
+        "id": ":\u0000\u000066"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":\u0000\u000066"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/dfd37ed0bcf4cef38164ef8af5886926a08151ac.json b/cedar-integration-tests/corpus_tests/dfd37ed0bcf4cef38164ef8af5886926a08151ac.json
index db403913b..978b2d4c4 100644
--- a/cedar-integration-tests/corpus_tests/dfd37ed0bcf4cef38164ef8af5886926a08151ac.json
+++ b/cedar-integration-tests/corpus_tests/dfd37ed0bcf4cef38164ef8af5886926a08151ac.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e00736daebe04bcfd20e6c0fd965104fd55ef5c0.json b/cedar-integration-tests/corpus_tests/e00736daebe04bcfd20e6c0fd965104fd55ef5c0.json
index efc0db5a0..07b2925aa 100644
--- a/cedar-integration-tests/corpus_tests/e00736daebe04bcfd20e6c0fd965104fd55ef5c0.json
+++ b/cedar-integration-tests/corpus_tests/e00736daebe04bcfd20e6c0fd965104fd55ef5c0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"%\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "%"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"%\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "%"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"%\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "%"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e02e2ae73a80519758593d2206484b8292d2c004.json b/cedar-integration-tests/corpus_tests/e02e2ae73a80519758593d2206484b8292d2c004.json
index 44bddc3dc..4aa97e4e1 100644
--- a/cedar-integration-tests/corpus_tests/e02e2ae73a80519758593d2206484b8292d2c004.json
+++ b/cedar-integration-tests/corpus_tests/e02e2ae73a80519758593d2206484b8292d2c004.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"fffffffff@f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffffff@f\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffffff@f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffffff@f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"fffffffff@f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffffff@f\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffffff@f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffffff@f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"fffffffff@f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffffff@f\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffffff@f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffffff@f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"fffffffff@f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffffff@f\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffffff@f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffffff@f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"fffffffff@f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffffff@f\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffffff@f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffffff@f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"fffffffff@f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffffff@f\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffffff@f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffffff@f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"fffffffff@f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffffff@f\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffffff@f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffffff@f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"fffffffff@f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffffff@f\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffffff@f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffffff@f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e08c4572b2ce32105b85dc6fdb01c24b2b861ab9.json b/cedar-integration-tests/corpus_tests/e08c4572b2ce32105b85dc6fdb01c24b2b861ab9.json
index 0dc9a8842..cccbff788 100644
--- a/cedar-integration-tests/corpus_tests/e08c4572b2ce32105b85dc6fdb01c24b2b861ab9.json
+++ b/cedar-integration-tests/corpus_tests/e08c4572b2ce32105b85dc6fdb01c24b2b861ab9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"`\\0\\0\\0+\\0+\\0:\\u{1e}\\t\\0\\0\\0\\0\\0\\0\\0::\\0\\0+\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\\0\\0\\0+\\0+\\0:\\u{1e}\\t\\0\\0\\0\\0\\0\\0\\0::\\0\\0+\"",
+      "principal": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0000+\u0000+\u0000:\u001e\t\u0000\u0000\u0000\u0000\u0000\u0000\u0000::\u0000\u0000+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0000+\u0000+\u0000:\u001e\t\u0000\u0000\u0000\u0000\u0000\u0000\u0000::\u0000\u0000+"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"`\\0\\0\\0+\\0+\\0:\\u{1e}\\t\\0\\0\\0\\0\\0\\0\\0::\\0\\0+\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\\0\\0\\0+\\0+\\0:\\u{1e}\\t\\0\\0\\0\\0\\0\\0\\0::\\0\\0+\"",
+      "principal": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0000+\u0000+\u0000:\u001e\t\u0000\u0000\u0000\u0000\u0000\u0000\u0000::\u0000\u0000+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0000+\u0000+\u0000:\u001e\t\u0000\u0000\u0000\u0000\u0000\u0000\u0000::\u0000\u0000+"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"`\\0\\0\\0+\\0+\\0:\\u{1e}\\t\\0\\0\\0\\0\\0\\0\\0::\\0\\0+\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\\0\\0\\0+\\0+\\0:\\u{1e}\\t\\0\\0\\0\\0\\0\\0\\0::\\0\\0+\"",
+      "principal": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0000+\u0000+\u0000:\u001e\t\u0000\u0000\u0000\u0000\u0000\u0000\u0000::\u0000\u0000+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0000+\u0000+\u0000:\u001e\t\u0000\u0000\u0000\u0000\u0000\u0000\u0000::\u0000\u0000+"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"`\\0\\0\\0+\\0+\\0:\\u{1e}\\t\\0\\0\\0\\0\\0\\0\\0::\\0\\0+\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\\0\\0\\0+\\0+\\0:\\u{1e}\\t\\0\\0\\0\\0\\0\\0\\0::\\0\\0+\"",
+      "principal": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0000+\u0000+\u0000:\u001e\t\u0000\u0000\u0000\u0000\u0000\u0000\u0000::\u0000\u0000+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0000+\u0000+\u0000:\u001e\t\u0000\u0000\u0000\u0000\u0000\u0000\u0000::\u0000\u0000+"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"`\\0\\0\\0+\\0+\\0:\\u{1e}\\t\\0\\0\\0\\0\\0\\0\\0::\\0\\0+\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\\0\\0\\0+\\0+\\0:\\u{1e}\\t\\0\\0\\0\\0\\0\\0\\0::\\0\\0+\"",
+      "principal": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0000+\u0000+\u0000:\u001e\t\u0000\u0000\u0000\u0000\u0000\u0000\u0000::\u0000\u0000+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0000+\u0000+\u0000:\u001e\t\u0000\u0000\u0000\u0000\u0000\u0000\u0000::\u0000\u0000+"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"`\\0\\0\\0+\\0+\\0:\\u{1e}\\t\\0\\0\\0\\0\\0\\0\\0::\\0\\0+\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\\0\\0\\0+\\0+\\0:\\u{1e}\\t\\0\\0\\0\\0\\0\\0\\0::\\0\\0+\"",
+      "principal": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0000+\u0000+\u0000:\u001e\t\u0000\u0000\u0000\u0000\u0000\u0000\u0000::\u0000\u0000+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0000+\u0000+\u0000:\u001e\t\u0000\u0000\u0000\u0000\u0000\u0000\u0000::\u0000\u0000+"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"`\\0\\0\\0+\\0+\\0:\\u{1e}\\t\\0\\0\\0\\0\\0\\0\\0::\\0\\0+\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\\0\\0\\0+\\0+\\0:\\u{1e}\\t\\0\\0\\0\\0\\0\\0\\0::\\0\\0+\"",
+      "principal": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0000+\u0000+\u0000:\u001e\t\u0000\u0000\u0000\u0000\u0000\u0000\u0000::\u0000\u0000+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0000+\u0000+\u0000:\u001e\t\u0000\u0000\u0000\u0000\u0000\u0000\u0000::\u0000\u0000+"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"`\\0\\0\\0+\\0+\\0:\\u{1e}\\t\\0\\0\\0\\0\\0\\0\\0::\\0\\0+\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\\0\\0\\0+\\0+\\0:\\u{1e}\\t\\0\\0\\0\\0\\0\\0\\0::\\0\\0+\"",
+      "principal": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0000+\u0000+\u0000:\u001e\t\u0000\u0000\u0000\u0000\u0000\u0000\u0000::\u0000\u0000+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`\u0000\u0000\u0000+\u0000+\u0000:\u001e\t\u0000\u0000\u0000\u0000\u0000\u0000\u0000::\u0000\u0000+"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e0ebbf3d5634bff7fd8eeec171b1d07009eb1d3a.json b/cedar-integration-tests/corpus_tests/e0ebbf3d5634bff7fd8eeec171b1d07009eb1d3a.json
index ef23e650c..c04485158 100644
--- a/cedar-integration-tests/corpus_tests/e0ebbf3d5634bff7fd8eeec171b1d07009eb1d3a.json
+++ b/cedar-integration-tests/corpus_tests/e0ebbf3d5634bff7fd8eeec171b1d07009eb1d3a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"(\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "(\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "(\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"(\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "(\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e0f6913f9fa8b06d1b2a1b8b6c02087585d7f986.json b/cedar-integration-tests/corpus_tests/e0f6913f9fa8b06d1b2a1b8b6c02087585d7f986.json
index 2c5ae6696..eb752385f 100644
--- a/cedar-integration-tests/corpus_tests/e0f6913f9fa8b06d1b2a1b8b6c02087585d7f986.json
+++ b/cedar-integration-tests/corpus_tests/e0f6913f9fa8b06d1b2a1b8b6c02087585d7f986.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"1\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "1"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e1054ea00da58f9e88b5d0c37f9193392debe301.json b/cedar-integration-tests/corpus_tests/e1054ea00da58f9e88b5d0c37f9193392debe301.json
index 7eb5e960d..8c1995d61 100644
--- a/cedar-integration-tests/corpus_tests/e1054ea00da58f9e88b5d0c37f9193392debe301.json
+++ b/cedar-integration-tests/corpus_tests/e1054ea00da58f9e88b5d0c37f9193392debe301.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e11632e1f05db154fc98307f5d892a24885d5c82.json b/cedar-integration-tests/corpus_tests/e11632e1f05db154fc98307f5d892a24885d5c82.json
index f1fb24831..b2aea9b0f 100644
--- a/cedar-integration-tests/corpus_tests/e11632e1f05db154fc98307f5d892a24885d5c82.json
+++ b/cedar-integration-tests/corpus_tests/e11632e1f05db154fc98307f5d892a24885d5c82.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e13beaca1968a7be4d266e384804a132493e8399.json b/cedar-integration-tests/corpus_tests/e13beaca1968a7be4d266e384804a132493e8399.json
index 8420ff9c5..0f2676a9f 100644
--- a/cedar-integration-tests/corpus_tests/e13beaca1968a7be4d266e384804a132493e8399.json
+++ b/cedar-integration-tests/corpus_tests/e13beaca1968a7be4d266e384804a132493e8399.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlqsllgqrY": false,
         "r": ""
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlqsllgqrY": false,
         "r": ""
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlqsllgqrY": false,
         "r": ""
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlqsllgqrY": false,
         "r": ""
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlqsllgqrY": false,
         "r": ""
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlqsllgqrY": false,
         "r": ""
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlqsllgqrY": false,
         "r": ""
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "DlqsllgqrY": false,
         "r": ""
diff --git a/cedar-integration-tests/corpus_tests/e1556236f75c560e53317db95265b0e5f0f65480.json b/cedar-integration-tests/corpus_tests/e1556236f75c560e53317db95265b0e5f0f65480.json
index 579ba2c03..ec9df7759 100644
--- a/cedar-integration-tests/corpus_tests/e1556236f75c560e53317db95265b0e5f0f65480.json
+++ b/cedar-integration-tests/corpus_tests/e1556236f75c560e53317db95265b0e5f0f65480.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "KhdRhhh::a::\"\\'.\"",
-      "action": "KhdRhhh::Action::\"action\"",
-      "resource": "KhdRhhh::a::\"\\'.\"",
+      "principal": {
+        "type": "KhdRhhh::a",
+        "id": "'."
+      },
+      "resource": {
+        "type": "KhdRhhh::a",
+        "id": "'."
+      },
+      "action": {
+        "type": "KhdRhhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "KhdRhhh::a::\"\\'.\"",
-      "action": "KhdRhhh::Action::\"action\"",
-      "resource": "KhdRhhh::a::\"\\'.\"",
+      "principal": {
+        "type": "KhdRhhh::a",
+        "id": "'."
+      },
+      "resource": {
+        "type": "KhdRhhh::a",
+        "id": "'."
+      },
+      "action": {
+        "type": "KhdRhhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "KhdRhhh::a::\"\\'.\"",
-      "action": "KhdRhhh::Action::\"action\"",
-      "resource": "KhdRhhh::a::\"\\'.\"",
+      "principal": {
+        "type": "KhdRhhh::a",
+        "id": "'."
+      },
+      "resource": {
+        "type": "KhdRhhh::a",
+        "id": "'."
+      },
+      "action": {
+        "type": "KhdRhhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "KhdRhhh::a::\"\\'.\"",
-      "action": "KhdRhhh::Action::\"action\"",
-      "resource": "KhdRhhh::a::\"\\'.\"",
+      "principal": {
+        "type": "KhdRhhh::a",
+        "id": "'."
+      },
+      "resource": {
+        "type": "KhdRhhh::a",
+        "id": "'."
+      },
+      "action": {
+        "type": "KhdRhhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "KhdRhhh::a::\"\\'.\"",
-      "action": "KhdRhhh::Action::\"action\"",
-      "resource": "KhdRhhh::a::\"\\'.\"",
+      "principal": {
+        "type": "KhdRhhh::a",
+        "id": "'."
+      },
+      "resource": {
+        "type": "KhdRhhh::a",
+        "id": "'."
+      },
+      "action": {
+        "type": "KhdRhhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "KhdRhhh::a::\"\\'.\"",
-      "action": "KhdRhhh::Action::\"action\"",
-      "resource": "KhdRhhh::a::\"\\'.\"",
+      "principal": {
+        "type": "KhdRhhh::a",
+        "id": "'."
+      },
+      "resource": {
+        "type": "KhdRhhh::a",
+        "id": "'."
+      },
+      "action": {
+        "type": "KhdRhhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "KhdRhhh::a::\"\\'.\"",
-      "action": "KhdRhhh::Action::\"action\"",
-      "resource": "KhdRhhh::a::\"\\'.\"",
+      "principal": {
+        "type": "KhdRhhh::a",
+        "id": "'."
+      },
+      "resource": {
+        "type": "KhdRhhh::a",
+        "id": "'."
+      },
+      "action": {
+        "type": "KhdRhhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "KhdRhhh::a::\"\\'.\"",
-      "action": "KhdRhhh::Action::\"action\"",
-      "resource": "KhdRhhh::a::\"\\'.\"",
+      "principal": {
+        "type": "KhdRhhh::a",
+        "id": "'."
+      },
+      "resource": {
+        "type": "KhdRhhh::a",
+        "id": "'."
+      },
+      "action": {
+        "type": "KhdRhhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e197f2fde87822377f06d1fd153e29b62e06f8d3.json b/cedar-integration-tests/corpus_tests/e197f2fde87822377f06d1fd153e29b62e06f8d3.json
index f76bad6d6..9e7d89250 100644
--- a/cedar-integration-tests/corpus_tests/e197f2fde87822377f06d1fd153e29b62e06f8d3.json
+++ b/cedar-integration-tests/corpus_tests/e197f2fde87822377f06d1fd153e29b62e06f8d3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{5}UUUUUU\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0005UUUUUU"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{5}UUUUUU\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{5}UUUUUU\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0005UUUUUU"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0005UUUUUU"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{5}UUUUUU\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{5}UUUUUU\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0005UUUUUU"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0005UUUUUU"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{5}UUUUUU\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{5}UUUUUU\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0005UUUUUU"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0005UUUUUU"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{5}UUUUUU\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{5}UUUUUU\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0005UUUUUU"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0005UUUUUU"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{5}UUUUUU\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{5}UUUUUU\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0005UUUUUU"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0005UUUUUU"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{5}UUUUUU\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{5}UUUUUU\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0005UUUUUU"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0005UUUUUU"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{5}UUUUUU\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{5}UUUUUU\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0005UUUUUU"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0005UUUUUU"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e19acb87614d3ba808a7e95b203cfe400d534c09.json b/cedar-integration-tests/corpus_tests/e19acb87614d3ba808a7e95b203cfe400d534c09.json
index 9329ca77a..e18de9488 100644
--- a/cedar-integration-tests/corpus_tests/e19acb87614d3ba808a7e95b203cfe400d534c09.json
+++ b/cedar-integration-tests/corpus_tests/e19acb87614d3ba808a7e95b203cfe400d534c09.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"F\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "F"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"F\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "F"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"F\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "F"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"F\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "F"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"F\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "F"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"F\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "F"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"F\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "F"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"F\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "F"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e1ab6dbdab417662086f05cf5cef4783c9527df5.json b/cedar-integration-tests/corpus_tests/e1ab6dbdab417662086f05cf5cef4783c9527df5.json
index 380b89667..0ea1fe61e 100644
--- a/cedar-integration-tests/corpus_tests/e1ab6dbdab417662086f05cf5cef4783c9527df5.json
+++ b/cedar-integration-tests/corpus_tests/e1ab6dbdab417662086f05cf5cef4783c9527df5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::r00::B::a::\"\"",
-      "action": "r::r::r00::B::Action::\"\"",
-      "resource": "r::r::r00::B::a::\"\"",
+      "principal": {
+        "type": "r::r::r00::B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r00::B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r00::B::Action",
+        "id": ""
+      },
       "context": {
         "Wjjjjjux2": {
           "__entity": {
@@ -25,9 +34,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::r00::B::a::\"\"",
-      "action": "r::r::r00::B::Action::\"\"",
-      "resource": "r::r::r00::B::a::\"\"",
+      "principal": {
+        "type": "r::r::r00::B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r00::B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r00::B::Action",
+        "id": ""
+      },
       "context": {
         "Wjjjjjux2": {
           "__entity": {
@@ -44,9 +62,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::r00::B::a::\"\"",
-      "action": "r::r::r00::B::Action::\"\"",
-      "resource": "r::r::r00::B::a::\"\"",
+      "principal": {
+        "type": "r::r::r00::B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r00::B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r00::B::Action",
+        "id": ""
+      },
       "context": {
         "Wjjjjjux2": {
           "__entity": {
@@ -63,9 +90,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::r00::B::a::\"\"",
-      "action": "r::r::r00::B::Action::\"\"",
-      "resource": "r::r::r00::B::a::\"\"",
+      "principal": {
+        "type": "r::r::r00::B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r00::B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r00::B::Action",
+        "id": ""
+      },
       "context": {
         "Wjjjjjux2": {
           "__entity": {
@@ -82,9 +118,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::r00::B::a::\"\"",
-      "action": "r::r::r00::B::Action::\"\"",
-      "resource": "r::r::r00::B::a::\"\"",
+      "principal": {
+        "type": "r::r::r00::B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r00::B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r00::B::Action",
+        "id": ""
+      },
       "context": {
         "Wjjjjjux2": {
           "__entity": {
@@ -101,9 +146,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::r00::B::a::\"\"",
-      "action": "r::r::r00::B::Action::\"\"",
-      "resource": "r::r::r00::B::a::\"\"",
+      "principal": {
+        "type": "r::r::r00::B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r00::B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r00::B::Action",
+        "id": ""
+      },
       "context": {
         "Wjjjjjux2": {
           "__entity": {
@@ -120,9 +174,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::r00::B::a::\"\"",
-      "action": "r::r::r00::B::Action::\"\"",
-      "resource": "r::r::r00::B::a::\"\"",
+      "principal": {
+        "type": "r::r::r00::B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r00::B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r00::B::Action",
+        "id": ""
+      },
       "context": {
         "Wjjjjjux2": {
           "__entity": {
@@ -139,9 +202,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::r00::B::a::\"\"",
-      "action": "r::r::r00::B::Action::\"\"",
-      "resource": "r::r::r00::B::a::\"\"",
+      "principal": {
+        "type": "r::r::r00::B::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r00::B::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r00::B::Action",
+        "id": ""
+      },
       "context": {
         "Wjjjjjux2": {
           "__entity": {
diff --git a/cedar-integration-tests/corpus_tests/e1c6e1fbb078a7b301b99741c2c13e7648f0ba5a.json b/cedar-integration-tests/corpus_tests/e1c6e1fbb078a7b301b99741c2c13e7648f0ba5a.json
index 3c4b05afd..b249f9f8a 100644
--- a/cedar-integration-tests/corpus_tests/e1c6e1fbb078a7b301b99741c2c13e7648f0ba5a.json
+++ b/cedar-integration-tests/corpus_tests/e1c6e1fbb078a7b301b99741c2c13e7648f0ba5a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00000\"",
+      "principal": {
+        "type": "a",
+        "id": "00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00000\"",
+      "principal": {
+        "type": "a",
+        "id": "00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00000\"",
+      "principal": {
+        "type": "a",
+        "id": "00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00000\"",
+      "principal": {
+        "type": "a",
+        "id": "00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00000\"",
+      "principal": {
+        "type": "a",
+        "id": "00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00000\"",
+      "principal": {
+        "type": "a",
+        "id": "00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00000\"",
+      "principal": {
+        "type": "a",
+        "id": "00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00000\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00000\"",
+      "principal": {
+        "type": "a",
+        "id": "00000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e2000abaad107d213c8ca19cb289745b6781ae4f.json b/cedar-integration-tests/corpus_tests/e2000abaad107d213c8ca19cb289745b6781ae4f.json
index 7f0e6493d..d2514ad50 100644
--- a/cedar-integration-tests/corpus_tests/e2000abaad107d213c8ca19cb289745b6781ae4f.json
+++ b/cedar-integration-tests/corpus_tests/e2000abaad107d213c8ca19cb289745b6781ae4f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Vhhhhhhkkkkkkkkkk::\"\\u{13}\\0\\0.\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkkkkkkkk::\"\\u{13}\\0\\0.\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkkk",
+        "id": "\u0013\u0000\u0000."
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkkkkkkkk",
+        "id": "\u0013\u0000\u0000."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Vhhhhhhkkkkkkkkkk::\"\\u{13}\\0\\0.\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkkkkkkkk::\"\\u{13}\\0\\0.\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkkk",
+        "id": "\u0013\u0000\u0000."
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkkkkkkkk",
+        "id": "\u0013\u0000\u0000."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Vhhhhhhkkkkkkkkkk::\"\\u{13}\\0\\0.\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkkkkkkkk::\"\\u{13}\\0\\0.\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkkk",
+        "id": "\u0013\u0000\u0000."
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkkkkkkkk",
+        "id": "\u0013\u0000\u0000."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Vhhhhhhkkkkkkkkkk::\"\\u{13}\\0\\0.\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkkkkkkkk::\"\\u{13}\\0\\0.\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkkk",
+        "id": "\u0013\u0000\u0000."
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkkkkkkkk",
+        "id": "\u0013\u0000\u0000."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Vhhhhhhkkkkkkkkkk::\"\\u{13}\\0\\0.\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkkkkkkkk::\"\\u{13}\\0\\0.\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkkk",
+        "id": "\u0013\u0000\u0000."
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkkkkkkkk",
+        "id": "\u0013\u0000\u0000."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Vhhhhhhkkkkkkkkkk::\"\\u{13}\\0\\0.\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkkkkkkkk::\"\\u{13}\\0\\0.\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkkk",
+        "id": "\u0013\u0000\u0000."
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkkkkkkkk",
+        "id": "\u0013\u0000\u0000."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Vhhhhhhkkkkkkkkkk::\"\\u{13}\\0\\0.\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkkkkkkkk::\"\\u{13}\\0\\0.\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkkk",
+        "id": "\u0013\u0000\u0000."
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkkkkkkkk",
+        "id": "\u0013\u0000\u0000."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Vhhhhhhkkkkkkkkkk::\"\\u{13}\\0\\0.\"",
-      "action": "Action::\"action\"",
-      "resource": "Vhhhhhhkkkkkkkkkk::\"\\u{13}\\0\\0.\"",
+      "principal": {
+        "type": "Vhhhhhhkkkkkkkkkk",
+        "id": "\u0013\u0000\u0000."
+      },
+      "resource": {
+        "type": "Vhhhhhhkkkkkkkkkk",
+        "id": "\u0013\u0000\u0000."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e2111cc0296021a6f030cdfb095950c06fae3f78.json b/cedar-integration-tests/corpus_tests/e2111cc0296021a6f030cdfb095950c06fae3f78.json
index 58892be1d..89fcc3274 100644
--- a/cedar-integration-tests/corpus_tests/e2111cc0296021a6f030cdfb095950c06fae3f78.json
+++ b/cedar-integration-tests/corpus_tests/e2111cc0296021a6f030cdfb095950c06fae3f78.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"c\"",
+      "principal": {
+        "type": "a",
+        "id": "c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"c\"",
+      "principal": {
+        "type": "a",
+        "id": "c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"c\"",
+      "principal": {
+        "type": "a",
+        "id": "c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"c\"",
+      "principal": {
+        "type": "a",
+        "id": "c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"c\"",
+      "principal": {
+        "type": "a",
+        "id": "c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"c\"",
+      "principal": {
+        "type": "a",
+        "id": "c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"c\"",
+      "principal": {
+        "type": "a",
+        "id": "c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"c\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"c\"",
+      "principal": {
+        "type": "a",
+        "id": "c"
+      },
+      "resource": {
+        "type": "a",
+        "id": "c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e22554bbfd7bd35ff8ad7ff836fb4328fd0f5201.json b/cedar-integration-tests/corpus_tests/e22554bbfd7bd35ff8ad7ff836fb4328fd0f5201.json
index 7486c6c3d..7998b475d 100644
--- a/cedar-integration-tests/corpus_tests/e22554bbfd7bd35ff8ad7ff836fb4328fd0f5201.json
+++ b/cedar-integration-tests/corpus_tests/e22554bbfd7bd35ff8ad7ff836fb4328fd0f5201.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"RRRR\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"RRRR\"",
+      "principal": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "resource": {
+        "type": "a",
+        "id": "RRRR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e233918b812003894eaadf8eb48360bcbe08e55f.json b/cedar-integration-tests/corpus_tests/e233918b812003894eaadf8eb48360bcbe08e55f.json
index d20e53f15..ae8361a63 100644
--- a/cedar-integration-tests/corpus_tests/e233918b812003894eaadf8eb48360bcbe08e55f.json
+++ b/cedar-integration-tests/corpus_tests/e233918b812003894eaadf8eb48360bcbe08e55f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::r::w::\"\"",
-      "action": "r::r::r::Action::\"\"",
-      "resource": "r::r::r::w::\"\"",
+      "principal": {
+        "type": "r::r::r::w",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::w",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::r::w::\"\"",
-      "action": "r::r::r::Action::\"\"",
-      "resource": "r::r::r::w::\"\"",
+      "principal": {
+        "type": "r::r::r::w",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::w",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::r::w::\"\"",
-      "action": "r::r::r::Action::\"\"",
-      "resource": "r::r::r::w::\"\"",
+      "principal": {
+        "type": "r::r::r::w",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::w",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::r::w::\"\"",
-      "action": "r::r::r::Action::\"\"",
-      "resource": "r::r::r::w::\"\"",
+      "principal": {
+        "type": "r::r::r::w",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::w",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::r::w::\"\"",
-      "action": "r::r::r::Action::\"\"",
-      "resource": "r::r::r::w::\"\"",
+      "principal": {
+        "type": "r::r::r::w",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::w",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::r::w::\"\"",
-      "action": "r::r::r::Action::\"\"",
-      "resource": "r::r::r::w::\"\"",
+      "principal": {
+        "type": "r::r::r::w",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::w",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::r::w::\"\"",
-      "action": "r::r::r::Action::\"\"",
-      "resource": "r::r::r::w::\"\"",
+      "principal": {
+        "type": "r::r::r::w",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::w",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::r::w::\"\"",
-      "action": "r::r::r::Action::\"\"",
-      "resource": "r::r::r::w::\"\"",
+      "principal": {
+        "type": "r::r::r::w",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::w",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e265048e41123c7389400efd99019d7a42fb70cb.json b/cedar-integration-tests/corpus_tests/e265048e41123c7389400efd99019d7a42fb70cb.json
index 78976cf96..9efb49c53 100644
--- a/cedar-integration-tests/corpus_tests/e265048e41123c7389400efd99019d7a42fb70cb.json
+++ b/cedar-integration-tests/corpus_tests/e265048e41123c7389400efd99019d7a42fb70cb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e2936934f407e850db2cd8ac2673cf9b5ff22edb.json b/cedar-integration-tests/corpus_tests/e2936934f407e850db2cd8ac2673cf9b5ff22edb.json
index 4744370e1..eee908d21 100644
--- a/cedar-integration-tests/corpus_tests/e2936934f407e850db2cd8ac2673cf9b5ff22edb.json
+++ b/cedar-integration-tests/corpus_tests/e2936934f407e850db2cd8ac2673cf9b5ff22edb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"V\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"V\"",
+      "principal": {
+        "type": "a",
+        "id": "V"
+      },
+      "resource": {
+        "type": "a",
+        "id": "V"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"V\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "V"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"V\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"V\"",
+      "principal": {
+        "type": "a",
+        "id": "V"
+      },
+      "resource": {
+        "type": "a",
+        "id": "V"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"V\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"V\"",
+      "principal": {
+        "type": "a",
+        "id": "V"
+      },
+      "resource": {
+        "type": "a",
+        "id": "V"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e2c3298a9025cabbcf814803d3a81cf93ced082e.json b/cedar-integration-tests/corpus_tests/e2c3298a9025cabbcf814803d3a81cf93ced082e.json
index cea7d8a65..0952bfc24 100644
--- a/cedar-integration-tests/corpus_tests/e2c3298a9025cabbcf814803d3a81cf93ced082e.json
+++ b/cedar-integration-tests/corpus_tests/e2c3298a9025cabbcf814803d3a81cf93ced082e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e2cb81812331e4010069807d549e5a9969295734.json b/cedar-integration-tests/corpus_tests/e2cb81812331e4010069807d549e5a9969295734.json
index 87f64e56d..91d1d2604 100644
--- a/cedar-integration-tests/corpus_tests/e2cb81812331e4010069807d549e5a9969295734.json
+++ b/cedar-integration-tests/corpus_tests/e2cb81812331e4010069807d549e5a9969295734.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e2cce766fd4f34d8e68da07dea8946df560b0ccb.json b/cedar-integration-tests/corpus_tests/e2cce766fd4f34d8e68da07dea8946df560b0ccb.json
index f547db32f..31e0b9c65 100644
--- a/cedar-integration-tests/corpus_tests/e2cce766fd4f34d8e68da07dea8946df560b0ccb.json
+++ b/cedar-integration-tests/corpus_tests/e2cce766fd4f34d8e68da07dea8946df560b0ccb.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Khhhhhf::\"$\\0K\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhhhhf::\"$\\0K\"",
+      "principal": {
+        "type": "Khhhhhf",
+        "id": "$\u0000K"
+      },
+      "resource": {
+        "type": "Khhhhhf",
+        "id": "$\u0000K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Khhhhhf::\"$\\0K\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhhhhf::\"$\\0K\"",
+      "principal": {
+        "type": "Khhhhhf",
+        "id": "$\u0000K"
+      },
+      "resource": {
+        "type": "Khhhhhf",
+        "id": "$\u0000K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Khhhhhf::\"$\\0K\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhhhhf::\"$\\0K\"",
+      "principal": {
+        "type": "Khhhhhf",
+        "id": "$\u0000K"
+      },
+      "resource": {
+        "type": "Khhhhhf",
+        "id": "$\u0000K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Khhhhhf::\"$\\0K\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhhhhf::\"$\\0K\"",
+      "principal": {
+        "type": "Khhhhhf",
+        "id": "$\u0000K"
+      },
+      "resource": {
+        "type": "Khhhhhf",
+        "id": "$\u0000K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Khhhhhf::\"$\\0K\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhhhhf::\"$\\0K\"",
+      "principal": {
+        "type": "Khhhhhf",
+        "id": "$\u0000K"
+      },
+      "resource": {
+        "type": "Khhhhhf",
+        "id": "$\u0000K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Khhhhhf::\"$\\0K\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhhhhf::\"$\\0K\"",
+      "principal": {
+        "type": "Khhhhhf",
+        "id": "$\u0000K"
+      },
+      "resource": {
+        "type": "Khhhhhf",
+        "id": "$\u0000K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Khhhhhf::\"$\\0K\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhhhhf::\"$\\0K\"",
+      "principal": {
+        "type": "Khhhhhf",
+        "id": "$\u0000K"
+      },
+      "resource": {
+        "type": "Khhhhhf",
+        "id": "$\u0000K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Khhhhhf::\"$\\0K\"",
-      "action": "Action::\"action\"",
-      "resource": "Khhhhhf::\"$\\0K\"",
+      "principal": {
+        "type": "Khhhhhf",
+        "id": "$\u0000K"
+      },
+      "resource": {
+        "type": "Khhhhhf",
+        "id": "$\u0000K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e2dcc9016e893ab66204bb8a0b802a61432ab015.json b/cedar-integration-tests/corpus_tests/e2dcc9016e893ab66204bb8a0b802a61432ab015.json
index 79ac7370e..949f1739e 100644
--- a/cedar-integration-tests/corpus_tests/e2dcc9016e893ab66204bb8a0b802a61432ab015.json
+++ b/cedar-integration-tests/corpus_tests/e2dcc9016e893ab66204bb8a0b802a61432ab015.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e30bdae252646a9315f7fc3c5014eb07821d7094.json b/cedar-integration-tests/corpus_tests/e30bdae252646a9315f7fc3c5014eb07821d7094.json
index 692a0d194..d81026355 100644
--- a/cedar-integration-tests/corpus_tests/e30bdae252646a9315f7fc3c5014eb07821d7094.json
+++ b/cedar-integration-tests/corpus_tests/e30bdae252646a9315f7fc3c5014eb07821d7094.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e31f633399d05fce053acfac28313be326a1cc33.json b/cedar-integration-tests/corpus_tests/e31f633399d05fce053acfac28313be326a1cc33.json
index f403ebf3a..dbd8e943a 100644
--- a/cedar-integration-tests/corpus_tests/e31f633399d05fce053acfac28313be326a1cc33.json
+++ b/cedar-integration-tests/corpus_tests/e31f633399d05fce053acfac28313be326a1cc33.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -72,9 +126,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -82,9 +145,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e357d040862fab0ebee3c62b8c96810d5b69cf0a.json b/cedar-integration-tests/corpus_tests/e357d040862fab0ebee3c62b8c96810d5b69cf0a.json
index 219ca0175..3de4cdb64 100644
--- a/cedar-integration-tests/corpus_tests/e357d040862fab0ebee3c62b8c96810d5b69cf0a.json
+++ b/cedar-integration-tests/corpus_tests/e357d040862fab0ebee3c62b8c96810d5b69cf0a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"::\\0\\0::\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0::\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000::\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000::\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"::\\0\\0::\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0::\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000::\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000::\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"::\\0\\0::\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0::\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000::\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000::\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"::\\0\\0::\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0::\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000::\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000::\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"::\\0\\0::\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0::\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000::\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000::\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"::\\0\\0::\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0::\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000::\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000::\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"::\\0\\0::\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0::\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000::\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000::\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"::\\0\\0::\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::\\0\\0::\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "::\u0000\u0000::\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::\u0000\u0000::\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e36cbecf2f92d04516d732299b0ce7902b7566e9.json b/cedar-integration-tests/corpus_tests/e36cbecf2f92d04516d732299b0ce7902b7566e9.json
index d2344357e..30fe91232 100644
--- a/cedar-integration-tests/corpus_tests/e36cbecf2f92d04516d732299b0ce7902b7566e9.json
+++ b/cedar-integration-tests/corpus_tests/e36cbecf2f92d04516d732299b0ce7902b7566e9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "R::Wj::AJHH::a::\"\"",
-      "action": "R::Wj::AJHH::Action::\"action\"",
-      "resource": "R::Wj::AJHH::a::\"\"",
+      "principal": {
+        "type": "R::Wj::AJHH::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::AJHH::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "R::Wj::AJHH::a::\"\"",
-      "action": "R::Wj::AJHH::Action::\"action\"",
-      "resource": "R::Wj::AJHH::a::\"\"",
+      "principal": {
+        "type": "R::Wj::AJHH::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::AJHH::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "R::Wj::AJHH::a::\"\"",
-      "action": "R::Wj::AJHH::Action::\"action\"",
-      "resource": "R::Wj::AJHH::a::\"\"",
+      "principal": {
+        "type": "R::Wj::AJHH::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::AJHH::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "R::Wj::AJHH::a::\"\"",
-      "action": "R::Wj::AJHH::Action::\"action\"",
-      "resource": "R::Wj::AJHH::a::\"\"",
+      "principal": {
+        "type": "R::Wj::AJHH::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::AJHH::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "R::Wj::AJHH::a::\"\"",
-      "action": "R::Wj::AJHH::Action::\"action\"",
-      "resource": "R::Wj::AJHH::a::\"\"",
+      "principal": {
+        "type": "R::Wj::AJHH::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::AJHH::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "R::Wj::AJHH::a::\"\"",
-      "action": "R::Wj::AJHH::Action::\"action\"",
-      "resource": "R::Wj::AJHH::a::\"\"",
+      "principal": {
+        "type": "R::Wj::AJHH::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::AJHH::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "R::Wj::AJHH::a::\"\"",
-      "action": "R::Wj::AJHH::Action::\"action\"",
-      "resource": "R::Wj::AJHH::a::\"\"",
+      "principal": {
+        "type": "R::Wj::AJHH::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::AJHH::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "R::Wj::AJHH::a::\"\"",
-      "action": "R::Wj::AJHH::Action::\"action\"",
-      "resource": "R::Wj::AJHH::a::\"\"",
+      "principal": {
+        "type": "R::Wj::AJHH::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "R::Wj::AJHH::a",
+        "id": ""
+      },
+      "action": {
+        "type": "R::Wj::AJHH::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e3759308a17eaea1b8f0eeafb7a36ac12b0f7f6d.json b/cedar-integration-tests/corpus_tests/e3759308a17eaea1b8f0eeafb7a36ac12b0f7f6d.json
index 47fd87d99..14d48f8cd 100644
--- a/cedar-integration-tests/corpus_tests/e3759308a17eaea1b8f0eeafb7a36ac12b0f7f6d.json
+++ b/cedar-integration-tests/corpus_tests/e3759308a17eaea1b8f0eeafb7a36ac12b0f7f6d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}co\\u{2}\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}cx\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}co\\u{2}\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}cx\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002co\u0002\n\u0002\u0002\u0002\u0002\u0002\u0002cx\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002co\u0002\n\u0002\u0002\u0002\u0002\u0002\u0002cx\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}co\\u{2}\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}cx\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}co\\u{2}\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}cx\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002co\u0002\n\u0002\u0002\u0002\u0002\u0002\u0002cx\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002co\u0002\n\u0002\u0002\u0002\u0002\u0002\u0002cx\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}co\\u{2}\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}cx\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}co\\u{2}\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}cx\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002co\u0002\n\u0002\u0002\u0002\u0002\u0002\u0002cx\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002co\u0002\n\u0002\u0002\u0002\u0002\u0002\u0002cx\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}co\\u{2}\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}cx\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}co\\u{2}\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}cx\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002co\u0002\n\u0002\u0002\u0002\u0002\u0002\u0002cx\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002co\u0002\n\u0002\u0002\u0002\u0002\u0002\u0002cx\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}co\\u{2}\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}cx\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}co\\u{2}\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}cx\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002co\u0002\n\u0002\u0002\u0002\u0002\u0002\u0002cx\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002co\u0002\n\u0002\u0002\u0002\u0002\u0002\u0002cx\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}co\\u{2}\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}cx\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}co\\u{2}\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}cx\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002co\u0002\n\u0002\u0002\u0002\u0002\u0002\u0002cx\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002co\u0002\n\u0002\u0002\u0002\u0002\u0002\u0002cx\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}co\\u{2}\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}cx\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}co\\u{2}\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}cx\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002co\u0002\n\u0002\u0002\u0002\u0002\u0002\u0002cx\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002co\u0002\n\u0002\u0002\u0002\u0002\u0002\u0002cx\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}co\\u{2}\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}cx\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}co\\u{2}\\n\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}cx\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002co\u0002\n\u0002\u0002\u0002\u0002\u0002\u0002cx\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002co\u0002\n\u0002\u0002\u0002\u0002\u0002\u0002cx\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e394f695a1aa025b2d33cd869402a81812088afd.json b/cedar-integration-tests/corpus_tests/e394f695a1aa025b2d33cd869402a81812088afd.json
index 682625ca8..9fb589e3d 100644
--- a/cedar-integration-tests/corpus_tests/e394f695a1aa025b2d33cd869402a81812088afd.json
+++ b/cedar-integration-tests/corpus_tests/e394f695a1aa025b2d33cd869402a81812088afd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"+\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"+\"",
+      "principal": {
+        "type": "a",
+        "id": "+"
+      },
+      "resource": {
+        "type": "a",
+        "id": "+"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e3a072a600dd8a6a3b7b100427c15066f1f4abb6.json b/cedar-integration-tests/corpus_tests/e3a072a600dd8a6a3b7b100427c15066f1f4abb6.json
index 9926367fe..69535158b 100644
--- a/cedar-integration-tests/corpus_tests/e3a072a600dd8a6a3b7b100427c15066f1f4abb6.json
+++ b/cedar-integration-tests/corpus_tests/e3a072a600dd8a6a3b7b100427c15066f1f4abb6.json
@@ -7,8 +7,14 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "stYWqsx::Action::\"\"",
-      "resource": "stYWqsx::a::\"\"",
+      "resource": {
+        "type": "stYWqsx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "stYWqsx::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +25,14 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "stYWqsx::Action::\"\"",
-      "resource": "stYWqsx::a::\"\"",
+      "resource": {
+        "type": "stYWqsx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "stYWqsx::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +43,14 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "stYWqsx::Action::\"\"",
-      "resource": "stYWqsx::a::\"\"",
+      "resource": {
+        "type": "stYWqsx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "stYWqsx::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +61,14 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "stYWqsx::Action::\"\"",
-      "resource": "stYWqsx::a::\"\"",
+      "resource": {
+        "type": "stYWqsx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "stYWqsx::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +79,14 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "stYWqsx::Action::\"\"",
-      "resource": "stYWqsx::a::\"\"",
+      "resource": {
+        "type": "stYWqsx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "stYWqsx::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +97,14 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "stYWqsx::Action::\"\"",
-      "resource": "stYWqsx::a::\"\"",
+      "resource": {
+        "type": "stYWqsx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "stYWqsx::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +115,14 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "stYWqsx::Action::\"\"",
-      "resource": "stYWqsx::a::\"\"",
+      "resource": {
+        "type": "stYWqsx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "stYWqsx::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +133,14 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "stYWqsx::Action::\"\"",
-      "resource": "stYWqsx::a::\"\"",
+      "resource": {
+        "type": "stYWqsx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "stYWqsx::Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e3b78e66463b8a1a89f57b5c2600623f923d00cf.json b/cedar-integration-tests/corpus_tests/e3b78e66463b8a1a89f57b5c2600623f923d00cf.json
index 5d66342e0..f4f31e148 100644
--- a/cedar-integration-tests/corpus_tests/e3b78e66463b8a1a89f57b5c2600623f923d00cf.json
+++ b/cedar-integration-tests/corpus_tests/e3b78e66463b8a1a89f57b5c2600623f923d00cf.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e3bff26c81d2d23ef3cd5e9a30a37d299fd579c3.json b/cedar-integration-tests/corpus_tests/e3bff26c81d2d23ef3cd5e9a30a37d299fd579c3.json
index 8cbe15701..34cf24a52 100644
--- a/cedar-integration-tests/corpus_tests/e3bff26c81d2d23ef3cd5e9a30a37d299fd579c3.json
+++ b/cedar-integration-tests/corpus_tests/e3bff26c81d2d23ef3cd5e9a30a37d299fd579c3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "q::a::\"\"",
-      "action": "q::Action::\"action\"",
-      "resource": "q::a::\"\"",
+      "principal": {
+        "type": "q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "q::a::\"\"",
-      "action": "q::Action::\"action\"",
-      "resource": "q::a::\"\"",
+      "principal": {
+        "type": "q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "q::a::\"\"",
-      "action": "q::Action::\"action\"",
-      "resource": "q::a::\"\"",
+      "principal": {
+        "type": "q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "q::a::\"\"",
-      "action": "q::Action::\"action\"",
-      "resource": "q::a::\"\"",
+      "principal": {
+        "type": "q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "q::a::\"\"",
-      "action": "q::Action::\"action\"",
-      "resource": "q::a::\"\"",
+      "principal": {
+        "type": "q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "q::a::\"\"",
-      "action": "q::Action::\"action\"",
-      "resource": "q::a::\"\"",
+      "principal": {
+        "type": "q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "q::a::\"\"",
-      "action": "q::Action::\"action\"",
-      "resource": "q::a::\"\"",
+      "principal": {
+        "type": "q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "q::a::\"\"",
-      "action": "q::Action::\"action\"",
-      "resource": "q::a::\"\"",
+      "principal": {
+        "type": "q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e3c0663125e18d6e4061ff31dcaeaca64b9fe7d7.json b/cedar-integration-tests/corpus_tests/e3c0663125e18d6e4061ff31dcaeaca64b9fe7d7.json
index 1a011bbad..1da1d92cb 100644
--- a/cedar-integration-tests/corpus_tests/e3c0663125e18d6e4061ff31dcaeaca64b9fe7d7.json
+++ b/cedar-integration-tests/corpus_tests/e3c0663125e18d6e4061ff31dcaeaca64b9fe7d7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"*fsun/\\0\\0K\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*fsun/\\0\\0K\"",
+      "principal": {
+        "type": "a",
+        "id": "*fsun/\u0000\u0000K"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*fsun/\u0000\u0000K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"*fsun/\\0\\0K\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*fsun/\\0\\0K\"",
+      "principal": {
+        "type": "a",
+        "id": "*fsun/\u0000\u0000K"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*fsun/\u0000\u0000K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\tf)\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*fsun/\\0\\0K\"",
+      "principal": {
+        "type": "a",
+        "id": "\tf)\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*fsun/\u0000\u0000K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"*fsun/\\0\\0K\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*fsun/\\0\\0K\"",
+      "principal": {
+        "type": "a",
+        "id": "*fsun/\u0000\u0000K"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*fsun/\u0000\u0000K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"*fsun/\\0\\0K\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*fsun/\\0\\0K\"",
+      "principal": {
+        "type": "a",
+        "id": "*fsun/\u0000\u0000K"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*fsun/\u0000\u0000K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"*fsun/\\0\\0K\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*fsun/\\0\\0K\"",
+      "principal": {
+        "type": "a",
+        "id": "*fsun/\u0000\u0000K"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*fsun/\u0000\u0000K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"*fsun/\\0\\0K\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*fsun/\\0\\0K\"",
+      "principal": {
+        "type": "a",
+        "id": "*fsun/\u0000\u0000K"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*fsun/\u0000\u0000K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"*fsun/\\0\\0K\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*fsun/\\0\\0K\"",
+      "principal": {
+        "type": "a",
+        "id": "*fsun/\u0000\u0000K"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*fsun/\u0000\u0000K"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e3e0c344cd87f7e9a5cde178394188f4eaaf7fbd.json b/cedar-integration-tests/corpus_tests/e3e0c344cd87f7e9a5cde178394188f4eaaf7fbd.json
index 90e782830..6cead0a29 100644
--- a/cedar-integration-tests/corpus_tests/e3e0c344cd87f7e9a5cde178394188f4eaaf7fbd.json
+++ b/cedar-integration-tests/corpus_tests/e3e0c344cd87f7e9a5cde178394188f4eaaf7fbd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C24": "",
         "r": "",
@@ -22,9 +31,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C24": "",
         "r": "",
@@ -38,9 +56,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C24": "",
         "r": "",
@@ -54,9 +81,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C24": "",
         "r": "",
@@ -70,9 +106,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C24": "",
         "r": "",
@@ -86,9 +131,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C24": "",
         "r": "",
@@ -102,9 +156,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C24": "",
         "r": "",
@@ -118,9 +181,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "C24": "",
         "r": "",
diff --git a/cedar-integration-tests/corpus_tests/e3f5ca95a7fabe1adf9e44fdd782d45071ca5b89.json b/cedar-integration-tests/corpus_tests/e3f5ca95a7fabe1adf9e44fdd782d45071ca5b89.json
index f89b22bab..e2a685568 100644
--- a/cedar-integration-tests/corpus_tests/e3f5ca95a7fabe1adf9e44fdd782d45071ca5b89.json
+++ b/cedar-integration-tests/corpus_tests/e3f5ca95a7fabe1adf9e44fdd782d45071ca5b89.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e43090634cf2b752698e0a212a93dc3874388910.json b/cedar-integration-tests/corpus_tests/e43090634cf2b752698e0a212a93dc3874388910.json
index 5688d71b3..984610601 100644
--- a/cedar-integration-tests/corpus_tests/e43090634cf2b752698e0a212a93dc3874388910.json
+++ b/cedar-integration-tests/corpus_tests/e43090634cf2b752698e0a212a93dc3874388910.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "VL0jb::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VL0jb::\"\"",
+      "principal": {
+        "type": "VL0jb",
+        "id": ""
+      },
+      "resource": {
+        "type": "VL0jb",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0q10": "",
         "AX": "",
@@ -24,9 +33,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "VL0jb::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VL0jb::\"\"",
+      "principal": {
+        "type": "VL0jb",
+        "id": ""
+      },
+      "resource": {
+        "type": "VL0jb",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0q10": "",
         "AX": "",
@@ -42,9 +60,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "VL0jb::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VL0jb::\"\"",
+      "principal": {
+        "type": "VL0jb",
+        "id": ""
+      },
+      "resource": {
+        "type": "VL0jb",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0q10": "",
         "AX": "",
@@ -60,9 +87,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "VL0jb::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VL0jb::\"\"",
+      "principal": {
+        "type": "VL0jb",
+        "id": ""
+      },
+      "resource": {
+        "type": "VL0jb",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0q10": "",
         "AX": "",
@@ -78,9 +114,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "VL0jb::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VL0jb::\"\"",
+      "principal": {
+        "type": "VL0jb",
+        "id": ""
+      },
+      "resource": {
+        "type": "VL0jb",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0q10": "",
         "AX": "",
@@ -96,9 +141,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "VL0jb::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VL0jb::\"\"",
+      "principal": {
+        "type": "VL0jb",
+        "id": ""
+      },
+      "resource": {
+        "type": "VL0jb",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0q10": "",
         "AX": "",
@@ -114,9 +168,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "VL0jb::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VL0jb::\"\"",
+      "principal": {
+        "type": "VL0jb",
+        "id": ""
+      },
+      "resource": {
+        "type": "VL0jb",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0q10": "",
         "AX": "",
@@ -132,9 +195,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "VL0jb::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "VL0jb::\"\"",
+      "principal": {
+        "type": "VL0jb",
+        "id": ""
+      },
+      "resource": {
+        "type": "VL0jb",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A0q10": "",
         "AX": "",
diff --git a/cedar-integration-tests/corpus_tests/e47f4d616164909bc939e3907e7dff4f7ce88571.json b/cedar-integration-tests/corpus_tests/e47f4d616164909bc939e3907e7dff4f7ce88571.json
index a4d925085..3298dfefb 100644
--- a/cedar-integration-tests/corpus_tests/e47f4d616164909bc939e3907e7dff4f7ce88571.json
+++ b/cedar-integration-tests/corpus_tests/e47f4d616164909bc939e3907e7dff4f7ce88571.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -82,9 +145,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e49482b861320f86dfe48c43eb2076af102273ad.json b/cedar-integration-tests/corpus_tests/e49482b861320f86dfe48c43eb2076af102273ad.json
index 3d9a6e154..9e5974a44 100644
--- a/cedar-integration-tests/corpus_tests/e49482b861320f86dfe48c43eb2076af102273ad.json
+++ b/cedar-integration-tests/corpus_tests/e49482b861320f86dfe48c43eb2076af102273ad.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "W0N00::v::a::\"\"",
-      "action": "W0N00::v::Action::\"action\"",
-      "resource": "W0N00::v::a::\"\"",
+      "principal": {
+        "type": "W0N00::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W0N00::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W0N00::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "W0N00::v::a::\"\"",
-      "action": "W0N00::v::Action::\"action\"",
-      "resource": "W0N00::v::a::\"\"",
+      "principal": {
+        "type": "W0N00::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W0N00::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W0N00::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "W0N00::v::a::\"\"",
-      "action": "W0N00::v::Action::\"action\"",
-      "resource": "W0N00::v::a::\"\"",
+      "principal": {
+        "type": "W0N00::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W0N00::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W0N00::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "W0N00::v::a::\"\"",
-      "action": "W0N00::v::Action::\"action\"",
-      "resource": "W0N00::v::a::\"\"",
+      "principal": {
+        "type": "W0N00::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W0N00::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W0N00::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "W0N00::v::a::\"\"",
-      "action": "W0N00::v::Action::\"action\"",
-      "resource": "W0N00::v::a::\"\"",
+      "principal": {
+        "type": "W0N00::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W0N00::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W0N00::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "W0N00::v::a::\"\"",
-      "action": "W0N00::v::Action::\"action\"",
-      "resource": "W0N00::v::a::\"\"",
+      "principal": {
+        "type": "W0N00::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W0N00::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W0N00::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "W0N00::v::a::\"\"",
-      "action": "W0N00::v::Action::\"action\"",
-      "resource": "W0N00::v::a::\"\"",
+      "principal": {
+        "type": "W0N00::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W0N00::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W0N00::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "W0N00::v::a::\"\"",
-      "action": "W0N00::v::Action::\"action\"",
-      "resource": "W0N00::v::a::\"\"",
+      "principal": {
+        "type": "W0N00::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W0N00::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W0N00::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e4d7bbe9c13bf9cc55f5d27f31b86dede7e8c750.json b/cedar-integration-tests/corpus_tests/e4d7bbe9c13bf9cc55f5d27f31b86dede7e8c750.json
index 47db5d9d7..b24f81b49 100644
--- a/cedar-integration-tests/corpus_tests/e4d7bbe9c13bf9cc55f5d27f31b86dede7e8c750.json
+++ b/cedar-integration-tests/corpus_tests/e4d7bbe9c13bf9cc55f5d27f31b86dede7e8c750.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::l::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::l::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::l::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::l::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::l::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::l::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::l::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A0::Fwww::\"\"",
-      "action": "A0::Action::\"action\"",
-      "resource": "A0::l::\"\"",
+      "principal": {
+        "type": "A0::Fwww",
+        "id": ""
+      },
+      "resource": {
+        "type": "A0::l",
+        "id": ""
+      },
+      "action": {
+        "type": "A0::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e4e2126159e441e829d39600f12fcbfedca19715.json b/cedar-integration-tests/corpus_tests/e4e2126159e441e829d39600f12fcbfedca19715.json
index 048a44156..b2df1cd4e 100644
--- a/cedar-integration-tests/corpus_tests/e4e2126159e441e829d39600f12fcbfedca19715.json
+++ b/cedar-integration-tests/corpus_tests/e4e2126159e441e829d39600f12fcbfedca19715.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "q::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "q",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "q::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "q",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "q::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "q",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "q::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "q",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "q::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "q",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "q::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "q",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "q::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "q",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "q::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "q",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e4e864d0711220c5104e01ed1336f9a0d10dff58.json b/cedar-integration-tests/corpus_tests/e4e864d0711220c5104e01ed1336f9a0d10dff58.json
index 8128df8f6..b1f957989 100644
--- a/cedar-integration-tests/corpus_tests/e4e864d0711220c5104e01ed1336f9a0d10dff58.json
+++ b/cedar-integration-tests/corpus_tests/e4e864d0711220c5104e01ed1336f9a0d10dff58.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::r::a::xBKLJ0::r::r::i::r::a::\"\"",
-      "action": "r::r::r::a::xBKLJ0::r::r::i::r::Action::\"action\"",
-      "resource": "r::r::r::a::xBKLJ0::r::r::i::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::Action",
+        "id": "action"
+      },
       "context": {
         "A00000": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::r::a::xBKLJ0::r::r::i::r::a::\"\"",
-      "action": "r::r::r::a::xBKLJ0::r::r::i::r::Action::\"action\"",
-      "resource": "r::r::r::a::xBKLJ0::r::r::i::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::Action",
+        "id": "action"
+      },
       "context": {
         "A00000": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::r::a::xBKLJ0::r::r::i::r::a::\"\"",
-      "action": "r::r::r::a::xBKLJ0::r::r::i::r::Action::\"action\"",
-      "resource": "r::r::r::a::xBKLJ0::r::r::i::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::Action",
+        "id": "action"
+      },
       "context": {
         "A00000": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::r::a::xBKLJ0::r::r::i::r::a::\"\"",
-      "action": "r::r::r::a::xBKLJ0::r::r::i::r::Action::\"action\"",
-      "resource": "r::r::r::a::xBKLJ0::r::r::i::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::Action",
+        "id": "action"
+      },
       "context": {
         "A00000": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::r::a::xBKLJ0::r::r::i::r::a::\"\"",
-      "action": "r::r::r::a::xBKLJ0::r::r::i::r::Action::\"action\"",
-      "resource": "r::r::r::a::xBKLJ0::r::r::i::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::Action",
+        "id": "action"
+      },
       "context": {
         "A00000": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::r::a::xBKLJ0::r::r::i::r::a::\"\"",
-      "action": "r::r::r::a::xBKLJ0::r::r::i::r::Action::\"action\"",
-      "resource": "r::r::r::a::xBKLJ0::r::r::i::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::Action",
+        "id": "action"
+      },
       "context": {
         "A00000": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::r::a::xBKLJ0::r::r::i::r::a::\"\"",
-      "action": "r::r::r::a::xBKLJ0::r::r::i::r::Action::\"action\"",
-      "resource": "r::r::r::a::xBKLJ0::r::r::i::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::Action",
+        "id": "action"
+      },
       "context": {
         "A00000": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::r::a::xBKLJ0::r::r::i::r::a::\"\"",
-      "action": "r::r::r::a::xBKLJ0::r::r::i::r::Action::\"action\"",
-      "resource": "r::r::r::a::xBKLJ0::r::r::i::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::a::xBKLJ0::r::r::i::r::Action",
+        "id": "action"
+      },
       "context": {
         "A00000": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/e4f01b42bb1f1e0433944ec6fec137eec4826d27.json b/cedar-integration-tests/corpus_tests/e4f01b42bb1f1e0433944ec6fec137eec4826d27.json
index 142ae9ce2..ee9f11405 100644
--- a/cedar-integration-tests/corpus_tests/e4f01b42bb1f1e0433944ec6fec137eec4826d27.json
+++ b/cedar-integration-tests/corpus_tests/e4f01b42bb1f1e0433944ec6fec137eec4826d27.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e5007c7ec30342efdb400ed2c90eb551994574f4.json b/cedar-integration-tests/corpus_tests/e5007c7ec30342efdb400ed2c90eb551994574f4.json
index c47f3995e..464efd599 100644
--- a/cedar-integration-tests/corpus_tests/e5007c7ec30342efdb400ed2c90eb551994574f4.json
+++ b/cedar-integration-tests/corpus_tests/e5007c7ec30342efdb400ed2c90eb551994574f4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "("
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "f1dd": {
           "__entity": {
@@ -25,9 +34,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"(\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(\"",
+      "principal": {
+        "type": "a",
+        "id": "("
+      },
+      "resource": {
+        "type": "a",
+        "id": "("
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "f1dd": {
           "__entity": {
@@ -42,9 +60,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"(\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(\"",
+      "principal": {
+        "type": "a",
+        "id": "("
+      },
+      "resource": {
+        "type": "a",
+        "id": "("
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "f1dd": {
           "__entity": {
@@ -59,9 +86,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"(\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(\"",
+      "principal": {
+        "type": "a",
+        "id": "("
+      },
+      "resource": {
+        "type": "a",
+        "id": "("
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "f1dd": {
           "__entity": {
@@ -76,9 +112,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"(\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(\"",
+      "principal": {
+        "type": "a",
+        "id": "("
+      },
+      "resource": {
+        "type": "a",
+        "id": "("
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "f1dd": {
           "__entity": {
@@ -93,9 +138,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"(\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(\"",
+      "principal": {
+        "type": "a",
+        "id": "("
+      },
+      "resource": {
+        "type": "a",
+        "id": "("
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "f1dd": {
           "__entity": {
@@ -110,9 +164,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"(\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(\"",
+      "principal": {
+        "type": "a",
+        "id": "("
+      },
+      "resource": {
+        "type": "a",
+        "id": "("
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "f1dd": {
           "__entity": {
@@ -127,9 +190,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"(\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"(\"",
+      "principal": {
+        "type": "a",
+        "id": "("
+      },
+      "resource": {
+        "type": "a",
+        "id": "("
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "f1dd": {
           "__entity": {
diff --git a/cedar-integration-tests/corpus_tests/e512b76c63cdf7e61a995a30a93d12f7aed91a2b.json b/cedar-integration-tests/corpus_tests/e512b76c63cdf7e61a995a30a93d12f7aed91a2b.json
index 832b0e03e..1c18bbc20 100644
--- a/cedar-integration-tests/corpus_tests/e512b76c63cdf7e61a995a30a93d12f7aed91a2b.json
+++ b/cedar-integration-tests/corpus_tests/e512b76c63cdf7e61a995a30a93d12f7aed91a2b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\":::\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\":::\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\":::\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\":::\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\":::\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\":::\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "F::\":::\"",
-      "action": "Action::\"action\"",
-      "resource": "F::\":::\"",
+      "principal": {
+        "type": "F",
+        "id": ":::"
+      },
+      "resource": {
+        "type": "F",
+        "id": ":::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e546a99cd59df815788e4c43d591eeeef5595c99.json b/cedar-integration-tests/corpus_tests/e546a99cd59df815788e4c43d591eeeef5595c99.json
index 08d0cdb9b..53975fcbb 100644
--- a/cedar-integration-tests/corpus_tests/e546a99cd59df815788e4c43d591eeeef5595c99.json
+++ b/cedar-integration-tests/corpus_tests/e546a99cd59df815788e4c43d591eeeef5595c99.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"\\u{6}66\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "\u000666"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"\\u{6}66\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "\u000666"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"\\u{6}66\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "\u000666"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"\\u{6}66\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "\u000666"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"\\u{6}66\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "\u000666"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"\\u{6}66\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "\u000666"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"\\u{6}66\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "\u000666"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"\\u{6}66\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "\u000666"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e54f1cadcf770e09cf3f60829a458b0230e27eb9.json b/cedar-integration-tests/corpus_tests/e54f1cadcf770e09cf3f60829a458b0230e27eb9.json
index 8b6407b84..06dd8fdee 100644
--- a/cedar-integration-tests/corpus_tests/e54f1cadcf770e09cf3f60829a458b0230e27eb9.json
+++ b/cedar-integration-tests/corpus_tests/e54f1cadcf770e09cf3f60829a458b0230e27eb9.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"_re\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "_re"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"_re\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "_re"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"_re\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "_re"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"_re\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "_re"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"_re\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "_re"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"_re\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "_re"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"_re\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "_re"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"_re\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "_re"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e59983d65a5e9a428f95d8026ff7aa306ce89dc8.json b/cedar-integration-tests/corpus_tests/e59983d65a5e9a428f95d8026ff7aa306ce89dc8.json
index a567bd3dd..f158dbe00 100644
--- a/cedar-integration-tests/corpus_tests/e59983d65a5e9a428f95d8026ff7aa306ce89dc8.json
+++ b/cedar-integration-tests/corpus_tests/e59983d65a5e9a428f95d8026ff7aa306ce89dc8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"va/lang/inv\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "va/lang/inv"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"va/lang/inv\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "va/lang/inv"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"va/lang/inv\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "va/lang/inv"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"va/lang/inv\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "va/lang/inv"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"va/lang/inv\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "va/lang/inv"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"va/lang/inv\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "va/lang/inv"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"va/lang/inv\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "va/lang/inv"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"va/lang/inv\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "va/lang/inv"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e5e6199a3ae1e1ac97512ce3fa10eec795b71302.json b/cedar-integration-tests/corpus_tests/e5e6199a3ae1e1ac97512ce3fa10eec795b71302.json
index f5df96804..1feeb4883 100644
--- a/cedar-integration-tests/corpus_tests/e5e6199a3ae1e1ac97512ce3fa10eec795b71302.json
+++ b/cedar-integration-tests/corpus_tests/e5e6199a3ae1e1ac97512ce3fa10eec795b71302.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "W::v::a::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::a::\"\"",
+      "principal": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "W::v::a::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::a::\"\"",
+      "principal": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "W::v::a::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::a::\"\"",
+      "principal": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "W::v::a::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::a::\"\"",
+      "principal": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "W::v::a::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::a::\"\"",
+      "principal": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "W::v::a::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::a::\"\"",
+      "principal": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "W::v::a::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::a::\"\"",
+      "principal": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "W::v::a::\"\"",
-      "action": "W::v::Action::\"action\"",
-      "resource": "W::v::a::\"\"",
+      "principal": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "W::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "W::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e66cee88d3e5598a81681338e16b30092c33dc2b.json b/cedar-integration-tests/corpus_tests/e66cee88d3e5598a81681338e16b30092c33dc2b.json
index 5aba54f10..cdc91ce19 100644
--- a/cedar-integration-tests/corpus_tests/e66cee88d3e5598a81681338e16b30092c33dc2b.json
+++ b/cedar-integration-tests/corpus_tests/e66cee88d3e5598a81681338e16b30092c33dc2b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{5}UUUU\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{5}UUUU\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0005UUUU"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0005UUUU"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{5}UUUU\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{5}UUUU\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0005UUUU"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0005UUUU"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{5}UUUU\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{5}UUUU\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0005UUUU"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0005UUUU"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{5}UUUU\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{5}UUUU\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0005UUUU"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0005UUUU"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{5}UUUU\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{5}UUUU\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0005UUUU"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0005UUUU"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{5}UUUU\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{5}UUUU\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0005UUUU"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0005UUUU"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e6c99b85551ee672fc984d21d2ad02a294268de8.json b/cedar-integration-tests/corpus_tests/e6c99b85551ee672fc984d21d2ad02a294268de8.json
index 27b4cf1ce..0083aaaae 100644
--- a/cedar-integration-tests/corpus_tests/e6c99b85551ee672fc984d21d2ad02a294268de8.json
+++ b/cedar-integration-tests/corpus_tests/e6c99b85551ee672fc984d21d2ad02a294268de8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e6db16ad2735efa7f9e3d5a764bd3b59d8085bdc.json b/cedar-integration-tests/corpus_tests/e6db16ad2735efa7f9e3d5a764bd3b59d8085bdc.json
index 95edc9785..a2de3912b 100644
--- a/cedar-integration-tests/corpus_tests/e6db16ad2735efa7f9e3d5a764bd3b59d8085bdc.json
+++ b/cedar-integration-tests/corpus_tests/e6db16ad2735efa7f9e3d5a764bd3b59d8085bdc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "F::\"\"",
-      "action": "Action::\"\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "F::\"\"",
-      "action": "Action::\"\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "F::\"\"",
-      "action": "Action::\"\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "F::\"\"",
-      "action": "Action::\"\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "F::\"\"",
-      "action": "Action::\"\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "F::\"\"",
-      "action": "Action::\"\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "F::\"\"",
-      "action": "Action::\"\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "F::\"\"",
-      "action": "Action::\"\"",
-      "resource": "F::\"\"",
+      "principal": {
+        "type": "F",
+        "id": ""
+      },
+      "resource": {
+        "type": "F",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e704fc223403a113f3a85563c360c17fa71e3535.json b/cedar-integration-tests/corpus_tests/e704fc223403a113f3a85563c360c17fa71e3535.json
index dc16291a4..7c95ec8e3 100644
--- a/cedar-integration-tests/corpus_tests/e704fc223403a113f3a85563c360c17fa71e3535.json
+++ b/cedar-integration-tests/corpus_tests/e704fc223403a113f3a85563c360c17fa71e3535.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::rb93FU3::\":::\\u{1a}:\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::G::\"\"",
+      "principal": {
+        "type": "r::rb93FU3",
+        "id": ":::\u001a:"
+      },
+      "resource": {
+        "type": "r::G",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::rb93FU3::\":::\\u{1a}:\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::G::\"\"",
+      "principal": {
+        "type": "r::rb93FU3",
+        "id": ":::\u001a:"
+      },
+      "resource": {
+        "type": "r::G",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::rb93FU3::\":::\\u{1a}:\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::G::\"\"",
+      "principal": {
+        "type": "r::rb93FU3",
+        "id": ":::\u001a:"
+      },
+      "resource": {
+        "type": "r::G",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::rb93FU3::\":::\\u{1a}:\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::G::\"\"",
+      "principal": {
+        "type": "r::rb93FU3",
+        "id": ":::\u001a:"
+      },
+      "resource": {
+        "type": "r::G",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::rb93FU3::\":::\\u{1a}:\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::G::\"\"",
+      "principal": {
+        "type": "r::rb93FU3",
+        "id": ":::\u001a:"
+      },
+      "resource": {
+        "type": "r::G",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::rb93FU3::\":::\\u{1a}:\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::G::\"\"",
+      "principal": {
+        "type": "r::rb93FU3",
+        "id": ":::\u001a:"
+      },
+      "resource": {
+        "type": "r::G",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::rb93FU3::\":::\\u{1a}:\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::G::\"\"",
+      "principal": {
+        "type": "r::rb93FU3",
+        "id": ":::\u001a:"
+      },
+      "resource": {
+        "type": "r::G",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::rb93FU3::\":::\\u{1a}:\"",
-      "action": "r::Action::\"action\"",
-      "resource": "r::G::\"\"",
+      "principal": {
+        "type": "r::rb93FU3",
+        "id": ":::\u001a:"
+      },
+      "resource": {
+        "type": "r::G",
+        "id": ""
+      },
+      "action": {
+        "type": "r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e707a4f91770c47e0c8a8ba6b52a37a816a5c93d.json b/cedar-integration-tests/corpus_tests/e707a4f91770c47e0c8a8ba6b52a37a816a5c93d.json
index e4d5fd2c8..fe57b94bc 100644
--- a/cedar-integration-tests/corpus_tests/e707a4f91770c47e0c8a8ba6b52a37a816a5c93d.json
+++ b/cedar-integration-tests/corpus_tests/e707a4f91770c47e0c8a8ba6b52a37a816a5c93d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e724a7ae0f37a356481bfd94170d5e699c0c4315.json b/cedar-integration-tests/corpus_tests/e724a7ae0f37a356481bfd94170d5e699c0c4315.json
index 0b7cecf26..1cb8d72a9 100644
--- a/cedar-integration-tests/corpus_tests/e724a7ae0f37a356481bfd94170d5e699c0c4315.json
+++ b/cedar-integration-tests/corpus_tests/e724a7ae0f37a356481bfd94170d5e699c0c4315.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A000::a::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::a::\"\"",
+      "principal": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A000::a::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::a::\"\"",
+      "principal": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A000::a::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::a::\"\"",
+      "principal": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A000::a::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::a::\"\"",
+      "principal": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A000::a::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::a::\"\"",
+      "principal": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A000::a::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::a::\"\"",
+      "principal": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A000::a::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::a::\"\"",
+      "principal": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A000::a::\"\"",
-      "action": "A000::Action::\"action\"",
-      "resource": "A000::a::\"\"",
+      "principal": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A000::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e72870aef6ae5d3440e39ca160e8498ee7964ebc.json b/cedar-integration-tests/corpus_tests/e72870aef6ae5d3440e39ca160e8498ee7964ebc.json
index 8468284e9..2b6f040e1 100644
--- a/cedar-integration-tests/corpus_tests/e72870aef6ae5d3440e39ca160e8498ee7964ebc.json
+++ b/cedar-integration-tests/corpus_tests/e72870aef6ae5d3440e39ca160e8498ee7964ebc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e7458302450d25b602e878ab27e3e460a03ce21d.json b/cedar-integration-tests/corpus_tests/e7458302450d25b602e878ab27e3e460a03ce21d.json
index 852ac95f5..68a22e65c 100644
--- a/cedar-integration-tests/corpus_tests/e7458302450d25b602e878ab27e3e460a03ce21d.json
+++ b/cedar-integration-tests/corpus_tests/e7458302450d25b602e878ab27e3e460a03ce21d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e755e45783716ddd668030b3bbcd09ab314184cf.json b/cedar-integration-tests/corpus_tests/e755e45783716ddd668030b3bbcd09ab314184cf.json
index 87fc1cdb9..cff7e5a14 100644
--- a/cedar-integration-tests/corpus_tests/e755e45783716ddd668030b3bbcd09ab314184cf.json
+++ b/cedar-integration-tests/corpus_tests/e755e45783716ddd668030b3bbcd09ab314184cf.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzzz655R5500": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzzz655R5500": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzzz655R5500": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzzz655R5500": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzzz655R5500": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzzz655R5500": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzzz655R5500": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "mzzzz655R5500": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/e7a132f0e49156923495b7a82cce41265f095657.json b/cedar-integration-tests/corpus_tests/e7a132f0e49156923495b7a82cce41265f095657.json
index 3762843da..5bb5e8c27 100644
--- a/cedar-integration-tests/corpus_tests/e7a132f0e49156923495b7a82cce41265f095657.json
+++ b/cedar-integration-tests/corpus_tests/e7a132f0e49156923495b7a82cce41265f095657.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{5}\\u{5}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{5}\\u{5}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0005\u0005"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0005\u0005"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e7b2898f743f1bd17d68147dd28df8525bef20cd.json b/cedar-integration-tests/corpus_tests/e7b2898f743f1bd17d68147dd28df8525bef20cd.json
index 7e3fd9bfc..d5c2c5934 100644
--- a/cedar-integration-tests/corpus_tests/e7b2898f743f1bd17d68147dd28df8525bef20cd.json
+++ b/cedar-integration-tests/corpus_tests/e7b2898f743f1bd17d68147dd28df8525bef20cd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ffgf`f\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffgf`f\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ffgf`f\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffgf`f\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ffgf`f\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffgf`f\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ffgf`f\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffgf`f\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"ffgf`f\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffgf`f\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ffgf`f\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffgf`f\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ffgf`f\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffgf`f\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ffgf`f\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffgf`f\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ffgf`f\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffgf`f\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ffgf`f\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffgf`f\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ffgf`f\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffgf`f\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ffgf`f\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffgf`f\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ffgf`f\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffgf`f\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ffgf`f\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffgf`f\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ffgf`f\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ffgf`f\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ffgf`f\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ffgf`f\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e7d5f6bfb9f8404d376c144399022396b497521c.json b/cedar-integration-tests/corpus_tests/e7d5f6bfb9f8404d376c144399022396b497521c.json
index 8e46cab0e..eaaadfade 100644
--- a/cedar-integration-tests/corpus_tests/e7d5f6bfb9f8404d376c144399022396b497521c.json
+++ b/cedar-integration-tests/corpus_tests/e7d5f6bfb9f8404d376c144399022396b497521c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"x\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"x\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "x\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "x\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"x\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"x\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "x\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "x\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"x\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"x\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "x\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "x\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"x\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"x\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "x\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "x\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"x\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"x\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "x\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "x\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"x\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"x\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "x\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "x\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"x\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"x\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "x\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "x\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"x\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"x\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "x\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "x\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e7e490b93e58425f8e95e6aee6d923326c465b36.json b/cedar-integration-tests/corpus_tests/e7e490b93e58425f8e95e6aee6d923326c465b36.json
index 0f9a816d8..aece9ccb5 100644
--- a/cedar-integration-tests/corpus_tests/e7e490b93e58425f8e95e6aee6d923326c465b36.json
+++ b/cedar-integration-tests/corpus_tests/e7e490b93e58425f8e95e6aee6d923326c465b36.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e7ea865260e727d3de17230d456dbbfc0573410e.json b/cedar-integration-tests/corpus_tests/e7ea865260e727d3de17230d456dbbfc0573410e.json
index 430ee4350..5f6fdbbed 100644
--- a/cedar-integration-tests/corpus_tests/e7ea865260e727d3de17230d456dbbfc0573410e.json
+++ b/cedar-integration-tests/corpus_tests/e7ea865260e727d3de17230d456dbbfc0573410e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::\":!:\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ":!:"
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::\":!:\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ":!:"
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::\":!:\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ":!:"
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::\":!:\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ":!:"
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::\":!:\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ":!:"
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::\":!:\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ":!:"
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::\":!:\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ":!:"
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::\":!:\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"\"",
+      "principal": {
+        "type": "r",
+        "id": ":!:"
+      },
+      "resource": {
+        "type": "W",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e80d76eb66f3ed2e198f61e73099e822cc021d73.json b/cedar-integration-tests/corpus_tests/e80d76eb66f3ed2e198f61e73099e822cc021d73.json
index b1c7e8f53..f02e12e91 100644
--- a/cedar-integration-tests/corpus_tests/e80d76eb66f3ed2e198f61e73099e822cc021d73.json
+++ b/cedar-integration-tests/corpus_tests/e80d76eb66f3ed2e198f61e73099e822cc021d73.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "G::lm7::r::a::\"\"",
-      "action": "G::lm7::r::Action::\"action\"",
-      "resource": "G::lm7::r::a::\"\"",
+      "principal": {
+        "type": "G::lm7::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "G::lm7::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "G::lm7::r::Action",
+        "id": "action"
+      },
       "context": {
         "KjLjjjjxx": false
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "G::lm7::r::a::\"\"",
-      "action": "G::lm7::r::Action::\"action\"",
-      "resource": "G::lm7::r::a::\"\"",
+      "principal": {
+        "type": "G::lm7::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "G::lm7::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "G::lm7::r::Action",
+        "id": "action"
+      },
       "context": {
         "KjLjjjjxx": false
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "G::lm7::r::a::\"\"",
-      "action": "G::lm7::r::Action::\"action\"",
-      "resource": "G::lm7::r::a::\"\"",
+      "principal": {
+        "type": "G::lm7::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "G::lm7::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "G::lm7::r::Action",
+        "id": "action"
+      },
       "context": {
         "KjLjjjjxx": false
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "G::lm7::r::a::\"\"",
-      "action": "G::lm7::r::Action::\"action\"",
-      "resource": "G::lm7::r::a::\"\"",
+      "principal": {
+        "type": "G::lm7::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "G::lm7::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "G::lm7::r::Action",
+        "id": "action"
+      },
       "context": {
         "KjLjjjjxx": false
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "G::lm7::r::a::\"\"",
-      "action": "G::lm7::r::Action::\"action\"",
-      "resource": "G::lm7::r::a::\"\"",
+      "principal": {
+        "type": "G::lm7::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "G::lm7::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "G::lm7::r::Action",
+        "id": "action"
+      },
       "context": {
         "KjLjjjjxx": false
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "G::lm7::r::a::\"\"",
-      "action": "G::lm7::r::Action::\"action\"",
-      "resource": "G::lm7::r::a::\"\"",
+      "principal": {
+        "type": "G::lm7::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "G::lm7::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "G::lm7::r::Action",
+        "id": "action"
+      },
       "context": {
         "KjLjjjjxx": false
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "G::lm7::r::a::\"\"",
-      "action": "G::lm7::r::Action::\"action\"",
-      "resource": "G::lm7::r::a::\"\"",
+      "principal": {
+        "type": "G::lm7::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "G::lm7::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "G::lm7::r::Action",
+        "id": "action"
+      },
       "context": {
         "KjLjjjjxx": false
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "G::lm7::r::a::\"\"",
-      "action": "G::lm7::r::Action::\"action\"",
-      "resource": "G::lm7::r::a::\"\"",
+      "principal": {
+        "type": "G::lm7::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "G::lm7::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "G::lm7::r::Action",
+        "id": "action"
+      },
       "context": {
         "KjLjjjjxx": false
       },
diff --git a/cedar-integration-tests/corpus_tests/e83f66ccc4b4025afbb9dcadfc056a002d23fbd2.json b/cedar-integration-tests/corpus_tests/e83f66ccc4b4025afbb9dcadfc056a002d23fbd2.json
index 29f54da36..1153829b8 100644
--- a/cedar-integration-tests/corpus_tests/e83f66ccc4b4025afbb9dcadfc056a002d23fbd2.json
+++ b/cedar-integration-tests/corpus_tests/e83f66ccc4b4025afbb9dcadfc056a002d23fbd2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "x::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "x::\"\"",
+      "principal": {
+        "type": "x",
+        "id": ""
+      },
+      "resource": {
+        "type": "x",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e8740bccf611aacef35d92682b472b951ccdb86e.json b/cedar-integration-tests/corpus_tests/e8740bccf611aacef35d92682b472b951ccdb86e.json
index 6d30a53ba..e8aedb6c1 100644
--- a/cedar-integration-tests/corpus_tests/e8740bccf611aacef35d92682b472b951ccdb86e.json
+++ b/cedar-integration-tests/corpus_tests/e8740bccf611aacef35d92682b472b951ccdb86e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\";\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e88c2229a36d09f4cf001731c30336f1b845bf81.json b/cedar-integration-tests/corpus_tests/e88c2229a36d09f4cf001731c30336f1b845bf81.json
index ed52edc73..3bdc3dcc9 100644
--- a/cedar-integration-tests/corpus_tests/e88c2229a36d09f4cf001731c30336f1b845bf81.json
+++ b/cedar-integration-tests/corpus_tests/e88c2229a36d09f4cf001731c30336f1b845bf81.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "FwKwwwwc::\":c\"",
-      "action": "Action::\"action\"",
-      "resource": "FwKwwwwc::\":c\"",
+      "principal": {
+        "type": "FwKwwwwc",
+        "id": ":c"
+      },
+      "resource": {
+        "type": "FwKwwwwc",
+        "id": ":c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "FwKwwwwc::\":c\"",
-      "action": "Action::\"action\"",
-      "resource": "FwKwwwwc::\":c\"",
+      "principal": {
+        "type": "FwKwwwwc",
+        "id": ":c"
+      },
+      "resource": {
+        "type": "FwKwwwwc",
+        "id": ":c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "FwKwwwwc::\":c\"",
-      "action": "Action::\"action\"",
-      "resource": "FwKwwwwc::\":c\"",
+      "principal": {
+        "type": "FwKwwwwc",
+        "id": ":c"
+      },
+      "resource": {
+        "type": "FwKwwwwc",
+        "id": ":c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "FwKwwwwc::\":c\"",
-      "action": "Action::\"action\"",
-      "resource": "FwKwwwwc::\":c\"",
+      "principal": {
+        "type": "FwKwwwwc",
+        "id": ":c"
+      },
+      "resource": {
+        "type": "FwKwwwwc",
+        "id": ":c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "FwKwwwwc::\":c\"",
-      "action": "Action::\"action\"",
-      "resource": "FwKwwwwc::\":c\"",
+      "principal": {
+        "type": "FwKwwwwc",
+        "id": ":c"
+      },
+      "resource": {
+        "type": "FwKwwwwc",
+        "id": ":c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "FwKwwwwc::\":c\"",
-      "action": "Action::\"action\"",
-      "resource": "FwKwwwwc::\":c\"",
+      "principal": {
+        "type": "FwKwwwwc",
+        "id": ":c"
+      },
+      "resource": {
+        "type": "FwKwwwwc",
+        "id": ":c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "FwKwwwwc::\":c\"",
-      "action": "Action::\"action\"",
-      "resource": "FwKwwwwc::\":c\"",
+      "principal": {
+        "type": "FwKwwwwc",
+        "id": ":c"
+      },
+      "resource": {
+        "type": "FwKwwwwc",
+        "id": ":c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "FwKwwwwc::\":c\"",
-      "action": "Action::\"action\"",
-      "resource": "FwKwwwwc::\":c\"",
+      "principal": {
+        "type": "FwKwwwwc",
+        "id": ":c"
+      },
+      "resource": {
+        "type": "FwKwwwwc",
+        "id": ":c"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e89ff546eee4c6b8ce6214b1fb44a8ac0922e1a7.json b/cedar-integration-tests/corpus_tests/e89ff546eee4c6b8ce6214b1fb44a8ac0922e1a7.json
index 45717dfc6..45f035313 100644
--- a/cedar-integration-tests/corpus_tests/e89ff546eee4c6b8ce6214b1fb44a8ac0922e1a7.json
+++ b/cedar-integration-tests/corpus_tests/e89ff546eee4c6b8ce6214b1fb44a8ac0922e1a7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}com\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002com"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e8cc98c2a80e66f620f76b7cc8c0ea206f050509.json b/cedar-integration-tests/corpus_tests/e8cc98c2a80e66f620f76b7cc8c0ea206f050509.json
index 8f1b08486..6b6e28a86 100644
--- a/cedar-integration-tests/corpus_tests/e8cc98c2a80e66f620f76b7cc8c0ea206f050509.json
+++ b/cedar-integration-tests/corpus_tests/e8cc98c2a80e66f620f76b7cc8c0ea206f050509.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "O::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "O::\"\"",
+      "principal": {
+        "type": "O",
+        "id": ""
+      },
+      "resource": {
+        "type": "O",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e8df0ae1d2f80908d3d4839521df15a7b72ce543.json b/cedar-integration-tests/corpus_tests/e8df0ae1d2f80908d3d4839521df15a7b72ce543.json
index c36e3a8fd..210656894 100644
--- a/cedar-integration-tests/corpus_tests/e8df0ae1d2f80908d3d4839521df15a7b72ce543.json
+++ b/cedar-integration-tests/corpus_tests/e8df0ae1d2f80908d3d4839521df15a7b72ce543.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "cP::v::Qx::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::Qx::\"\"",
+      "principal": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "cP::v::Qx::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::Qx::\"\"",
+      "principal": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "cP::v::Qx::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::Qx::\"\"",
+      "principal": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "cP::v::Qx::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::Qx::\"\"",
+      "principal": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "cP::v::Qx::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::Qx::\"\"",
+      "principal": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "cP::v::Qx::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::Qx::\"\"",
+      "principal": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "cP::v::Qx::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::Qx::\"\"",
+      "principal": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "cP::v::Qx::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::Qx::\"\"",
+      "principal": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::Qx",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e8f04e1f16b54da2ecb9ba425cedcada8e2d3dc7.json b/cedar-integration-tests/corpus_tests/e8f04e1f16b54da2ecb9ba425cedcada8e2d3dc7.json
index 346ccadb2..09e4745c3 100644
--- a/cedar-integration-tests/corpus_tests/e8f04e1f16b54da2ecb9ba425cedcada8e2d3dc7.json
+++ b/cedar-integration-tests/corpus_tests/e8f04e1f16b54da2ecb9ba425cedcada8e2d3dc7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\n\\u{6}\\u{6}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\n\\u{6}\\u{6}\"",
+      "principal": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\n\u0006\u0006"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e8f0cccf91fd4e442aee6bf2ab24d493b7dcb0d3.json b/cedar-integration-tests/corpus_tests/e8f0cccf91fd4e442aee6bf2ab24d493b7dcb0d3.json
index 30f8e9419..f730e72c2 100644
--- a/cedar-integration-tests/corpus_tests/e8f0cccf91fd4e442aee6bf2ab24d493b7dcb0d3.json
+++ b/cedar-integration-tests/corpus_tests/e8f0cccf91fd4e442aee6bf2ab24d493b7dcb0d3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "bHHHHHHHHH::Kxxxnxx::a::\"\"",
-      "action": "bHHHHHHHHH::Kxxxnxx::Action::\"action\"",
-      "resource": "bHHHHHHHHH::Kxxxnxx::a::\"\"",
+      "principal": {
+        "type": "bHHHHHHHHH::Kxxxnxx::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "bHHHHHHHHH::Kxxxnxx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "bHHHHHHHHH::Kxxxnxx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "bHHHHHHHHH::Kxxxnxx::a::\"\"",
-      "action": "bHHHHHHHHH::Kxxxnxx::Action::\"action\"",
-      "resource": "bHHHHHHHHH::Kxxxnxx::a::\"\"",
+      "principal": {
+        "type": "bHHHHHHHHH::Kxxxnxx::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "bHHHHHHHHH::Kxxxnxx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "bHHHHHHHHH::Kxxxnxx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "bHHHHHHHHH::Kxxxnxx::a::\"\"",
-      "action": "bHHHHHHHHH::Kxxxnxx::Action::\"action\"",
-      "resource": "bHHHHHHHHH::Kxxxnxx::a::\"\"",
+      "principal": {
+        "type": "bHHHHHHHHH::Kxxxnxx::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "bHHHHHHHHH::Kxxxnxx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "bHHHHHHHHH::Kxxxnxx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "bHHHHHHHHH::Kxxxnxx::a::\"\"",
-      "action": "bHHHHHHHHH::Kxxxnxx::Action::\"action\"",
-      "resource": "bHHHHHHHHH::Kxxxnxx::a::\"\"",
+      "principal": {
+        "type": "bHHHHHHHHH::Kxxxnxx::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "bHHHHHHHHH::Kxxxnxx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "bHHHHHHHHH::Kxxxnxx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "bHHHHHHHHH::Kxxxnxx::a::\"\"",
-      "action": "bHHHHHHHHH::Kxxxnxx::Action::\"action\"",
-      "resource": "bHHHHHHHHH::Kxxxnxx::a::\"\"",
+      "principal": {
+        "type": "bHHHHHHHHH::Kxxxnxx::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "bHHHHHHHHH::Kxxxnxx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "bHHHHHHHHH::Kxxxnxx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "bHHHHHHHHH::Kxxxnxx::a::\"\"",
-      "action": "bHHHHHHHHH::Kxxxnxx::Action::\"action\"",
-      "resource": "bHHHHHHHHH::Kxxxnxx::a::\"\"",
+      "principal": {
+        "type": "bHHHHHHHHH::Kxxxnxx::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "bHHHHHHHHH::Kxxxnxx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "bHHHHHHHHH::Kxxxnxx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "bHHHHHHHHH::Kxxxnxx::a::\"\"",
-      "action": "bHHHHHHHHH::Kxxxnxx::Action::\"action\"",
-      "resource": "bHHHHHHHHH::Kxxxnxx::a::\"\"",
+      "principal": {
+        "type": "bHHHHHHHHH::Kxxxnxx::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "bHHHHHHHHH::Kxxxnxx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "bHHHHHHHHH::Kxxxnxx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "bHHHHHHHHH::Kxxxnxx::a::\"\"",
-      "action": "bHHHHHHHHH::Kxxxnxx::Action::\"action\"",
-      "resource": "bHHHHHHHHH::Kxxxnxx::a::\"\"",
+      "principal": {
+        "type": "bHHHHHHHHH::Kxxxnxx::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "bHHHHHHHHH::Kxxxnxx::a",
+        "id": ""
+      },
+      "action": {
+        "type": "bHHHHHHHHH::Kxxxnxx::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/e929316ac78f1b94eb94eaf5f265ebff767daa5f.json b/cedar-integration-tests/corpus_tests/e929316ac78f1b94eb94eaf5f265ebff767daa5f.json
index 79180e437..27abae195 100644
--- a/cedar-integration-tests/corpus_tests/e929316ac78f1b94eb94eaf5f265ebff767daa5f.json
+++ b/cedar-integration-tests/corpus_tests/e929316ac78f1b94eb94eaf5f265ebff767daa5f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\":::com/:::::::::\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::com/:::::::::\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": ":::com/:::::::::\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::com/:::::::::\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "__entity": {
@@ -25,9 +34,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":::com/:::::::::\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::com/:::::::::\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": ":::com/:::::::::\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::com/:::::::::\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "__entity": {
@@ -44,9 +62,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\":::com/:::::::::\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::com/:::::::::\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": ":::com/:::::::::\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::com/:::::::::\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "__entity": {
@@ -63,9 +90,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\":::com/:::::::::\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::com/:::::::::\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": ":::com/:::::::::\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::com/:::::::::\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "__entity": {
@@ -82,9 +118,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\":::com/:::::::::\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::com/:::::::::\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": ":::com/:::::::::\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::com/:::::::::\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "__entity": {
@@ -101,9 +146,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\":::com/:::::::::\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::com/:::::::::\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": ":::com/:::::::::\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::com/:::::::::\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "__entity": {
@@ -120,9 +174,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\":::com/:::::::::\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::com/:::::::::\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": ":::com/:::::::::\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::com/:::::::::\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "__entity": {
@@ -139,9 +202,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\":::com/:::::::::\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::com/:::::::::\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": ":::com/:::::::::\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::com/:::::::::\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": {
           "__entity": {
diff --git a/cedar-integration-tests/corpus_tests/e94fdece040a7781911fed00f38902354403df84.json b/cedar-integration-tests/corpus_tests/e94fdece040a7781911fed00f38902354403df84.json
index 0ac83a730..1139cf102 100644
--- a/cedar-integration-tests/corpus_tests/e94fdece040a7781911fed00f38902354403df84.json
+++ b/cedar-integration-tests/corpus_tests/e94fdece040a7781911fed00f38902354403df84.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0:\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0:\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0:\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0:\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0:\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0:\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0:\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0:\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e961f5f47e679e6c692e2b3b38d8d52534ff5a20.json b/cedar-integration-tests/corpus_tests/e961f5f47e679e6c692e2b3b38d8d52534ff5a20.json
index a70717168..81621f26f 100644
--- a/cedar-integration-tests/corpus_tests/e961f5f47e679e6c692e2b3b38d8d52534ff5a20.json
+++ b/cedar-integration-tests/corpus_tests/e961f5f47e679e6c692e2b3b38d8d52534ff5a20.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "M": "",
         "r": "",
@@ -23,9 +32,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "M": "",
         "r": "",
@@ -40,9 +58,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "M": "",
         "r": "",
@@ -57,9 +84,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "M": "",
         "r": "",
@@ -74,9 +110,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "M": "",
         "r": "",
@@ -91,9 +136,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "M": "",
         "r": "",
@@ -108,9 +162,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "M": "",
         "r": "",
@@ -125,9 +188,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "M": "",
         "r": "",
diff --git a/cedar-integration-tests/corpus_tests/e982bc050bb9f03096c23f181f5580d3de9de43e.json b/cedar-integration-tests/corpus_tests/e982bc050bb9f03096c23f181f5580d3de9de43e.json
index 1285133ab..efb4db2c9 100644
--- a/cedar-integration-tests/corpus_tests/e982bc050bb9f03096c23f181f5580d3de9de43e.json
+++ b/cedar-integration-tests/corpus_tests/e982bc050bb9f03096c23f181f5580d3de9de43e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": [
           "u"
@@ -22,9 +31,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": [
           "",
@@ -40,9 +58,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
@@ -54,9 +81,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
@@ -68,9 +104,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
@@ -82,9 +127,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
@@ -110,9 +173,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "G": []
       },
diff --git a/cedar-integration-tests/corpus_tests/e9b0ec04f07c26ecbbc07d77b61ab84f61e73b74.json b/cedar-integration-tests/corpus_tests/e9b0ec04f07c26ecbbc07d77b61ab84f61e73b74.json
index 78a827aa3..b2f368bf0 100644
--- a/cedar-integration-tests/corpus_tests/e9b0ec04f07c26ecbbc07d77b61ab84f61e73b74.json
+++ b/cedar-integration-tests/corpus_tests/e9b0ec04f07c26ecbbc07d77b61ab84f61e73b74.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#mp\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "#mp"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"#mp\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#mp\"",
+      "principal": {
+        "type": "a",
+        "id": "#mp"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#mp"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"#mp\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#mp\"",
+      "principal": {
+        "type": "a",
+        "id": "#mp"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#mp"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"#mp\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#mp\"",
+      "principal": {
+        "type": "a",
+        "id": "#mp"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#mp"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"#mp\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#mp\"",
+      "principal": {
+        "type": "a",
+        "id": "#mp"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#mp"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"#mp\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#mp\"",
+      "principal": {
+        "type": "a",
+        "id": "#mp"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#mp"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"#mp\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#mp\"",
+      "principal": {
+        "type": "a",
+        "id": "#mp"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#mp"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"#mp\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"#mp\"",
+      "principal": {
+        "type": "a",
+        "id": "#mp"
+      },
+      "resource": {
+        "type": "a",
+        "id": "#mp"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e9bf9a0ffb7521be078ea0d9800c27c8aaf39ee7.json b/cedar-integration-tests/corpus_tests/e9bf9a0ffb7521be078ea0d9800c27c8aaf39ee7.json
index 576969b25..36f844e4d 100644
--- a/cedar-integration-tests/corpus_tests/e9bf9a0ffb7521be078ea0d9800c27c8aaf39ee7.json
+++ b/cedar-integration-tests/corpus_tests/e9bf9a0ffb7521be078ea0d9800c27c8aaf39ee7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"q\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"q\"",
+      "principal": {
+        "type": "a",
+        "id": "q"
+      },
+      "resource": {
+        "type": "a",
+        "id": "q"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/e9c321ef900eaf29831efa839cb8f0ba5e431852.json b/cedar-integration-tests/corpus_tests/e9c321ef900eaf29831efa839cb8f0ba5e431852.json
index 3d3f92a7a..7d34db897 100644
--- a/cedar-integration-tests/corpus_tests/e9c321ef900eaf29831efa839cb8f0ba5e431852.json
+++ b/cedar-integration-tests/corpus_tests/e9c321ef900eaf29831efa839cb8f0ba5e431852.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "T3z0::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "T3z0::\"\"",
+      "principal": {
+        "type": "T3z0",
+        "id": ""
+      },
+      "resource": {
+        "type": "T3z0",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "T3z0::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "T3z0::\"\"",
+      "principal": {
+        "type": "T3z0",
+        "id": ""
+      },
+      "resource": {
+        "type": "T3z0",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "T3z0::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "T3z0::\"\"",
+      "principal": {
+        "type": "T3z0",
+        "id": ""
+      },
+      "resource": {
+        "type": "T3z0",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "T3z0::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "T3z0::\"\"",
+      "principal": {
+        "type": "T3z0",
+        "id": ""
+      },
+      "resource": {
+        "type": "T3z0",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "T3z0::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "T3z0::\"\"",
+      "principal": {
+        "type": "T3z0",
+        "id": ""
+      },
+      "resource": {
+        "type": "T3z0",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "T3z0::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "T3z0::\"\"",
+      "principal": {
+        "type": "T3z0",
+        "id": ""
+      },
+      "resource": {
+        "type": "T3z0",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "T3z0::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "T3z0::\"\"",
+      "principal": {
+        "type": "T3z0",
+        "id": ""
+      },
+      "resource": {
+        "type": "T3z0",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "T3z0::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "T3z0::\"\"",
+      "principal": {
+        "type": "T3z0",
+        "id": ""
+      },
+      "resource": {
+        "type": "T3z0",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ea1deadd3d188a9751dfddb6bb567d6e190152e6.json b/cedar-integration-tests/corpus_tests/ea1deadd3d188a9751dfddb6bb567d6e190152e6.json
index cc6fe9197..67462e0c5 100644
--- a/cedar-integration-tests/corpus_tests/ea1deadd3d188a9751dfddb6bb567d6e190152e6.json
+++ b/cedar-integration-tests/corpus_tests/ea1deadd3d188a9751dfddb6bb567d6e190152e6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ea3b3bb7b61997bc73aa38c5229b58386ddc2606.json b/cedar-integration-tests/corpus_tests/ea3b3bb7b61997bc73aa38c5229b58386ddc2606.json
index 17bf599b2..7b334ce04 100644
--- a/cedar-integration-tests/corpus_tests/ea3b3bb7b61997bc73aa38c5229b58386ddc2606.json
+++ b/cedar-integration-tests/corpus_tests/ea3b3bb7b61997bc73aa38c5229b58386ddc2606.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ea66114dfde4a1054167ad3842044654009871f0.json b/cedar-integration-tests/corpus_tests/ea66114dfde4a1054167ad3842044654009871f0.json
index da22be8d0..72d0bd4b6 100644
--- a/cedar-integration-tests/corpus_tests/ea66114dfde4a1054167ad3842044654009871f0.json
+++ b/cedar-integration-tests/corpus_tests/ea66114dfde4a1054167ad3842044654009871f0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ea67eaf13be16e92be8c2465e7fd55899e0abf80.json b/cedar-integration-tests/corpus_tests/ea67eaf13be16e92be8c2465e7fd55899e0abf80.json
index 71efb8c56..812aab099 100644
--- a/cedar-integration-tests/corpus_tests/ea67eaf13be16e92be8c2465e7fd55899e0abf80.json
+++ b/cedar-integration-tests/corpus_tests/ea67eaf13be16e92be8c2465e7fd55899e0abf80.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ea8a02edf1364288d32708cb2415aac3559454df.json b/cedar-integration-tests/corpus_tests/ea8a02edf1364288d32708cb2415aac3559454df.json
index 8ba629bff..b86308cc7 100644
--- a/cedar-integration-tests/corpus_tests/ea8a02edf1364288d32708cb2415aac3559454df.json
+++ b/cedar-integration-tests/corpus_tests/ea8a02edf1364288d32708cb2415aac3559454df.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Kfhhfhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhfhh::\"\"",
+      "principal": {
+        "type": "Kfhhfhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhfhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Kfhhfhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhfhh::\"\"",
+      "principal": {
+        "type": "Kfhhfhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhfhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Kfhhfhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhfhh::\"\"",
+      "principal": {
+        "type": "Kfhhfhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhfhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Kfhhfhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhfhh::\"\"",
+      "principal": {
+        "type": "Kfhhfhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhfhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Kfhhfhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhfhh::\"\"",
+      "principal": {
+        "type": "Kfhhfhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhfhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Kfhhfhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhfhh::\"\"",
+      "principal": {
+        "type": "Kfhhfhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhfhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Kfhhfhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhfhh::\"\"",
+      "principal": {
+        "type": "Kfhhfhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhfhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Kfhhfhh::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhfhh::\"\"",
+      "principal": {
+        "type": "Kfhhfhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "Kfhhfhh",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/eaac8c3e94a8abdf6d8ddcae599dfe50a51b2cd4.json b/cedar-integration-tests/corpus_tests/eaac8c3e94a8abdf6d8ddcae599dfe50a51b2cd4.json
index bd75ddaf1..d808c3789 100644
--- a/cedar-integration-tests/corpus_tests/eaac8c3e94a8abdf6d8ddcae599dfe50a51b2cd4.json
+++ b/cedar-integration-tests/corpus_tests/eaac8c3e94a8abdf6d8ddcae599dfe50a51b2cd4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "j"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/eab2e001e952237e012d570aa287b8cbb349d64e.json b/cedar-integration-tests/corpus_tests/eab2e001e952237e012d570aa287b8cbb349d64e.json
index 40d3a924c..c865341a9 100644
--- a/cedar-integration-tests/corpus_tests/eab2e001e952237e012d570aa287b8cbb349d64e.json
+++ b/cedar-integration-tests/corpus_tests/eab2e001e952237e012d570aa287b8cbb349d64e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\u{7f}\\u{1}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{7f}\\u{1}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0001"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/eabb42b2e81c0bad00a33668a407915bf8a3b0d8.json b/cedar-integration-tests/corpus_tests/eabb42b2e81c0bad00a33668a407915bf8a3b0d8.json
index 56774e6af..2fc8d91bf 100644
--- a/cedar-integration-tests/corpus_tests/eabb42b2e81c0bad00a33668a407915bf8a3b0d8.json
+++ b/cedar-integration-tests/corpus_tests/eabb42b2e81c0bad00a33668a407915bf8a3b0d8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"$\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"$\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"$\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"$\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"$\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"$\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"$\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/eae3e1fd9f742fe24356b3508199c42e6aa33f09.json b/cedar-integration-tests/corpus_tests/eae3e1fd9f742fe24356b3508199c42e6aa33f09.json
index 81357b108..c5ecf4186 100644
--- a/cedar-integration-tests/corpus_tests/eae3e1fd9f742fe24356b3508199c42e6aa33f09.json
+++ b/cedar-integration-tests/corpus_tests/eae3e1fd9f742fe24356b3508199c42e6aa33f09.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/eb549688b05eb58deaeb21ee99e7610f80eee8f6.json b/cedar-integration-tests/corpus_tests/eb549688b05eb58deaeb21ee99e7610f80eee8f6.json
index aa651467e..f353e0ae7 100644
--- a/cedar-integration-tests/corpus_tests/eb549688b05eb58deaeb21ee99e7610f80eee8f6.json
+++ b/cedar-integration-tests/corpus_tests/eb549688b05eb58deaeb21ee99e7610f80eee8f6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\u{8}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\u{8}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\b"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/eb79680a659ae3f09376151f8d754ec0c055497d.json b/cedar-integration-tests/corpus_tests/eb79680a659ae3f09376151f8d754ec0c055497d.json
index 7c26cdaab..9862d0cad 100644
--- a/cedar-integration-tests/corpus_tests/eb79680a659ae3f09376151f8d754ec0c055497d.json
+++ b/cedar-integration-tests/corpus_tests/eb79680a659ae3f09376151f8d754ec0c055497d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z~\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "z~"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"z~\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z~\"",
+      "principal": {
+        "type": "a",
+        "id": "z~"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z~"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"z~\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z~\"",
+      "principal": {
+        "type": "a",
+        "id": "z~"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z~"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"z~\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z~\"",
+      "principal": {
+        "type": "a",
+        "id": "z~"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z~"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"z~\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z~\"",
+      "principal": {
+        "type": "a",
+        "id": "z~"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z~"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"z~\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z~\"",
+      "principal": {
+        "type": "a",
+        "id": "z~"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z~"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"z~\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z~\"",
+      "principal": {
+        "type": "a",
+        "id": "z~"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z~"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"z~\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"z~\"",
+      "principal": {
+        "type": "a",
+        "id": "z~"
+      },
+      "resource": {
+        "type": "a",
+        "id": "z~"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/eb94687cfe8e7a96150ffd9eb9601dc1eda7c66e.json b/cedar-integration-tests/corpus_tests/eb94687cfe8e7a96150ffd9eb9601dc1eda7c66e.json
index 5e88593d8..5a05550f8 100644
--- a/cedar-integration-tests/corpus_tests/eb94687cfe8e7a96150ffd9eb9601dc1eda7c66e.json
+++ b/cedar-integration-tests/corpus_tests/eb94687cfe8e7a96150ffd9eb9601dc1eda7c66e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"ff\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"ff\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ebd1f29e70f34ab27a95201a43d2a72cd392b266.json b/cedar-integration-tests/corpus_tests/ebd1f29e70f34ab27a95201a43d2a72cd392b266.json
index 0cd87953a..f2cb4d188 100644
--- a/cedar-integration-tests/corpus_tests/ebd1f29e70f34ab27a95201a43d2a72cd392b266.json
+++ b/cedar-integration-tests/corpus_tests/ebd1f29e70f34ab27a95201a43d2a72cd392b266.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ebd9baf0cf40cd6b817574bf8256f59cf572d692.json b/cedar-integration-tests/corpus_tests/ebd9baf0cf40cd6b817574bf8256f59cf572d692.json
index 27d41ee71..410e080cb 100644
--- a/cedar-integration-tests/corpus_tests/ebd9baf0cf40cd6b817574bf8256f59cf572d692.json
+++ b/cedar-integration-tests/corpus_tests/ebd9baf0cf40cd6b817574bf8256f59cf572d692.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ebde68fb4f2bfaa027510c8ff74d6c727432f550.json b/cedar-integration-tests/corpus_tests/ebde68fb4f2bfaa027510c8ff74d6c727432f550.json
index cb37a134e..d18f8e4bc 100644
--- a/cedar-integration-tests/corpus_tests/ebde68fb4f2bfaa027510c8ff74d6c727432f550.json
+++ b/cedar-integration-tests/corpus_tests/ebde68fb4f2bfaa027510c8ff74d6c727432f550.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "KChfhh::KhkkkkkkBhhhXghhh::\"\"",
-      "action": "KChfhh::Action::\"action\"",
-      "resource": "KChfhh::KhkkkkkkBhhhXghhh::\"\"",
+      "principal": {
+        "type": "KChfhh::KhkkkkkkBhhhXghhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "KChfhh::KhkkkkkkBhhhXghhh",
+        "id": ""
+      },
+      "action": {
+        "type": "KChfhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "KChfhh::KhkkkkkkBhhhXghhh::\"\"",
-      "action": "KChfhh::Action::\"action\"",
-      "resource": "KChfhh::KhkkkkkkBhhhXghhh::\"\"",
+      "principal": {
+        "type": "KChfhh::KhkkkkkkBhhhXghhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "KChfhh::KhkkkkkkBhhhXghhh",
+        "id": ""
+      },
+      "action": {
+        "type": "KChfhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "KChfhh::KhkkkkkkBhhhXghhh::\"\"",
-      "action": "KChfhh::Action::\"action\"",
-      "resource": "KChfhh::KhkkkkkkBhhhXghhh::\"\"",
+      "principal": {
+        "type": "KChfhh::KhkkkkkkBhhhXghhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "KChfhh::KhkkkkkkBhhhXghhh",
+        "id": ""
+      },
+      "action": {
+        "type": "KChfhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "KChfhh::KhkkkkkkBhhhXghhh::\"\"",
-      "action": "KChfhh::Action::\"action\"",
-      "resource": "KChfhh::KhkkkkkkBhhhXghhh::\"\"",
+      "principal": {
+        "type": "KChfhh::KhkkkkkkBhhhXghhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "KChfhh::KhkkkkkkBhhhXghhh",
+        "id": ""
+      },
+      "action": {
+        "type": "KChfhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "KChfhh::KhkkkkkkBhhhXghhh::\"\"",
-      "action": "KChfhh::Action::\"action\"",
-      "resource": "KChfhh::KhkkkkkkBhhhXghhh::\"\"",
+      "principal": {
+        "type": "KChfhh::KhkkkkkkBhhhXghhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "KChfhh::KhkkkkkkBhhhXghhh",
+        "id": ""
+      },
+      "action": {
+        "type": "KChfhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "KChfhh::KhkkkkkkBhhhXghhh::\"\"",
-      "action": "KChfhh::Action::\"action\"",
-      "resource": "KChfhh::KhkkkkkkBhhhXghhh::\"\"",
+      "principal": {
+        "type": "KChfhh::KhkkkkkkBhhhXghhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "KChfhh::KhkkkkkkBhhhXghhh",
+        "id": ""
+      },
+      "action": {
+        "type": "KChfhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "KChfhh::KhkkkkkkBhhhXghhh::\"\"",
-      "action": "KChfhh::Action::\"action\"",
-      "resource": "KChfhh::KhkkkkkkBhhhXghhh::\"\"",
+      "principal": {
+        "type": "KChfhh::KhkkkkkkBhhhXghhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "KChfhh::KhkkkkkkBhhhXghhh",
+        "id": ""
+      },
+      "action": {
+        "type": "KChfhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "KChfhh::KhkkkkkkBhhhXghhh::\"\"",
-      "action": "KChfhh::Action::\"action\"",
-      "resource": "KChfhh::KhkkkkkkBhhhXghhh::\"\"",
+      "principal": {
+        "type": "KChfhh::KhkkkkkkBhhhXghhh",
+        "id": ""
+      },
+      "resource": {
+        "type": "KChfhh::KhkkkkkkBhhhXghhh",
+        "id": ""
+      },
+      "action": {
+        "type": "KChfhh::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ec161281562607a66b1f81afd1749c629f8b481a.json b/cedar-integration-tests/corpus_tests/ec161281562607a66b1f81afd1749c629f8b481a.json
index fd551c4cd..983903125 100644
--- a/cedar-integration-tests/corpus_tests/ec161281562607a66b1f81afd1749c629f8b481a.json
+++ b/cedar-integration-tests/corpus_tests/ec161281562607a66b1f81afd1749c629f8b481a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ec17b82554295cb700c5c7b245471f51772a3b24.json b/cedar-integration-tests/corpus_tests/ec17b82554295cb700c5c7b245471f51772a3b24.json
index bec6191b0..ce50a76e2 100644
--- a/cedar-integration-tests/corpus_tests/ec17b82554295cb700c5c7b245471f51772a3b24.json
+++ b/cedar-integration-tests/corpus_tests/ec17b82554295cb700c5c7b245471f51772a3b24.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"fffffffgf`f\\0ff~\\0f\\'fr\\0\\0fT\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffffgf`f\\0ff~\\0f\\'fr\\0\\0fT\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffffgf`f\u0000ff~\u0000f'fr\u0000\u0000fT"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffffgf`f\u0000ff~\u0000f'fr\u0000\u0000fT"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"fffffffgf`f\\0ff~\\0f\\'fr\\0\\0fT\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffffgf`f\\0ff~\\0f\\'fr\\0\\0fT\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffffgf`f\u0000ff~\u0000f'fr\u0000\u0000fT"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffffgf`f\u0000ff~\u0000f'fr\u0000\u0000fT"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"fffffffgf`f\\0ff~\\0f\\'fr\\0\\0fT\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffffgf`f\\0ff~\\0f\\'fr\\0\\0fT\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffffgf`f\u0000ff~\u0000f'fr\u0000\u0000fT"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffffgf`f\u0000ff~\u0000f'fr\u0000\u0000fT"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"fffffffgf`f\\0ff~\\0f\\'fr\\0\\0fT\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffffgf`f\\0ff~\\0f\\'fr\\0\\0fT\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffffgf`f\u0000ff~\u0000f'fr\u0000\u0000fT"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffffgf`f\u0000ff~\u0000f'fr\u0000\u0000fT"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"fffffffgf`f\\0ff~\\0f\\'fr\\0\\0fT\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffffgf`f\\0ff~\\0f\\'fr\\0\\0fT\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffffgf`f\u0000ff~\u0000f'fr\u0000\u0000fT"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffffgf`f\u0000ff~\u0000f'fr\u0000\u0000fT"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"fffffffgf`f\\0ff~\\0f\\'fr\\0\\0fT\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffffgf`f\\0ff~\\0f\\'fr\\0\\0fT\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffffgf`f\u0000ff~\u0000f'fr\u0000\u0000fT"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffffgf`f\u0000ff~\u0000f'fr\u0000\u0000fT"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"fffffffgf`f\\0ff~\\0f\\'fr\\0\\0fT\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffffgf`f\\0ff~\\0f\\'fr\\0\\0fT\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffffgf`f\u0000ff~\u0000f'fr\u0000\u0000fT"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffffgf`f\u0000ff~\u0000f'fr\u0000\u0000fT"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"fffffffgf`f\\0ff~\\0f\\'fr\\0\\0fT\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"fffffffgf`f\\0ff~\\0f\\'fr\\0\\0fT\"",
+      "principal": {
+        "type": "a",
+        "id": "fffffffgf`f\u0000ff~\u0000f'fr\u0000\u0000fT"
+      },
+      "resource": {
+        "type": "a",
+        "id": "fffffffgf`f\u0000ff~\u0000f'fr\u0000\u0000fT"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ec1d94aec00ec1a3d5cd078475d0dc3a76510011.json b/cedar-integration-tests/corpus_tests/ec1d94aec00ec1a3d5cd078475d0dc3a76510011.json
index 35892ac14..9a448b8e2 100644
--- a/cedar-integration-tests/corpus_tests/ec1d94aec00ec1a3d5cd078475d0dc3a76510011.json
+++ b/cedar-integration-tests/corpus_tests/ec1d94aec00ec1a3d5cd078475d0dc3a76510011.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"yyyyy\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "yyyyy"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"yyyyy\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "yyyyy"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"yyyyy\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "yyyyy"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ec4254b1a4ee88e6658d26a5e0ff9e9da959177f.json b/cedar-integration-tests/corpus_tests/ec4254b1a4ee88e6658d26a5e0ff9e9da959177f.json
index f44defecb..dca6e5652 100644
--- a/cedar-integration-tests/corpus_tests/ec4254b1a4ee88e6658d26a5e0ff9e9da959177f.json
+++ b/cedar-integration-tests/corpus_tests/ec4254b1a4ee88e6658d26a5e0ff9e9da959177f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ec546c129260fbb2bea5debe948cb5cffe53e8d4.json b/cedar-integration-tests/corpus_tests/ec546c129260fbb2bea5debe948cb5cffe53e8d4.json
index 6273eb9c4..62d0f96a4 100644
--- a/cedar-integration-tests/corpus_tests/ec546c129260fbb2bea5debe948cb5cffe53e8d4.json
+++ b/cedar-integration-tests/corpus_tests/ec546c129260fbb2bea5debe948cb5cffe53e8d4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ec8f38afacaa4b80b214366039f6e06dc680ae8b.json b/cedar-integration-tests/corpus_tests/ec8f38afacaa4b80b214366039f6e06dc680ae8b.json
index de317a105..27bcae3ae 100644
--- a/cedar-integration-tests/corpus_tests/ec8f38afacaa4b80b214366039f6e06dc680ae8b.json
+++ b/cedar-integration-tests/corpus_tests/ec8f38afacaa4b80b214366039f6e06dc680ae8b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::B::xl::V::a::\"\"",
-      "action": "r::B::xl::V::Action::\"action\"",
-      "resource": "r::B::xl::V::a::\"\"",
+      "principal": {
+        "type": "r::B::xl::V::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::B::xl::V::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::B::xl::V::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::B::xl::V::a::\"\"",
-      "action": "r::B::xl::V::Action::\"action\"",
-      "resource": "r::B::xl::V::a::\"\"",
+      "principal": {
+        "type": "r::B::xl::V::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::B::xl::V::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::B::xl::V::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::B::xl::V::a::\"\"",
-      "action": "r::B::xl::V::Action::\"action\"",
-      "resource": "r::B::xl::V::a::\"\"",
+      "principal": {
+        "type": "r::B::xl::V::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::B::xl::V::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::B::xl::V::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::B::xl::V::a::\"\"",
-      "action": "r::B::xl::V::Action::\"action\"",
-      "resource": "r::B::xl::V::a::\"\"",
+      "principal": {
+        "type": "r::B::xl::V::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::B::xl::V::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::B::xl::V::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::B::xl::V::a::\"\"",
-      "action": "r::B::xl::V::Action::\"action\"",
-      "resource": "r::B::xl::V::a::\"\"",
+      "principal": {
+        "type": "r::B::xl::V::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::B::xl::V::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::B::xl::V::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::B::xl::V::a::\"\"",
-      "action": "r::B::xl::V::Action::\"action\"",
-      "resource": "r::B::xl::V::a::\"\"",
+      "principal": {
+        "type": "r::B::xl::V::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::B::xl::V::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::B::xl::V::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::B::xl::V::a::\"\"",
-      "action": "r::B::xl::V::Action::\"action\"",
-      "resource": "r::B::xl::V::a::\"\"",
+      "principal": {
+        "type": "r::B::xl::V::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::B::xl::V::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::B::xl::V::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::B::xl::V::a::\"\"",
-      "action": "r::B::xl::V::Action::\"action\"",
-      "resource": "r::B::xl::V::a::\"\"",
+      "principal": {
+        "type": "r::B::xl::V::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::B::xl::V::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::B::xl::V::Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/ec9dd30e89a3764e03ddea1cdd980fbfcfc7b2b2.json b/cedar-integration-tests/corpus_tests/ec9dd30e89a3764e03ddea1cdd980fbfcfc7b2b2.json
index c3f32e116..ef9389254 100644
--- a/cedar-integration-tests/corpus_tests/ec9dd30e89a3764e03ddea1cdd980fbfcfc7b2b2.json
+++ b/cedar-integration-tests/corpus_tests/ec9dd30e89a3764e03ddea1cdd980fbfcfc7b2b2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/eca483a27ff569d3800dbb3800d017cc1cd22fec.json b/cedar-integration-tests/corpus_tests/eca483a27ff569d3800dbb3800d017cc1cd22fec.json
index 37a381488..1da80a085 100644
--- a/cedar-integration-tests/corpus_tests/eca483a27ff569d3800dbb3800d017cc1cd22fec.json
+++ b/cedar-integration-tests/corpus_tests/eca483a27ff569d3800dbb3800d017cc1cd22fec.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/eca862d296e406c0eaa97da5ab64b63009838a84.json b/cedar-integration-tests/corpus_tests/eca862d296e406c0eaa97da5ab64b63009838a84.json
index 5827b56c5..633a5ee2b 100644
--- a/cedar-integration-tests/corpus_tests/eca862d296e406c0eaa97da5ab64b63009838a84.json
+++ b/cedar-integration-tests/corpus_tests/eca862d296e406c0eaa97da5ab64b63009838a84.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0#\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0java\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0#\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0java\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000#\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000java"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000#\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000java"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0#\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0java\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0#\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0java\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000#\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000java"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000#\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000java"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0#\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0java\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0#\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0java\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000#\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000java"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000#\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000java"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0#\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0java\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0#\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0java\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000#\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000java"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000#\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000java"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0#\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0java\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0#\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0java\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000#\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000java"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000#\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000java"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0#\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0java\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0#\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0java\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000#\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000java"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000#\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000java"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0#\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0java\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0#\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0java\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000#\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000java"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000#\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000java"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0#\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0java\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\\0\\0#\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0java\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000#\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000java"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000#\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000java"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ecadbd80f49ec54cc7231bc5bdf865903407c506.json b/cedar-integration-tests/corpus_tests/ecadbd80f49ec54cc7231bc5bdf865903407c506.json
index b6050643e..886dc4cca 100644
--- a/cedar-integration-tests/corpus_tests/ecadbd80f49ec54cc7231bc5bdf865903407c506.json
+++ b/cedar-integration-tests/corpus_tests/ecadbd80f49ec54cc7231bc5bdf865903407c506.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::r::r::r33::r::r::V::r::a::\"\"",
-      "action": "r::r::r::r::r33::r::r::V::r::Action::\"action\"",
-      "resource": "r::r::r::r::r33::r::r::V::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r33::r::r::V::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::r::r::r33::r::r::V::r::a::\"\"",
-      "action": "r::r::r::r::r33::r::r::V::r::Action::\"action\"",
-      "resource": "r::r::r::r::r33::r::r::V::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r33::r::r::V::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::r::r::r33::r::r::V::r::a::\"\"",
-      "action": "r::r::r::r::r33::r::r::V::r::Action::\"action\"",
-      "resource": "r::r::r::r::r33::r::r::V::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r33::r::r::V::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::r::r::r33::r::r::V::r::a::\"\"",
-      "action": "r::r::r::r::r33::r::r::V::r::Action::\"action\"",
-      "resource": "r::r::r::r::r33::r::r::V::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r33::r::r::V::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::r::r::r33::r::r::V::r::a::\"\"",
-      "action": "r::r::r::r::r33::r::r::V::r::Action::\"action\"",
-      "resource": "r::r::r::r::r33::r::r::V::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r33::r::r::V::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::r::r::r33::r::r::V::r::a::\"\"",
-      "action": "r::r::r::r::r33::r::r::V::r::Action::\"action\"",
-      "resource": "r::r::r::r::r33::r::r::V::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r33::r::r::V::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::r::r::r33::r::r::V::r::a::\"\"",
-      "action": "r::r::r::r::r33::r::r::V::r::Action::\"action\"",
-      "resource": "r::r::r::r::r33::r::r::V::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r33::r::r::V::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::r::r::r33::r::r::V::r::a::\"\"",
-      "action": "r::r::r::r::r33::r::r::V::r::Action::\"action\"",
-      "resource": "r::r::r::r::r33::r::r::V::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r33::r::r::V::r::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ecadca702f808cf70fe36db826a2e62ea659db11.json b/cedar-integration-tests/corpus_tests/ecadca702f808cf70fe36db826a2e62ea659db11.json
index b983720fc..b1b8d8876 100644
--- a/cedar-integration-tests/corpus_tests/ecadca702f808cf70fe36db826a2e62ea659db11.json
+++ b/cedar-integration-tests/corpus_tests/ecadca702f808cf70fe36db826a2e62ea659db11.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"%\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "%"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ece10c9b5baef38c334a1c310679e457562b8081.json b/cedar-integration-tests/corpus_tests/ece10c9b5baef38c334a1c310679e457562b8081.json
index b52c1858c..fd1ffa5c6 100644
--- a/cedar-integration-tests/corpus_tests/ece10c9b5baef38c334a1c310679e457562b8081.json
+++ b/cedar-integration-tests/corpus_tests/ece10c9b5baef38c334a1c310679e457562b8081.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ece73ee86354c14a47b1b9227999de3177fac31b.json b/cedar-integration-tests/corpus_tests/ece73ee86354c14a47b1b9227999de3177fac31b.json
index d5736802b..619ad210f 100644
--- a/cedar-integration-tests/corpus_tests/ece73ee86354c14a47b1b9227999de3177fac31b.json
+++ b/cedar-integration-tests/corpus_tests/ece73ee86354c14a47b1b9227999de3177fac31b.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "iwwwww::Action::\"o:;::::ff\"",
       "resource": null,
+      "action": {
+        "type": "iwwwww::Action",
+        "id": "o:;::::ff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "iwwwww::Action::\"o:;::::ff\"",
       "resource": null,
+      "action": {
+        "type": "iwwwww::Action",
+        "id": "o:;::::ff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "iwwwww::Action::\"o:;::::ff\"",
       "resource": null,
+      "action": {
+        "type": "iwwwww::Action",
+        "id": "o:;::::ff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "iwwwww::Action::\"o:;::::ff\"",
       "resource": null,
+      "action": {
+        "type": "iwwwww::Action",
+        "id": "o:;::::ff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "iwwwww::Action::\"o:;::::ff\"",
       "resource": null,
+      "action": {
+        "type": "iwwwww::Action",
+        "id": "o:;::::ff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "iwwwww::Action::\"o:;::::ff\"",
       "resource": null,
+      "action": {
+        "type": "iwwwww::Action",
+        "id": "o:;::::ff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "iwwwww::Action::\"o:;::::ff\"",
       "resource": null,
+      "action": {
+        "type": "iwwwww::Action",
+        "id": "o:;::::ff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "iwwwww::Action::\"o:;::::ff\"",
       "resource": null,
+      "action": {
+        "type": "iwwwww::Action",
+        "id": "o:;::::ff"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ed0a039227f28a92c320b1302316cf67fc28c00f.json b/cedar-integration-tests/corpus_tests/ed0a039227f28a92c320b1302316cf67fc28c00f.json
index 549b64276..a2a972845 100644
--- a/cedar-integration-tests/corpus_tests/ed0a039227f28a92c320b1302316cf67fc28c00f.json
+++ b/cedar-integration-tests/corpus_tests/ed0a039227f28a92c320b1302316cf67fc28c00f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"&\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"&\"",
+      "principal": {
+        "type": "a",
+        "id": "&"
+      },
+      "resource": {
+        "type": "a",
+        "id": "&"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ed1329e9a9e4ae97dda03d5e6f8dbcc1cd4262f9.json b/cedar-integration-tests/corpus_tests/ed1329e9a9e4ae97dda03d5e6f8dbcc1cd4262f9.json
index 96f2179af..ca476c29d 100644
--- a/cedar-integration-tests/corpus_tests/ed1329e9a9e4ae97dda03d5e6f8dbcc1cd4262f9.json
+++ b/cedar-integration-tests/corpus_tests/ed1329e9a9e4ae97dda03d5e6f8dbcc1cd4262f9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ed1ce2fa3332326bafdf017d584c07b142c7793e.json b/cedar-integration-tests/corpus_tests/ed1ce2fa3332326bafdf017d584c07b142c7793e.json
index 4150bc1d5..e8fda7b72 100644
--- a/cedar-integration-tests/corpus_tests/ed1ce2fa3332326bafdf017d584c07b142c7793e.json
+++ b/cedar-integration-tests/corpus_tests/ed1ce2fa3332326bafdf017d584c07b142c7793e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "o::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "o::\"\"",
+      "principal": {
+        "type": "o",
+        "id": ""
+      },
+      "resource": {
+        "type": "o",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bcqs20000": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "o::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "o::\"\"",
+      "principal": {
+        "type": "o",
+        "id": ""
+      },
+      "resource": {
+        "type": "o",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bcqs20000": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "o::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "o::\"\"",
+      "principal": {
+        "type": "o",
+        "id": ""
+      },
+      "resource": {
+        "type": "o",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bcqs20000": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "o::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "o::\"\"",
+      "principal": {
+        "type": "o",
+        "id": ""
+      },
+      "resource": {
+        "type": "o",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bcqs20000": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "o::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "o::\"\"",
+      "principal": {
+        "type": "o",
+        "id": ""
+      },
+      "resource": {
+        "type": "o",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bcqs20000": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "o::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "o::\"\"",
+      "principal": {
+        "type": "o",
+        "id": ""
+      },
+      "resource": {
+        "type": "o",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bcqs20000": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "o::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "o::\"\"",
+      "principal": {
+        "type": "o",
+        "id": ""
+      },
+      "resource": {
+        "type": "o",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bcqs20000": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "o::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "o::\"\"",
+      "principal": {
+        "type": "o",
+        "id": ""
+      },
+      "resource": {
+        "type": "o",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "Bcqs20000": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/ed50cb715d57475bc9dacda0ba0dd77c589832e8.json b/cedar-integration-tests/corpus_tests/ed50cb715d57475bc9dacda0ba0dd77c589832e8.json
index 0606cc3f7..3b5d0b17e 100644
--- a/cedar-integration-tests/corpus_tests/ed50cb715d57475bc9dacda0ba0dd77c589832e8.json
+++ b/cedar-integration-tests/corpus_tests/ed50cb715d57475bc9dacda0ba0dd77c589832e8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ed697643b8137f84bcb4b30eb65c756a25e3174e.json b/cedar-integration-tests/corpus_tests/ed697643b8137f84bcb4b30eb65c756a25e3174e.json
index e7f5a75b1..152590d56 100644
--- a/cedar-integration-tests/corpus_tests/ed697643b8137f84bcb4b30eb65c756a25e3174e.json
+++ b/cedar-integration-tests/corpus_tests/ed697643b8137f84bcb4b30eb65c756a25e3174e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "z::a::\"86\"",
-      "action": "z::Action::\"action\"",
-      "resource": "z::a::\"86\"",
+      "principal": {
+        "type": "z::a",
+        "id": "86"
+      },
+      "resource": {
+        "type": "z::a",
+        "id": "86"
+      },
+      "action": {
+        "type": "z::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "z::a::\"86\"",
-      "action": "z::Action::\"action\"",
-      "resource": "z::a::\"86\"",
+      "principal": {
+        "type": "z::a",
+        "id": "86"
+      },
+      "resource": {
+        "type": "z::a",
+        "id": "86"
+      },
+      "action": {
+        "type": "z::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "z::a::\"86\"",
-      "action": "z::Action::\"action\"",
-      "resource": "z::a::\"86\"",
+      "principal": {
+        "type": "z::a",
+        "id": "86"
+      },
+      "resource": {
+        "type": "z::a",
+        "id": "86"
+      },
+      "action": {
+        "type": "z::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "z::a::\"86\"",
-      "action": "z::Action::\"action\"",
-      "resource": "z::a::\"86\"",
+      "principal": {
+        "type": "z::a",
+        "id": "86"
+      },
+      "resource": {
+        "type": "z::a",
+        "id": "86"
+      },
+      "action": {
+        "type": "z::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "z::a::\"86\"",
-      "action": "z::Action::\"action\"",
-      "resource": "z::a::\"86\"",
+      "principal": {
+        "type": "z::a",
+        "id": "86"
+      },
+      "resource": {
+        "type": "z::a",
+        "id": "86"
+      },
+      "action": {
+        "type": "z::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "z::a::\"86\"",
-      "action": "z::Action::\"action\"",
-      "resource": "z::a::\"86\"",
+      "principal": {
+        "type": "z::a",
+        "id": "86"
+      },
+      "resource": {
+        "type": "z::a",
+        "id": "86"
+      },
+      "action": {
+        "type": "z::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "z::a::\"86\"",
-      "action": "z::Action::\"action\"",
-      "resource": "z::a::\"86\"",
+      "principal": {
+        "type": "z::a",
+        "id": "86"
+      },
+      "resource": {
+        "type": "z::a",
+        "id": "86"
+      },
+      "action": {
+        "type": "z::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "z::a::\"86\"",
-      "action": "z::Action::\"action\"",
-      "resource": "z::a::\"86\"",
+      "principal": {
+        "type": "z::a",
+        "id": "86"
+      },
+      "resource": {
+        "type": "z::a",
+        "id": "86"
+      },
+      "action": {
+        "type": "z::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ee0e4d2430b6cdb096fbd181a965b7946bf45eea.json b/cedar-integration-tests/corpus_tests/ee0e4d2430b6cdb096fbd181a965b7946bf45eea.json
index 726a8f7a6..67547b866 100644
--- a/cedar-integration-tests/corpus_tests/ee0e4d2430b6cdb096fbd181a965b7946bf45eea.json
+++ b/cedar-integration-tests/corpus_tests/ee0e4d2430b6cdb096fbd181a965b7946bf45eea.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ee1fa449052339701d1c55068e63f92c7db896b8.json b/cedar-integration-tests/corpus_tests/ee1fa449052339701d1c55068e63f92c7db896b8.json
index 7ad6f9048..d01f31f66 100644
--- a/cedar-integration-tests/corpus_tests/ee1fa449052339701d1c55068e63f92c7db896b8.json
+++ b/cedar-integration-tests/corpus_tests/ee1fa449052339701d1c55068e63f92c7db896b8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\";\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ";"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\";\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ";"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ee4b7cbdbb7fcfed6d5e64fdb6e9745a6e70302e.json b/cedar-integration-tests/corpus_tests/ee4b7cbdbb7fcfed6d5e64fdb6e9745a6e70302e.json
index ce7073a11..839a0a4f3 100644
--- a/cedar-integration-tests/corpus_tests/ee4b7cbdbb7fcfed6d5e64fdb6e9745a6e70302e.json
+++ b/cedar-integration-tests/corpus_tests/ee4b7cbdbb7fcfed6d5e64fdb6e9745a6e70302e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"jL\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "jL\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"jL\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"jL\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "jL\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "jL\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"jL\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"jL\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "jL\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "jL\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"jL\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"jL\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "jL\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "jL\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"jL\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"jL\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "jL\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "jL\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"jL\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"jL\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "jL\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "jL\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"jL\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"jL\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "jL\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "jL\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"jL\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"jL\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "jL\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "jL\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ef4e9a9da6121724743477e359fd3ecd4de71362.json b/cedar-integration-tests/corpus_tests/ef4e9a9da6121724743477e359fd3ecd4de71362.json
index 2b5fdc7bc..9b689daa0 100644
--- a/cedar-integration-tests/corpus_tests/ef4e9a9da6121724743477e359fd3ecd4de71362.json
+++ b/cedar-integration-tests/corpus_tests/ef4e9a9da6121724743477e359fd3ecd4de71362.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ef55486f77e837ca67f88749434504a48760bbee.json b/cedar-integration-tests/corpus_tests/ef55486f77e837ca67f88749434504a48760bbee.json
index b0a8c2bee..dc133e6b0 100644
--- a/cedar-integration-tests/corpus_tests/ef55486f77e837ca67f88749434504a48760bbee.json
+++ b/cedar-integration-tests/corpus_tests/ef55486f77e837ca67f88749434504a48760bbee.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"60\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"60\"",
+      "principal": {
+        "type": "a",
+        "id": "60"
+      },
+      "resource": {
+        "type": "a",
+        "id": "60"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/efef3d790d796bae052ac24ab93a8e4e8d9bba06.json b/cedar-integration-tests/corpus_tests/efef3d790d796bae052ac24ab93a8e4e8d9bba06.json
index 11114591d..ed12807f6 100644
--- a/cedar-integration-tests/corpus_tests/efef3d790d796bae052ac24ab93a8e4e8d9bba06.json
+++ b/cedar-integration-tests/corpus_tests/efef3d790d796bae052ac24ab93a8e4e8d9bba06.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Wjjjxxxbjxjj11::a::\"\"",
-      "action": "Wjjjxxxbjxjj11::Action::\"action\"",
-      "resource": "Wjjjxxxbjxjj11::a::\"\"",
+      "principal": {
+        "type": "Wjjjxxxbjxjj11::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjjxxxbjxjj11::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Wjjjxxxbjxjj11::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Wjjjxxxbjxjj11::a::\"\"",
-      "action": "Wjjjxxxbjxjj11::Action::\"action\"",
-      "resource": "Wjjjxxxbjxjj11::a::\"\"",
+      "principal": {
+        "type": "Wjjjxxxbjxjj11::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjjxxxbjxjj11::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Wjjjxxxbjxjj11::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Wjjjxxxbjxjj11::a::\"\"",
-      "action": "Wjjjxxxbjxjj11::Action::\"action\"",
-      "resource": "Wjjjxxxbjxjj11::a::\"\"",
+      "principal": {
+        "type": "Wjjjxxxbjxjj11::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjjxxxbjxjj11::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Wjjjxxxbjxjj11::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Wjjjxxxbjxjj11::a::\"\"",
-      "action": "Wjjjxxxbjxjj11::Action::\"action\"",
-      "resource": "Wjjjxxxbjxjj11::a::\"\"",
+      "principal": {
+        "type": "Wjjjxxxbjxjj11::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjjxxxbjxjj11::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Wjjjxxxbjxjj11::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Wjjjxxxbjxjj11::a::\"\"",
-      "action": "Wjjjxxxbjxjj11::Action::\"action\"",
-      "resource": "Wjjjxxxbjxjj11::a::\"\"",
+      "principal": {
+        "type": "Wjjjxxxbjxjj11::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjjxxxbjxjj11::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Wjjjxxxbjxjj11::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Wjjjxxxbjxjj11::a::\"\"",
-      "action": "Wjjjxxxbjxjj11::Action::\"action\"",
-      "resource": "Wjjjxxxbjxjj11::a::\"\"",
+      "principal": {
+        "type": "Wjjjxxxbjxjj11::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjjxxxbjxjj11::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Wjjjxxxbjxjj11::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Wjjjxxxbjxjj11::a::\"\"",
-      "action": "Wjjjxxxbjxjj11::Action::\"action\"",
-      "resource": "Wjjjxxxbjxjj11::a::\"\"",
+      "principal": {
+        "type": "Wjjjxxxbjxjj11::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjjxxxbjxjj11::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Wjjjxxxbjxjj11::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Wjjjxxxbjxjj11::a::\"\"",
-      "action": "Wjjjxxxbjxjj11::Action::\"action\"",
-      "resource": "Wjjjxxxbjxjj11::a::\"\"",
+      "principal": {
+        "type": "Wjjjxxxbjxjj11::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Wjjjxxxbjxjj11::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Wjjjxxxbjxjj11::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/eff2557e80c650481f9850bc32dbd8a483ef8077.json b/cedar-integration-tests/corpus_tests/eff2557e80c650481f9850bc32dbd8a483ef8077.json
index 13d7ef87b..52cdc5ff6 100644
--- a/cedar-integration-tests/corpus_tests/eff2557e80c650481f9850bc32dbd8a483ef8077.json
+++ b/cedar-integration-tests/corpus_tests/eff2557e80c650481f9850bc32dbd8a483ef8077.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f02c1a74821e12d19cc295e9839d01b459d8054e.json b/cedar-integration-tests/corpus_tests/f02c1a74821e12d19cc295e9839d01b459d8054e.json
index 0c537514d..4da7a3a52 100644
--- a/cedar-integration-tests/corpus_tests/f02c1a74821e12d19cc295e9839d01b459d8054e.json
+++ b/cedar-integration-tests/corpus_tests/f02c1a74821e12d19cc295e9839d01b459d8054e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f081a19560e2eeb8f15df2a030a10294a8a2e9c8.json b/cedar-integration-tests/corpus_tests/f081a19560e2eeb8f15df2a030a10294a8a2e9c8.json
index af96d33ac..49e90561e 100644
--- a/cedar-integration-tests/corpus_tests/f081a19560e2eeb8f15df2a030a10294a8a2e9c8.json
+++ b/cedar-integration-tests/corpus_tests/f081a19560e2eeb8f15df2a030a10294a8a2e9c8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "C::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "C::\"\"",
+      "principal": {
+        "type": "C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "C::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "C::\"\"",
+      "principal": {
+        "type": "C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "C::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "C::\"\"",
+      "principal": {
+        "type": "C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "C::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "C::\"\"",
+      "principal": {
+        "type": "C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "C::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "C::\"\"",
+      "principal": {
+        "type": "C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "C::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "C::\"\"",
+      "principal": {
+        "type": "C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "C::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "C::\"\"",
+      "principal": {
+        "type": "C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "C::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "C::\"\"",
+      "principal": {
+        "type": "C",
+        "id": ""
+      },
+      "resource": {
+        "type": "C",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f082fa77996aec4e5fdc12b347a8b8336cb24b21.json b/cedar-integration-tests/corpus_tests/f082fa77996aec4e5fdc12b347a8b8336cb24b21.json
index 114a4dfbe..6c91ab884 100644
--- a/cedar-integration-tests/corpus_tests/f082fa77996aec4e5fdc12b347a8b8336cb24b21.json
+++ b/cedar-integration-tests/corpus_tests/f082fa77996aec4e5fdc12b347a8b8336cb24b21.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\\0\\u{1}j\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000\u0000\u0001j"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/f09fe818d8c4da7280302af3d2d73afcb4fa938a.json b/cedar-integration-tests/corpus_tests/f09fe818d8c4da7280302af3d2d73afcb4fa938a.json
index aabf17789..fa5240ce4 100644
--- a/cedar-integration-tests/corpus_tests/f09fe818d8c4da7280302af3d2d73afcb4fa938a.json
+++ b/cedar-integration-tests/corpus_tests/f09fe818d8c4da7280302af3d2d73afcb4fa938a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "mzzzZz0z0bYdl::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzZz0z0bYdl::\"\"",
+      "principal": {
+        "type": "mzzzZz0z0bYdl",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzZz0z0bYdl",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "mzzzZz0z0bYdl::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzZz0z0bYdl::\"\"",
+      "principal": {
+        "type": "mzzzZz0z0bYdl",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzZz0z0bYdl",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "mzzzZz0z0bYdl::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzZz0z0bYdl::\"\"",
+      "principal": {
+        "type": "mzzzZz0z0bYdl",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzZz0z0bYdl",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "mzzzZz0z0bYdl::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzZz0z0bYdl::\"\"",
+      "principal": {
+        "type": "mzzzZz0z0bYdl",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzZz0z0bYdl",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "mzzzZz0z0bYdl::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzZz0z0bYdl::\"\"",
+      "principal": {
+        "type": "mzzzZz0z0bYdl",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzZz0z0bYdl",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "mzzzZz0z0bYdl::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzZz0z0bYdl::\"\"",
+      "principal": {
+        "type": "mzzzZz0z0bYdl",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzZz0z0bYdl",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "mzzzZz0z0bYdl::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzZz0z0bYdl::\"\"",
+      "principal": {
+        "type": "mzzzZz0z0bYdl",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzZz0z0bYdl",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "mzzzZz0z0bYdl::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "mzzzZz0z0bYdl::\"\"",
+      "principal": {
+        "type": "mzzzZz0z0bYdl",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzZz0z0bYdl",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f0a5cb529631a3850b8e66e0fe24e26ceb11dd0f.json b/cedar-integration-tests/corpus_tests/f0a5cb529631a3850b8e66e0fe24e26ceb11dd0f.json
index 9f776bcfc..fe0de73f7 100644
--- a/cedar-integration-tests/corpus_tests/f0a5cb529631a3850b8e66e0fe24e26ceb11dd0f.json
+++ b/cedar-integration-tests/corpus_tests/f0a5cb529631a3850b8e66e0fe24e26ceb11dd0f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Q::a::\"\"",
-      "action": "Q::Action::\"action\"",
-      "resource": "Q::a::\"\"",
+      "principal": {
+        "type": "Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Q::a::\"\"",
-      "action": "Q::Action::\"action\"",
-      "resource": "Q::a::\"\"",
+      "principal": {
+        "type": "Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Q::a::\"\"",
-      "action": "Q::Action::\"action\"",
-      "resource": "Q::a::\"\"",
+      "principal": {
+        "type": "Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Q::a::\"\"",
-      "action": "Q::Action::\"action\"",
-      "resource": "Q::a::\"\"",
+      "principal": {
+        "type": "Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Q::a::\"\"",
-      "action": "Q::Action::\"action\"",
-      "resource": "Q::a::\"\"",
+      "principal": {
+        "type": "Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Q::a::\"\"",
-      "action": "Q::Action::\"action\"",
-      "resource": "Q::a::\"\"",
+      "principal": {
+        "type": "Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Q::a::\"\"",
-      "action": "Q::Action::\"action\"",
-      "resource": "Q::a::\"\"",
+      "principal": {
+        "type": "Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Q::a::\"\"",
-      "action": "Q::Action::\"action\"",
-      "resource": "Q::a::\"\"",
+      "principal": {
+        "type": "Q::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "Q::a",
+        "id": ""
+      },
+      "action": {
+        "type": "Q::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f0a68af24489b18f1ed93c2952787ce4d99bddc8.json b/cedar-integration-tests/corpus_tests/f0a68af24489b18f1ed93c2952787ce4d99bddc8.json
index 7eaeac8e7..e4a32cf9e 100644
--- a/cedar-integration-tests/corpus_tests/f0a68af24489b18f1ed93c2952787ce4d99bddc8.json
+++ b/cedar-integration-tests/corpus_tests/f0a68af24489b18f1ed93c2952787ce4d99bddc8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "s::a::\"\\u{1}\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0Z\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000Z\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "s::a::\"\\u{1}\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0Z\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0001"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000Z\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "s::a::\"\\0\\0\\0Z\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0Z\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000Z\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000Z\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "s::a::\"\\0\\0\\0Z\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0Z\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000Z\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000Z\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "s::a::\"\\0\\0\\0Z\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0Z\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000Z\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000Z\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "s::a::\"\\0\\0\\0Z\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0Z\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000Z\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000Z\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "s::a::\"\\0\\0\\0Z\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0Z\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000Z\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000Z\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "s::a::\"\\0\\0\\0Z\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\\0\\0\\0Z\\0\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000Z\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": "\u0000\u0000\u0000Z\u0000"
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f0ce050482aa564b1ba5b3833b03369c9ca414e7.json b/cedar-integration-tests/corpus_tests/f0ce050482aa564b1ba5b3833b03369c9ca414e7.json
index 0d8fccf59..8d102eac5 100644
--- a/cedar-integration-tests/corpus_tests/f0ce050482aa564b1ba5b3833b03369c9ca414e7.json
+++ b/cedar-integration-tests/corpus_tests/f0ce050482aa564b1ba5b3833b03369c9ca414e7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\":\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":\"",
+      "principal": {
+        "type": "a",
+        "id": ":"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f0d1dd1ab53ca29e9659a020a649f96cdf3c4818.json b/cedar-integration-tests/corpus_tests/f0d1dd1ab53ca29e9659a020a649f96cdf3c4818.json
index a50e18436..6179d7002 100644
--- a/cedar-integration-tests/corpus_tests/f0d1dd1ab53ca29e9659a020a649f96cdf3c4818.json
+++ b/cedar-integration-tests/corpus_tests/f0d1dd1ab53ca29e9659a020a649f96cdf3c4818.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f0f61375eb51a9502529d45947218325e1aa8634.json b/cedar-integration-tests/corpus_tests/f0f61375eb51a9502529d45947218325e1aa8634.json
index f3a9733cb..1ee537c67 100644
--- a/cedar-integration-tests/corpus_tests/f0f61375eb51a9502529d45947218325e1aa8634.json
+++ b/cedar-integration-tests/corpus_tests/f0f61375eb51a9502529d45947218325e1aa8634.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"$\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"$\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"$\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"$\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"$\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"$\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"$\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "$\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f1218de44cefa25cec4475be3b7b4e3a8226fb37.json b/cedar-integration-tests/corpus_tests/f1218de44cefa25cec4475be3b7b4e3a8226fb37.json
index d1bb4ca80..72e256ffc 100644
--- a/cedar-integration-tests/corpus_tests/f1218de44cefa25cec4475be3b7b4e3a8226fb37.json
+++ b/cedar-integration-tests/corpus_tests/f1218de44cefa25cec4475be3b7b4e3a8226fb37.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f20293b453e1c23064a0f47fb42fd0710e6f1271.json b/cedar-integration-tests/corpus_tests/f20293b453e1c23064a0f47fb42fd0710e6f1271.json
index f3c2e6be0..d1914a1d2 100644
--- a/cedar-integration-tests/corpus_tests/f20293b453e1c23064a0f47fb42fd0710e6f1271.json
+++ b/cedar-integration-tests/corpus_tests/f20293b453e1c23064a0f47fb42fd0710e6f1271.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{4}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{4}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0004"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f207e038d0f3cb47d1d6a287417251c61f5ccd43.json b/cedar-integration-tests/corpus_tests/f207e038d0f3cb47d1d6a287417251c61f5ccd43.json
index 47ea7fa79..667b732cd 100644
--- a/cedar-integration-tests/corpus_tests/f207e038d0f3cb47d1d6a287417251c61f5ccd43.json
+++ b/cedar-integration-tests/corpus_tests/f207e038d0f3cb47d1d6a287417251c61f5ccd43.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/f21be42147b2c967fb72a5a20c0775c178a5abbe.json b/cedar-integration-tests/corpus_tests/f21be42147b2c967fb72a5a20c0775c178a5abbe.json
index 92f15a837..3577ee8e6 100644
--- a/cedar-integration-tests/corpus_tests/f21be42147b2c967fb72a5a20c0775c178a5abbe.json
+++ b/cedar-integration-tests/corpus_tests/f21be42147b2c967fb72a5a20c0775c178a5abbe.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f23ddaae112b5991d33858a825aba8ea1410abe1.json b/cedar-integration-tests/corpus_tests/f23ddaae112b5991d33858a825aba8ea1410abe1.json
index 2288edbfd..6089380c4 100644
--- a/cedar-integration-tests/corpus_tests/f23ddaae112b5991d33858a825aba8ea1410abe1.json
+++ b/cedar-integration-tests/corpus_tests/f23ddaae112b5991d33858a825aba8ea1410abe1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"V\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"V\"",
+      "principal": {
+        "type": "a",
+        "id": "V"
+      },
+      "resource": {
+        "type": "a",
+        "id": "V"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"V\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "V"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"V\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"V\"",
+      "principal": {
+        "type": "a",
+        "id": "V"
+      },
+      "resource": {
+        "type": "a",
+        "id": "V"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"V\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"V\"",
+      "principal": {
+        "type": "a",
+        "id": "V"
+      },
+      "resource": {
+        "type": "a",
+        "id": "V"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"V\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"V\"",
+      "principal": {
+        "type": "a",
+        "id": "V"
+      },
+      "resource": {
+        "type": "a",
+        "id": "V"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"V\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"V\"",
+      "principal": {
+        "type": "a",
+        "id": "V"
+      },
+      "resource": {
+        "type": "a",
+        "id": "V"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"V\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"V\"",
+      "principal": {
+        "type": "a",
+        "id": "V"
+      },
+      "resource": {
+        "type": "a",
+        "id": "V"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f25cab814507b52116d2e544ef7e3e940c2161a0.json b/cedar-integration-tests/corpus_tests/f25cab814507b52116d2e544ef7e3e940c2161a0.json
index a2624f9b7..a7028629d 100644
--- a/cedar-integration-tests/corpus_tests/f25cab814507b52116d2e544ef7e3e940c2161a0.json
+++ b/cedar-integration-tests/corpus_tests/f25cab814507b52116d2e544ef7e3e940c2161a0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "TYYY::Lxm::Kxxx0xn::EYml::\"zz\"",
-      "action": "TYYY::Lxm::Kxxx0xn::Action::\"action\"",
-      "resource": "TYYY::Lxm::Kxxx0xn::EYml::\"zz\"",
+      "principal": {
+        "type": "TYYY::Lxm::Kxxx0xn::EYml",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "TYYY::Lxm::Kxxx0xn::EYml",
+        "id": "zz"
+      },
+      "action": {
+        "type": "TYYY::Lxm::Kxxx0xn::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "TYYY::Lxm::Kxxx0xn::EYml::\"zz\"",
-      "action": "TYYY::Lxm::Kxxx0xn::Action::\"action\"",
-      "resource": "TYYY::Lxm::Kxxx0xn::EYml::\"zz\"",
+      "principal": {
+        "type": "TYYY::Lxm::Kxxx0xn::EYml",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "TYYY::Lxm::Kxxx0xn::EYml",
+        "id": "zz"
+      },
+      "action": {
+        "type": "TYYY::Lxm::Kxxx0xn::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "TYYY::Lxm::Kxxx0xn::EYml::\"zz\"",
-      "action": "TYYY::Lxm::Kxxx0xn::Action::\"action\"",
-      "resource": "TYYY::Lxm::Kxxx0xn::EYml::\"zz\"",
+      "principal": {
+        "type": "TYYY::Lxm::Kxxx0xn::EYml",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "TYYY::Lxm::Kxxx0xn::EYml",
+        "id": "zz"
+      },
+      "action": {
+        "type": "TYYY::Lxm::Kxxx0xn::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "TYYY::Lxm::Kxxx0xn::EYml::\"zz\"",
-      "action": "TYYY::Lxm::Kxxx0xn::Action::\"action\"",
-      "resource": "TYYY::Lxm::Kxxx0xn::EYml::\"zz\"",
+      "principal": {
+        "type": "TYYY::Lxm::Kxxx0xn::EYml",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "TYYY::Lxm::Kxxx0xn::EYml",
+        "id": "zz"
+      },
+      "action": {
+        "type": "TYYY::Lxm::Kxxx0xn::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "TYYY::Lxm::Kxxx0xn::EYml::\"zz\"",
-      "action": "TYYY::Lxm::Kxxx0xn::Action::\"action\"",
-      "resource": "TYYY::Lxm::Kxxx0xn::EYml::\"zz\"",
+      "principal": {
+        "type": "TYYY::Lxm::Kxxx0xn::EYml",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "TYYY::Lxm::Kxxx0xn::EYml",
+        "id": "zz"
+      },
+      "action": {
+        "type": "TYYY::Lxm::Kxxx0xn::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "TYYY::Lxm::Kxxx0xn::EYml::\"zz\"",
-      "action": "TYYY::Lxm::Kxxx0xn::Action::\"action\"",
-      "resource": "TYYY::Lxm::Kxxx0xn::EYml::\"zz\"",
+      "principal": {
+        "type": "TYYY::Lxm::Kxxx0xn::EYml",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "TYYY::Lxm::Kxxx0xn::EYml",
+        "id": "zz"
+      },
+      "action": {
+        "type": "TYYY::Lxm::Kxxx0xn::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "TYYY::Lxm::Kxxx0xn::EYml::\"zz\"",
-      "action": "TYYY::Lxm::Kxxx0xn::Action::\"action\"",
-      "resource": "TYYY::Lxm::Kxxx0xn::EYml::\"zz\"",
+      "principal": {
+        "type": "TYYY::Lxm::Kxxx0xn::EYml",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "TYYY::Lxm::Kxxx0xn::EYml",
+        "id": "zz"
+      },
+      "action": {
+        "type": "TYYY::Lxm::Kxxx0xn::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "TYYY::Lxm::Kxxx0xn::EYml::\"zz\"",
-      "action": "TYYY::Lxm::Kxxx0xn::Action::\"action\"",
-      "resource": "TYYY::Lxm::Kxxx0xn::EYml::\"zz\"",
+      "principal": {
+        "type": "TYYY::Lxm::Kxxx0xn::EYml",
+        "id": "zz"
+      },
+      "resource": {
+        "type": "TYYY::Lxm::Kxxx0xn::EYml",
+        "id": "zz"
+      },
+      "action": {
+        "type": "TYYY::Lxm::Kxxx0xn::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f26f21041f1571b342799b4ecc81b7f874cfe2f1.json b/cedar-integration-tests/corpus_tests/f26f21041f1571b342799b4ecc81b7f874cfe2f1.json
index e14aec336..6c26a6d78 100644
--- a/cedar-integration-tests/corpus_tests/f26f21041f1571b342799b4ecc81b7f874cfe2f1.json
+++ b/cedar-integration-tests/corpus_tests/f26f21041f1571b342799b4ecc81b7f874cfe2f1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"....\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "...."
+      },
       "context": {
         "Ukl0200000000": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"....\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "...."
+      },
       "context": {
         "Ukl0200000000": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"....\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "...."
+      },
       "context": {
         "Ukl0200000000": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"....\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "...."
+      },
       "context": {
         "Ukl0200000000": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"....\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "...."
+      },
       "context": {
         "Ukl0200000000": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"....\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "...."
+      },
       "context": {
         "Ukl0200000000": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"....\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "...."
+      },
       "context": {
         "Ukl0200000000": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"....\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "...."
+      },
       "context": {
         "Ukl0200000000": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/f277b9b99c1468e78466752bf5cd17b68bd2c94e.json b/cedar-integration-tests/corpus_tests/f277b9b99c1468e78466752bf5cd17b68bd2c94e.json
index cdc91c7ce..b9dd3b37c 100644
--- a/cedar-integration-tests/corpus_tests/f277b9b99c1468e78466752bf5cd17b68bd2c94e.json
+++ b/cedar-integration-tests/corpus_tests/f277b9b99c1468e78466752bf5cd17b68bd2c94e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f2b88318e4e6b69694b1d6c16684f0fe0381683f.json b/cedar-integration-tests/corpus_tests/f2b88318e4e6b69694b1d6c16684f0fe0381683f.json
index 21688d1e2..a7df8f491 100644
--- a/cedar-integration-tests/corpus_tests/f2b88318e4e6b69694b1d6c16684f0fe0381683f.json
+++ b/cedar-integration-tests/corpus_tests/f2b88318e4e6b69694b1d6c16684f0fe0381683f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"om\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "om"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f2bf002fe41e6c391d7e5b52a8a372fe18630f99.json b/cedar-integration-tests/corpus_tests/f2bf002fe41e6c391d7e5b52a8a372fe18630f99.json
index 5f028f36c..f2c594c5a 100644
--- a/cedar-integration-tests/corpus_tests/f2bf002fe41e6c391d7e5b52a8a372fe18630f99.json
+++ b/cedar-integration-tests/corpus_tests/f2bf002fe41e6c391d7e5b52a8a372fe18630f99.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "ukkkkkkk4kkkk::\"....\\u{13}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "ukkkkkkk4kkkk::\"....\\u{13}\\0\\0\"",
+      "principal": {
+        "type": "ukkkkkkk4kkkk",
+        "id": "....\u0013\u0000\u0000"
+      },
+      "resource": {
+        "type": "ukkkkkkk4kkkk",
+        "id": "....\u0013\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "ukkkkkkk4kkkk::\"....\\u{13}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "ukkkkkkk4kkkk::\"....\\u{13}\\0\\0\"",
+      "principal": {
+        "type": "ukkkkkkk4kkkk",
+        "id": "....\u0013\u0000\u0000"
+      },
+      "resource": {
+        "type": "ukkkkkkk4kkkk",
+        "id": "....\u0013\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "ukkkkkkk4kkkk::\"....\\u{13}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "ukkkkkkk4kkkk::\"....\\u{13}\\0\\0\"",
+      "principal": {
+        "type": "ukkkkkkk4kkkk",
+        "id": "....\u0013\u0000\u0000"
+      },
+      "resource": {
+        "type": "ukkkkkkk4kkkk",
+        "id": "....\u0013\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "ukkkkkkk4kkkk::\"....\\u{13}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "ukkkkkkk4kkkk::\"....\\u{13}\\0\\0\"",
+      "principal": {
+        "type": "ukkkkkkk4kkkk",
+        "id": "....\u0013\u0000\u0000"
+      },
+      "resource": {
+        "type": "ukkkkkkk4kkkk",
+        "id": "....\u0013\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "ukkkkkkk4kkkk::\"....\\u{13}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "ukkkkkkk4kkkk::\"....\\u{13}\\0\\0\"",
+      "principal": {
+        "type": "ukkkkkkk4kkkk",
+        "id": "....\u0013\u0000\u0000"
+      },
+      "resource": {
+        "type": "ukkkkkkk4kkkk",
+        "id": "....\u0013\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "ukkkkkkk4kkkk::\"....\\u{13}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "ukkkkkkk4kkkk::\"....\\u{13}\\0\\0\"",
+      "principal": {
+        "type": "ukkkkkkk4kkkk",
+        "id": "....\u0013\u0000\u0000"
+      },
+      "resource": {
+        "type": "ukkkkkkk4kkkk",
+        "id": "....\u0013\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "ukkkkkkk4kkkk::\"....\\u{13}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "ukkkkkkk4kkkk::\"....\\u{13}\\0\\0\"",
+      "principal": {
+        "type": "ukkkkkkk4kkkk",
+        "id": "....\u0013\u0000\u0000"
+      },
+      "resource": {
+        "type": "ukkkkkkk4kkkk",
+        "id": "....\u0013\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "ukkkkkkk4kkkk::\"....\\u{13}\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "ukkkkkkk4kkkk::\"....\\u{13}\\0\\0\"",
+      "principal": {
+        "type": "ukkkkkkk4kkkk",
+        "id": "....\u0013\u0000\u0000"
+      },
+      "resource": {
+        "type": "ukkkkkkk4kkkk",
+        "id": "....\u0013\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f2e255f39e2eef37a9a9255922f0efaa477fd456.json b/cedar-integration-tests/corpus_tests/f2e255f39e2eef37a9a9255922f0efaa477fd456.json
index 3e6b3fdb7..2b486e070 100644
--- a/cedar-integration-tests/corpus_tests/f2e255f39e2eef37a9a9255922f0efaa477fd456.json
+++ b/cedar-integration-tests/corpus_tests/f2e255f39e2eef37a9a9255922f0efaa477fd456.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f300936215f36b4eebfa2e90b98af6e80a373f50.json b/cedar-integration-tests/corpus_tests/f300936215f36b4eebfa2e90b98af6e80a373f50.json
index 3163e5dca..4d844c9e9 100644
--- a/cedar-integration-tests/corpus_tests/f300936215f36b4eebfa2e90b98af6e80a373f50.json
+++ b/cedar-integration-tests/corpus_tests/f300936215f36b4eebfa2e90b98af6e80a373f50.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "vkYlYeckc::mKlq::a::\"\"",
-      "action": "vkYlYeckc::mKlq::Action::\"action\"",
-      "resource": "vkYlYeckc::mKlq::a::\"\"",
+      "principal": {
+        "type": "vkYlYeckc::mKlq::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "vkYlYeckc::mKlq::a",
+        "id": ""
+      },
+      "action": {
+        "type": "vkYlYeckc::mKlq::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "vkYlYeckc::mKlq::a::\"\"",
-      "action": "vkYlYeckc::mKlq::Action::\"action\"",
-      "resource": "vkYlYeckc::mKlq::a::\"\"",
+      "principal": {
+        "type": "vkYlYeckc::mKlq::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "vkYlYeckc::mKlq::a",
+        "id": ""
+      },
+      "action": {
+        "type": "vkYlYeckc::mKlq::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "vkYlYeckc::mKlq::a::\"\"",
-      "action": "vkYlYeckc::mKlq::Action::\"action\"",
-      "resource": "vkYlYeckc::mKlq::a::\"\"",
+      "principal": {
+        "type": "vkYlYeckc::mKlq::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "vkYlYeckc::mKlq::a",
+        "id": ""
+      },
+      "action": {
+        "type": "vkYlYeckc::mKlq::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "vkYlYeckc::mKlq::a::\"\"",
-      "action": "vkYlYeckc::mKlq::Action::\"action\"",
-      "resource": "vkYlYeckc::mKlq::a::\"\"",
+      "principal": {
+        "type": "vkYlYeckc::mKlq::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "vkYlYeckc::mKlq::a",
+        "id": ""
+      },
+      "action": {
+        "type": "vkYlYeckc::mKlq::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "vkYlYeckc::mKlq::a::\"\"",
-      "action": "vkYlYeckc::mKlq::Action::\"action\"",
-      "resource": "vkYlYeckc::mKlq::a::\"\"",
+      "principal": {
+        "type": "vkYlYeckc::mKlq::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "vkYlYeckc::mKlq::a",
+        "id": ""
+      },
+      "action": {
+        "type": "vkYlYeckc::mKlq::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "vkYlYeckc::mKlq::a::\"\"",
-      "action": "vkYlYeckc::mKlq::Action::\"action\"",
-      "resource": "vkYlYeckc::mKlq::a::\"\"",
+      "principal": {
+        "type": "vkYlYeckc::mKlq::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "vkYlYeckc::mKlq::a",
+        "id": ""
+      },
+      "action": {
+        "type": "vkYlYeckc::mKlq::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "vkYlYeckc::mKlq::a::\"\"",
-      "action": "vkYlYeckc::mKlq::Action::\"action\"",
-      "resource": "vkYlYeckc::mKlq::a::\"\"",
+      "principal": {
+        "type": "vkYlYeckc::mKlq::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "vkYlYeckc::mKlq::a",
+        "id": ""
+      },
+      "action": {
+        "type": "vkYlYeckc::mKlq::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "vkYlYeckc::mKlq::a::\"\"",
-      "action": "vkYlYeckc::mKlq::Action::\"action\"",
-      "resource": "vkYlYeckc::mKlq::a::\"\"",
+      "principal": {
+        "type": "vkYlYeckc::mKlq::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "vkYlYeckc::mKlq::a",
+        "id": ""
+      },
+      "action": {
+        "type": "vkYlYeckc::mKlq::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f31b4fb7b9b4a7aafbc4b4c41675786c96e707f8.json b/cedar-integration-tests/corpus_tests/f31b4fb7b9b4a7aafbc4b4c41675786c96e707f8.json
index fa3b0a84b..e7d45fb4e 100644
--- a/cedar-integration-tests/corpus_tests/f31b4fb7b9b4a7aafbc4b4c41675786c96e707f8.json
+++ b/cedar-integration-tests/corpus_tests/f31b4fb7b9b4a7aafbc4b4c41675786c96e707f8.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00`00\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00`00\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "00`00\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00`00\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00`00\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00`00\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "00`00\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00`00\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00`00\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00`00\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00`00\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "00`00\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00`00\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00`00\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "00`00\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00`00\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00`00\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00`00\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "00`00\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00`00\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00`00\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00`00\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "00`00\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00`00\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00`00\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00`00\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "00`00\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00`00\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f37d8acf6fd77d5db9734a06b52181ee35788d8e.json b/cedar-integration-tests/corpus_tests/f37d8acf6fd77d5db9734a06b52181ee35788d8e.json
index 0b1a1f12a..78293426f 100644
--- a/cedar-integration-tests/corpus_tests/f37d8acf6fd77d5db9734a06b52181ee35788d8e.json
+++ b/cedar-integration-tests/corpus_tests/f37d8acf6fd77d5db9734a06b52181ee35788d8e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "G::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"\"",
+      "principal": {
+        "type": "G",
+        "id": ""
+      },
+      "resource": {
+        "type": "G",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f3b2795dc3a36002a8f1019a846972476afcec57.json b/cedar-integration-tests/corpus_tests/f3b2795dc3a36002a8f1019a846972476afcec57.json
index 5fb30f632..c30eb85f4 100644
--- a/cedar-integration-tests/corpus_tests/f3b2795dc3a36002a8f1019a846972476afcec57.json
+++ b/cedar-integration-tests/corpus_tests/f3b2795dc3a36002a8f1019a846972476afcec57.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f41321feed22551dbe7cc85bb128b3b103968a1c.json b/cedar-integration-tests/corpus_tests/f41321feed22551dbe7cc85bb128b3b103968a1c.json
index c2ba33ad8..87892a34e 100644
--- a/cedar-integration-tests/corpus_tests/f41321feed22551dbe7cc85bb128b3b103968a1c.json
+++ b/cedar-integration-tests/corpus_tests/f41321feed22551dbe7cc85bb128b3b103968a1c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f417b638604217ea652bb0c087fbb3afe27b2d2a.json b/cedar-integration-tests/corpus_tests/f417b638604217ea652bb0c087fbb3afe27b2d2a.json
index c75da907a..e151d4b4b 100644
--- a/cedar-integration-tests/corpus_tests/f417b638604217ea652bb0c087fbb3afe27b2d2a.json
+++ b/cedar-integration-tests/corpus_tests/f417b638604217ea652bb0c087fbb3afe27b2d2a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\u{2}\\u{2}1sq\\u{2}\\u{2}.\\u{2}\\0\\u{2}\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{2}\\u{2}1sq\\u{2}\\u{2}.\\u{2}\\0\\u{2}\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0002\u00021sq\u0002\u0002.\u0002\u0000\u0002\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0002\u00021sq\u0002\u0002.\u0002\u0000\u0002\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\u{2}\\u{2}1sq\\u{2}\\u{2}.\\u{2}\\0\\u{2}\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{2}\\u{2}1sq\\u{2}\\u{2}.\\u{2}\\0\\u{2}\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0002\u00021sq\u0002\u0002.\u0002\u0000\u0002\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0002\u00021sq\u0002\u0002.\u0002\u0000\u0002\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\u{2}\\u{2}1sq\\u{2}\\u{2}.\\u{2}\\0\\u{2}\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{2}\\u{2}1sq\\u{2}\\u{2}.\\u{2}\\0\\u{2}\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0002\u00021sq\u0002\u0002.\u0002\u0000\u0002\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0002\u00021sq\u0002\u0002.\u0002\u0000\u0002\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\u{2}\\u{2}1sq\\u{2}\\u{2}.\\u{2}\\0\\u{2}\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{2}\\u{2}1sq\\u{2}\\u{2}.\\u{2}\\0\\u{2}\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0002\u00021sq\u0002\u0002.\u0002\u0000\u0002\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0002\u00021sq\u0002\u0002.\u0002\u0000\u0002\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\u{2}\\u{2}1sq\\u{2}\\u{2}.\\u{2}\\0\\u{2}\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{2}\\u{2}1sq\\u{2}\\u{2}.\\u{2}\\0\\u{2}\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0002\u00021sq\u0002\u0002.\u0002\u0000\u0002\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0002\u00021sq\u0002\u0002.\u0002\u0000\u0002\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\u{2}\\u{2}1sq\\u{2}\\u{2}.\\u{2}\\0\\u{2}\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{2}\\u{2}1sq\\u{2}\\u{2}.\\u{2}\\0\\u{2}\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0002\u00021sq\u0002\u0002.\u0002\u0000\u0002\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0002\u00021sq\u0002\u0002.\u0002\u0000\u0002\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\u{2}\\u{2}1sq\\u{2}\\u{2}.\\u{2}\\0\\u{2}\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{2}\\u{2}1sq\\u{2}\\u{2}.\\u{2}\\0\\u{2}\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0002\u00021sq\u0002\u0002.\u0002\u0000\u0002\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0002\u00021sq\u0002\u0002.\u0002\u0000\u0002\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\u{2}\\u{2}1sq\\u{2}\\u{2}.\\u{2}\\0\\u{2}\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\u{2}\\u{2}1sq\\u{2}\\u{2}.\\u{2}\\0\\u{2}\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0002\u00021sq\u0002\u0002.\u0002\u0000\u0002\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0002\u00021sq\u0002\u0002.\u0002\u0000\u0002\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f48cb1bfb8d0d62ce600c42dbe69d0122443a02e.json b/cedar-integration-tests/corpus_tests/f48cb1bfb8d0d62ce600c42dbe69d0122443a02e.json
index 6e4966787..a817f1570 100644
--- a/cedar-integration-tests/corpus_tests/f48cb1bfb8d0d62ce600c42dbe69d0122443a02e.json
+++ b/cedar-integration-tests/corpus_tests/f48cb1bfb8d0d62ce600c42dbe69d0122443a02e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "FwwwwGww::K::a::\"\"",
-      "action": "FwwwwGww::K::Action::\"action\"",
-      "resource": "FwwwwGww::K::a::\"\"",
+      "principal": {
+        "type": "FwwwwGww::K::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwwGww::K::a",
+        "id": ""
+      },
+      "action": {
+        "type": "FwwwwGww::K::Action",
+        "id": "action"
+      },
       "context": {
         "lC05": {
           "__entity": {
@@ -25,9 +34,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "FwwwwGww::K::a::\"\"",
-      "action": "FwwwwGww::K::Action::\"action\"",
-      "resource": "FwwwwGww::K::a::\"\"",
+      "principal": {
+        "type": "FwwwwGww::K::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwwGww::K::a",
+        "id": ""
+      },
+      "action": {
+        "type": "FwwwwGww::K::Action",
+        "id": "action"
+      },
       "context": {
         "lC05": {
           "__entity": {
@@ -44,9 +62,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "FwwwwGww::K::a::\"\"",
-      "action": "FwwwwGww::K::Action::\"action\"",
-      "resource": "FwwwwGww::K::a::\"\"",
+      "principal": {
+        "type": "FwwwwGww::K::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwwGww::K::a",
+        "id": ""
+      },
+      "action": {
+        "type": "FwwwwGww::K::Action",
+        "id": "action"
+      },
       "context": {
         "lC05": {
           "__entity": {
@@ -63,9 +90,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "FwwwwGww::K::a::\"\"",
-      "action": "FwwwwGww::K::Action::\"action\"",
-      "resource": "FwwwwGww::K::a::\"\"",
+      "principal": {
+        "type": "FwwwwGww::K::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwwGww::K::a",
+        "id": ""
+      },
+      "action": {
+        "type": "FwwwwGww::K::Action",
+        "id": "action"
+      },
       "context": {
         "lC05": {
           "__entity": {
@@ -82,9 +118,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "FwwwwGww::K::a::\"\"",
-      "action": "FwwwwGww::K::Action::\"action\"",
-      "resource": "FwwwwGww::K::a::\"\"",
+      "principal": {
+        "type": "FwwwwGww::K::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwwGww::K::a",
+        "id": ""
+      },
+      "action": {
+        "type": "FwwwwGww::K::Action",
+        "id": "action"
+      },
       "context": {
         "lC05": {
           "__entity": {
@@ -101,9 +146,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "FwwwwGww::K::a::\"\"",
-      "action": "FwwwwGww::K::Action::\"action\"",
-      "resource": "FwwwwGww::K::a::\"\"",
+      "principal": {
+        "type": "FwwwwGww::K::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwwGww::K::a",
+        "id": ""
+      },
+      "action": {
+        "type": "FwwwwGww::K::Action",
+        "id": "action"
+      },
       "context": {
         "lC05": {
           "__entity": {
@@ -120,9 +174,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "FwwwwGww::K::a::\"\"",
-      "action": "FwwwwGww::K::Action::\"action\"",
-      "resource": "FwwwwGww::K::a::\"\"",
+      "principal": {
+        "type": "FwwwwGww::K::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwwGww::K::a",
+        "id": ""
+      },
+      "action": {
+        "type": "FwwwwGww::K::Action",
+        "id": "action"
+      },
       "context": {
         "lC05": {
           "__entity": {
@@ -139,9 +202,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "FwwwwGww::K::a::\"\"",
-      "action": "FwwwwGww::K::Action::\"action\"",
-      "resource": "FwwwwGww::K::a::\"\"",
+      "principal": {
+        "type": "FwwwwGww::K::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "FwwwwGww::K::a",
+        "id": ""
+      },
+      "action": {
+        "type": "FwwwwGww::K::Action",
+        "id": "action"
+      },
       "context": {
         "lC05": {
           "__entity": {
diff --git a/cedar-integration-tests/corpus_tests/f49bf87abd8fad00a3d20364ecb4da7b19ceb31b.json b/cedar-integration-tests/corpus_tests/f49bf87abd8fad00a3d20364ecb4da7b19ceb31b.json
index 61bd42367..d1bfc2711 100644
--- a/cedar-integration-tests/corpus_tests/f49bf87abd8fad00a3d20364ecb4da7b19ceb31b.json
+++ b/cedar-integration-tests/corpus_tests/f49bf87abd8fad00a3d20364ecb4da7b19ceb31b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f4a401575ad2bb45f81c5da1c5e9455bb38ae3e3.json b/cedar-integration-tests/corpus_tests/f4a401575ad2bb45f81c5da1c5e9455bb38ae3e3.json
index 3e44b1446..fd7543248 100644
--- a/cedar-integration-tests/corpus_tests/f4a401575ad2bb45f81c5da1c5e9455bb38ae3e3.json
+++ b/cedar-integration-tests/corpus_tests/f4a401575ad2bb45f81c5da1c5e9455bb38ae3e3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "r::r::r::r::r33::r::r::V::r::a::\"\"",
-      "action": "r::r::r::r::r33::r::r::V::r::Action::\"action\"",
-      "resource": "r::r::r::r::r33::r::r::V::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r33::r::r::V::r::Action",
+        "id": "action"
+      },
       "context": {
         "K000000000000": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "r::r::r::r::r33::r::r::V::r::a::\"\"",
-      "action": "r::r::r::r::r33::r::r::V::r::Action::\"action\"",
-      "resource": "r::r::r::r::r33::r::r::V::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r33::r::r::V::r::Action",
+        "id": "action"
+      },
       "context": {
         "K000000000000": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "r::r::r::r::r33::r::r::V::r::a::\"\"",
-      "action": "r::r::r::r::r33::r::r::V::r::Action::\"action\"",
-      "resource": "r::r::r::r::r33::r::r::V::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r33::r::r::V::r::Action",
+        "id": "action"
+      },
       "context": {
         "K000000000000": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "r::r::r::r::r33::r::r::V::r::a::\"\"",
-      "action": "r::r::r::r::r33::r::r::V::r::Action::\"action\"",
-      "resource": "r::r::r::r::r33::r::r::V::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r33::r::r::V::r::Action",
+        "id": "action"
+      },
       "context": {
         "K000000000000": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "r::r::r::r::r33::r::r::V::r::a::\"\"",
-      "action": "r::r::r::r::r33::r::r::V::r::Action::\"action\"",
-      "resource": "r::r::r::r::r33::r::r::V::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r33::r::r::V::r::Action",
+        "id": "action"
+      },
       "context": {
         "K000000000000": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "r::r::r::r::r33::r::r::V::r::a::\"\"",
-      "action": "r::r::r::r::r33::r::r::V::r::Action::\"action\"",
-      "resource": "r::r::r::r::r33::r::r::V::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r33::r::r::V::r::Action",
+        "id": "action"
+      },
       "context": {
         "K000000000000": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "r::r::r::r::r33::r::r::V::r::a::\"\"",
-      "action": "r::r::r::r::r33::r::r::V::r::Action::\"action\"",
-      "resource": "r::r::r::r::r33::r::r::V::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r33::r::r::V::r::Action",
+        "id": "action"
+      },
       "context": {
         "K000000000000": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "r::r::r::r::r33::r::r::V::r::a::\"\"",
-      "action": "r::r::r::r::r33::r::r::V::r::Action::\"action\"",
-      "resource": "r::r::r::r::r33::r::r::V::r::a::\"\"",
+      "principal": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "r::r::r::r::r33::r::r::V::r::a",
+        "id": ""
+      },
+      "action": {
+        "type": "r::r::r::r::r33::r::r::V::r::Action",
+        "id": "action"
+      },
       "context": {
         "K000000000000": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/f4b03c556b4f95cb09e10aacf145e4d2e8c15bcd.json b/cedar-integration-tests/corpus_tests/f4b03c556b4f95cb09e10aacf145e4d2e8c15bcd.json
index e2ea8ca6c..57441a727 100644
--- a/cedar-integration-tests/corpus_tests/f4b03c556b4f95cb09e10aacf145e4d2e8c15bcd.json
+++ b/cedar-integration-tests/corpus_tests/f4b03c556b4f95cb09e10aacf145e4d2e8c15bcd.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f51cc525b644fab293a5ec8c23a5cbb7684e0c49.json b/cedar-integration-tests/corpus_tests/f51cc525b644fab293a5ec8c23a5cbb7684e0c49.json
index 1048767bc..f9827c3e1 100644
--- a/cedar-integration-tests/corpus_tests/f51cc525b644fab293a5ec8c23a5cbb7684e0c49.json
+++ b/cedar-integration-tests/corpus_tests/f51cc525b644fab293a5ec8c23a5cbb7684e0c49.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f53c285085b1827722e7157fba06156c27c94ca6.json b/cedar-integration-tests/corpus_tests/f53c285085b1827722e7157fba06156c27c94ca6.json
index a491bfc98..f15587999 100644
--- a/cedar-integration-tests/corpus_tests/f53c285085b1827722e7157fba06156c27c94ca6.json
+++ b/cedar-integration-tests/corpus_tests/f53c285085b1827722e7157fba06156c27c94ca6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f5609e4fb14b5b0c8878c035686e65432026e2e3.json b/cedar-integration-tests/corpus_tests/f5609e4fb14b5b0c8878c035686e65432026e2e3.json
index d27d140ab..86aaf7f24 100644
--- a/cedar-integration-tests/corpus_tests/f5609e4fb14b5b0c8878c035686e65432026e2e3.json
+++ b/cedar-integration-tests/corpus_tests/f5609e4fb14b5b0c8878c035686e65432026e2e3.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"80\"",
+      "principal": {
+        "type": "a",
+        "id": "80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "v": "",
         "Bs": ""
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"80\"",
+      "principal": {
+        "type": "a",
+        "id": "80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "v": "",
         "Bs": ""
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"80\"",
+      "principal": {
+        "type": "a",
+        "id": "80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "v": "",
         "Bs": ""
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"80\"",
+      "principal": {
+        "type": "a",
+        "id": "80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "v": "",
         "Bs": ""
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"80\"",
+      "principal": {
+        "type": "a",
+        "id": "80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "v": "",
         "Bs": ""
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"80\"",
+      "principal": {
+        "type": "a",
+        "id": "80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "v": "",
         "Bs": ""
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"80\"",
+      "principal": {
+        "type": "a",
+        "id": "80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "v": "",
         "Bs": ""
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"80\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"80\"",
+      "principal": {
+        "type": "a",
+        "id": "80"
+      },
+      "resource": {
+        "type": "a",
+        "id": "80"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "v": "",
         "Bs": ""
diff --git a/cedar-integration-tests/corpus_tests/f5a4dc319b2aa4253b6b016662127e5ad69149ab.json b/cedar-integration-tests/corpus_tests/f5a4dc319b2aa4253b6b016662127e5ad69149ab.json
index 631a60710..c950743ab 100644
--- a/cedar-integration-tests/corpus_tests/f5a4dc319b2aa4253b6b016662127e5ad69149ab.json
+++ b/cedar-integration-tests/corpus_tests/f5a4dc319b2aa4253b6b016662127e5ad69149ab.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::A::a::\"\"",
-      "action": "A::A::Action::\"action\"",
-      "resource": "A::A::a::\"\"",
+      "principal": {
+        "type": "A::A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::A::a::\"\"",
-      "action": "A::A::Action::\"action\"",
-      "resource": "A::A::a::\"\"",
+      "principal": {
+        "type": "A::A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::A::a::\"\"",
-      "action": "A::A::Action::\"action\"",
-      "resource": "A::A::a::\"\"",
+      "principal": {
+        "type": "A::A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::A::a::\"\"",
-      "action": "A::A::Action::\"action\"",
-      "resource": "A::A::a::\"\"",
+      "principal": {
+        "type": "A::A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::A::a::\"\"",
-      "action": "A::A::Action::\"action\"",
-      "resource": "A::A::a::\"\"",
+      "principal": {
+        "type": "A::A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::A::a::\"\"",
-      "action": "A::A::Action::\"action\"",
-      "resource": "A::A::a::\"\"",
+      "principal": {
+        "type": "A::A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::A::a::\"\"",
-      "action": "A::A::Action::\"action\"",
-      "resource": "A::A::a::\"\"",
+      "principal": {
+        "type": "A::A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::A::a::\"\"",
-      "action": "A::A::Action::\"action\"",
-      "resource": "A::A::a::\"\"",
+      "principal": {
+        "type": "A::A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f5d577088881435fd9bf94779cae429dcd9def19.json b/cedar-integration-tests/corpus_tests/f5d577088881435fd9bf94779cae429dcd9def19.json
index a2109d4aa..e73163e21 100644
--- a/cedar-integration-tests/corpus_tests/f5d577088881435fd9bf94779cae429dcd9def19.json
+++ b/cedar-integration-tests/corpus_tests/f5d577088881435fd9bf94779cae429dcd9def19.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "m000000::\"\"",
-      "action": "Action::\"is\"",
-      "resource": "m000000::\"\"",
+      "principal": {
+        "type": "m000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "m000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "is"
+      },
       "context": {
         "A0000000000000000": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "m000000::\"\"",
-      "action": "Action::\"is\"",
-      "resource": "m000000::\"\"",
+      "principal": {
+        "type": "m000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "m000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "is"
+      },
       "context": {
         "A0000000000000000": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "m000000::\"\"",
-      "action": "Action::\"is\"",
-      "resource": "m000000::\"\"",
+      "principal": {
+        "type": "m000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "m000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "is"
+      },
       "context": {
         "A0000000000000000": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "m000000::\"\"",
-      "action": "Action::\"is\"",
-      "resource": "m000000::\"\"",
+      "principal": {
+        "type": "m000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "m000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "is"
+      },
       "context": {
         "A0000000000000000": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "m000000::\"\"",
-      "action": "Action::\"is\"",
-      "resource": "m000000::\"\"",
+      "principal": {
+        "type": "m000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "m000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "is"
+      },
       "context": {
         "A0000000000000000": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "m000000::\"\"",
-      "action": "Action::\"is\"",
-      "resource": "m000000::\"\"",
+      "principal": {
+        "type": "m000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "m000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "is"
+      },
       "context": {
         "A0000000000000000": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "m000000::\"\"",
-      "action": "Action::\"is\"",
-      "resource": "m000000::\"\"",
+      "principal": {
+        "type": "m000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "m000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "is"
+      },
       "context": {
         "A0000000000000000": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "m000000::\"\"",
-      "action": "Action::\"is\"",
-      "resource": "m000000::\"\"",
+      "principal": {
+        "type": "m000000",
+        "id": ""
+      },
+      "resource": {
+        "type": "m000000",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "is"
+      },
       "context": {
         "A0000000000000000": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/f5f7588b66978d1dd2254338fbb68ed6ee64a2f0.json b/cedar-integration-tests/corpus_tests/f5f7588b66978d1dd2254338fbb68ed6ee64a2f0.json
index e0a1729e0..def728814 100644
--- a/cedar-integration-tests/corpus_tests/f5f7588b66978d1dd2254338fbb68ed6ee64a2f0.json
+++ b/cedar-integration-tests/corpus_tests/f5f7588b66978d1dd2254338fbb68ed6ee64a2f0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"f\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"f\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"f\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"f\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"f\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"f\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"f\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"f\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"f\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "f\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "f\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f61502511056c09d7def6b94864dd4cec4693416.json b/cedar-integration-tests/corpus_tests/f61502511056c09d7def6b94864dd4cec4693416.json
index bc3924353..9abd8eca1 100644
--- a/cedar-integration-tests/corpus_tests/f61502511056c09d7def6b94864dd4cec4693416.json
+++ b/cedar-integration-tests/corpus_tests/f61502511056c09d7def6b94864dd4cec4693416.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"Java_sun_misc\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "Java_sun_misc"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"Java_sun_misc\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "Java_sun_misc"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"Java_sun_misc\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "Java_sun_misc"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"Java_sun_misc\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "Java_sun_misc"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"Java_sun_misc\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "Java_sun_misc"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"Java_sun_misc\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "Java_sun_misc"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"Java_sun_misc\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "Java_sun_misc"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"Java_sun_misc\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "Java_sun_misc"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f63422baf5030e519ee155f367080211093dd268.json b/cedar-integration-tests/corpus_tests/f63422baf5030e519ee155f367080211093dd268.json
index 51ec12132..f4a88039a 100644
--- a/cedar-integration-tests/corpus_tests/f63422baf5030e519ee155f367080211093dd268.json
+++ b/cedar-integration-tests/corpus_tests/f63422baf5030e519ee155f367080211093dd268.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"6\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "6"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f647534b9f74d73fb3f220cf78c5a857cd0a8b19.json b/cedar-integration-tests/corpus_tests/f647534b9f74d73fb3f220cf78c5a857cd0a8b19.json
index e35e1a61d..851dd45ac 100644
--- a/cedar-integration-tests/corpus_tests/f647534b9f74d73fb3f220cf78c5a857cd0a8b19.json
+++ b/cedar-integration-tests/corpus_tests/f647534b9f74d73fb3f220cf78c5a857cd0a8b19.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\t\\t\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\t\t"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"d\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"d\"",
+      "principal": {
+        "type": "a",
+        "id": "d"
+      },
+      "resource": {
+        "type": "a",
+        "id": "d"
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -62,9 +107,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -74,9 +128,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -86,9 +149,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": ""
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f658514e0f0114f2e28feff17fd2382765095318.json b/cedar-integration-tests/corpus_tests/f658514e0f0114f2e28feff17fd2382765095318.json
index 37025dd3d..f0fb28191 100644
--- a/cedar-integration-tests/corpus_tests/f658514e0f0114f2e28feff17fd2382765095318.json
+++ b/cedar-integration-tests/corpus_tests/f658514e0f0114f2e28feff17fd2382765095318.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"r\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "r"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f707e8530a96bd2a58b8de7b480670ffdbd34902.json b/cedar-integration-tests/corpus_tests/f707e8530a96bd2a58b8de7b480670ffdbd34902.json
index 4c6a3d206..22f6af6dd 100644
--- a/cedar-integration-tests/corpus_tests/f707e8530a96bd2a58b8de7b480670ffdbd34902.json
+++ b/cedar-integration-tests/corpus_tests/f707e8530a96bd2a58b8de7b480670ffdbd34902.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f750ebde00028c806f5093fa8b0135bdf371d8ae.json b/cedar-integration-tests/corpus_tests/f750ebde00028c806f5093fa8b0135bdf371d8ae.json
index c2427683d..8a89ee19a 100644
--- a/cedar-integration-tests/corpus_tests/f750ebde00028c806f5093fa8b0135bdf371d8ae.json
+++ b/cedar-integration-tests/corpus_tests/f750ebde00028c806f5093fa8b0135bdf371d8ae.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::a::\"\\0\\0\\u{1}\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\\0\\0\\u{1}\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0000\u0000\u0001"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": "\u0000\u0000\u0001"
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::a::\"\\0\\0\\u{1}\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": "\u0000\u0000\u0001"
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f764b8185dcadd8106ba7ecf614bef990e574de6.json b/cedar-integration-tests/corpus_tests/f764b8185dcadd8106ba7ecf614bef990e574de6.json
index ce1f79dd3..be0807ef6 100644
--- a/cedar-integration-tests/corpus_tests/f764b8185dcadd8106ba7ecf614bef990e574de6.json
+++ b/cedar-integration-tests/corpus_tests/f764b8185dcadd8106ba7ecf614bef990e574de6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "mzzzzz::mzzzzz0zwwwwwz::a::\"\"",
-      "action": "mzzzzz::mzzzzz0zwwwwwz::Action::\"action\"",
-      "resource": "mzzzzz::mzzzzz0zwwwwwz::a::\"\"",
+      "principal": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "mzzzzz::mzzzzz0zwwwwwz::a::\"\"",
-      "action": "mzzzzz::mzzzzz0zwwwwwz::Action::\"action\"",
-      "resource": "mzzzzz::mzzzzz0zwwwwwz::a::\"\"",
+      "principal": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "mzzzzz::mzzzzz0zwwwwwz::a::\"\"",
-      "action": "mzzzzz::mzzzzz0zwwwwwz::Action::\"action\"",
-      "resource": "mzzzzz::mzzzzz0zwwwwwz::a::\"\"",
+      "principal": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "mzzzzz::mzzzzz0zwwwwwz::a::\"\"",
-      "action": "mzzzzz::mzzzzz0zwwwwwz::Action::\"action\"",
-      "resource": "mzzzzz::mzzzzz0zwwwwwz::a::\"\"",
+      "principal": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "mzzzzz::mzzzzz0zwwwwwz::a::\"\"",
-      "action": "mzzzzz::mzzzzz0zwwwwwz::Action::\"action\"",
-      "resource": "mzzzzz::mzzzzz0zwwwwwz::a::\"\"",
+      "principal": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "mzzzzz::mzzzzz0zwwwwwz::a::\"\"",
-      "action": "mzzzzz::mzzzzz0zwwwwwz::Action::\"action\"",
-      "resource": "mzzzzz::mzzzzz0zwwwwwz::a::\"\"",
+      "principal": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "mzzzzz::mzzzzz0zwwwwwz::a::\"\"",
-      "action": "mzzzzz::mzzzzz0zwwwwwz::Action::\"action\"",
-      "resource": "mzzzzz::mzzzzz0zwwwwwz::a::\"\"",
+      "principal": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "mzzzzz::mzzzzz0zwwwwwz::a::\"\"",
-      "action": "mzzzzz::mzzzzz0zwwwwwz::Action::\"action\"",
-      "resource": "mzzzzz::mzzzzz0zwwwwwz::a::\"\"",
+      "principal": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::a",
+        "id": ""
+      },
+      "action": {
+        "type": "mzzzzz::mzzzzz0zwwwwwz::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f7a661059947830ab159b0ed8f0093f339a49d7d.json b/cedar-integration-tests/corpus_tests/f7a661059947830ab159b0ed8f0093f339a49d7d.json
index b855e6e1e..7e80cd2a9 100644
--- a/cedar-integration-tests/corpus_tests/f7a661059947830ab159b0ed8f0093f339a49d7d.json
+++ b/cedar-integration-tests/corpus_tests/f7a661059947830ab159b0ed8f0093f339a49d7d.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f7ce74c11891a7f12cb5572bb109bd86118a25fa.json b/cedar-integration-tests/corpus_tests/f7ce74c11891a7f12cb5572bb109bd86118a25fa.json
index f8efee512..4768794f7 100644
--- a/cedar-integration-tests/corpus_tests/f7ce74c11891a7f12cb5572bb109bd86118a25fa.json
+++ b/cedar-integration-tests/corpus_tests/f7ce74c11891a7f12cb5572bb109bd86118a25fa.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f8006bb12f37cc2836361c259c0eec34c848dd2c.json b/cedar-integration-tests/corpus_tests/f8006bb12f37cc2836361c259c0eec34c848dd2c.json
index 37184f5c7..9a3097dd8 100644
--- a/cedar-integration-tests/corpus_tests/f8006bb12f37cc2836361c259c0eec34c848dd2c.json
+++ b/cedar-integration-tests/corpus_tests/f8006bb12f37cc2836361c259c0eec34c848dd2c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f85c41d098b3fec1b79630508e98797b78438e7b.json b/cedar-integration-tests/corpus_tests/f85c41d098b3fec1b79630508e98797b78438e7b.json
index cbbcd0a1b..f4d778f63 100644
--- a/cedar-integration-tests/corpus_tests/f85c41d098b3fec1b79630508e98797b78438e7b.json
+++ b/cedar-integration-tests/corpus_tests/f85c41d098b3fec1b79630508e98797b78438e7b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "`"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"`\"",
+      "principal": {
+        "type": "a",
+        "id": "`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "`"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -50,9 +86,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -60,9 +105,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -70,9 +124,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -80,9 +143,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f874395b1712892f51078b30ab8509f92e151ac9.json b/cedar-integration-tests/corpus_tests/f874395b1712892f51078b30ab8509f92e151ac9.json
index 7f11918f1..ba19e47c3 100644
--- a/cedar-integration-tests/corpus_tests/f874395b1712892f51078b30ab8509f92e151ac9.json
+++ b/cedar-integration-tests/corpus_tests/f874395b1712892f51078b30ab8509f92e151ac9.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"P`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"P`\"",
+      "principal": {
+        "type": "a",
+        "id": "P`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "P`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"P`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"P`\"",
+      "principal": {
+        "type": "a",
+        "id": "P`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "P`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"P`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"P`\"",
+      "principal": {
+        "type": "a",
+        "id": "P`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "P`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"P`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"P`\"",
+      "principal": {
+        "type": "a",
+        "id": "P`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "P`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"P`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"P`\"",
+      "principal": {
+        "type": "a",
+        "id": "P`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "P`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"P`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"P`\"",
+      "principal": {
+        "type": "a",
+        "id": "P`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "P`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"P`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"P`\"",
+      "principal": {
+        "type": "a",
+        "id": "P`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "P`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"P`\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"P`\"",
+      "principal": {
+        "type": "a",
+        "id": "P`"
+      },
+      "resource": {
+        "type": "a",
+        "id": "P`"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f89aa2c2bfe7d67f818632e5db586c9004d88871.json b/cedar-integration-tests/corpus_tests/f89aa2c2bfe7d67f818632e5db586c9004d88871.json
index ba7f99414..e6bb3b8dc 100644
--- a/cedar-integration-tests/corpus_tests/f89aa2c2bfe7d67f818632e5db586c9004d88871.json
+++ b/cedar-integration-tests/corpus_tests/f89aa2c2bfe7d67f818632e5db586c9004d88871.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"*\\'\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*\\'\"",
+      "principal": {
+        "type": "a",
+        "id": "*'"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*'"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"*\\'\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*\\'\"",
+      "principal": {
+        "type": "a",
+        "id": "*'"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*'"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"*\\'\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*\\'\"",
+      "principal": {
+        "type": "a",
+        "id": "*'"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*'"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"*\\'\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*\\'\"",
+      "principal": {
+        "type": "a",
+        "id": "*'"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*'"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"*\\'\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*\\'\"",
+      "principal": {
+        "type": "a",
+        "id": "*'"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*'"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"*\\'\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*\\'\"",
+      "principal": {
+        "type": "a",
+        "id": "*'"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*'"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"*\\'\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*\\'\"",
+      "principal": {
+        "type": "a",
+        "id": "*'"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*'"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"*\\'\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"*\\'\"",
+      "principal": {
+        "type": "a",
+        "id": "*'"
+      },
+      "resource": {
+        "type": "a",
+        "id": "*'"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f8a2d5d79f2b1f3dc2eacb01d5716b50e3fed11a.json b/cedar-integration-tests/corpus_tests/f8a2d5d79f2b1f3dc2eacb01d5716b50e3fed11a.json
index 60adba678..03abf3eba 100644
--- a/cedar-integration-tests/corpus_tests/f8a2d5d79f2b1f3dc2eacb01d5716b50e3fed11a.json
+++ b/cedar-integration-tests/corpus_tests/f8a2d5d79f2b1f3dc2eacb01d5716b50e3fed11a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f8b70a48a3ee96d3cd64840db2e892897fc8d663.json b/cedar-integration-tests/corpus_tests/f8b70a48a3ee96d3cd64840db2e892897fc8d663.json
index d433c8e9a..f740b8fb1 100644
--- a/cedar-integration-tests/corpus_tests/f8b70a48a3ee96d3cd64840db2e892897fc8d663.json
+++ b/cedar-integration-tests/corpus_tests/f8b70a48a3ee96d3cd64840db2e892897fc8d663.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0:::::::::\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000:::::::::"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f8eaa8981889c8d7b2e901659369586259411160.json b/cedar-integration-tests/corpus_tests/f8eaa8981889c8d7b2e901659369586259411160.json
index 69b0d23ed..3d672337a 100644
--- a/cedar-integration-tests/corpus_tests/f8eaa8981889c8d7b2e901659369586259411160.json
+++ b/cedar-integration-tests/corpus_tests/f8eaa8981889c8d7b2e901659369586259411160.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"7#\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "7#\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"7#\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"7#\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "7#\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "7#\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"7#\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"7#\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "7#\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "7#\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"7#\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"7#\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "7#\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "7#\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"7#\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"7#\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "7#\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "7#\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"7#\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"7#\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "7#\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "7#\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"7#\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"7#\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "7#\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "7#\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"7#\\0\\0\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"7#\\0\\0\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "7#\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "7#\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f8f11ba9c5793bb2f21903cf80dd7401b8a737c1.json b/cedar-integration-tests/corpus_tests/f8f11ba9c5793bb2f21903cf80dd7401b8a737c1.json
index 8ee3f1755..aef25d70e 100644
--- a/cedar-integration-tests/corpus_tests/f8f11ba9c5793bb2f21903cf80dd7401b8a737c1.json
+++ b/cedar-integration-tests/corpus_tests/f8f11ba9c5793bb2f21903cf80dd7401b8a737c1.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"66\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"66\"",
+      "principal": {
+        "type": "a",
+        "id": "66"
+      },
+      "resource": {
+        "type": "a",
+        "id": "66"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f9038335a4482bba1a886183685e4de56fd62a10.json b/cedar-integration-tests/corpus_tests/f9038335a4482bba1a886183685e4de56fd62a10.json
index dea9316ef..aa75e150b 100644
--- a/cedar-integration-tests/corpus_tests/f9038335a4482bba1a886183685e4de56fd62a10.json
+++ b/cedar-integration-tests/corpus_tests/f9038335a4482bba1a886183685e4de56fd62a10.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f9067aaf3870c7c6c5cd39c764667deffb775362.json b/cedar-integration-tests/corpus_tests/f9067aaf3870c7c6c5cd39c764667deffb775362.json
index fc18df917..261e5ba5b 100644
--- a/cedar-integration-tests/corpus_tests/f9067aaf3870c7c6c5cd39c764667deffb775362.json
+++ b/cedar-integration-tests/corpus_tests/f9067aaf3870c7c6c5cd39c764667deffb775362.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "l3333333367y::r::\"\"",
-      "action": "l3333333367y::Action::\"action\"",
-      "resource": "l3333333367y::r::\"\"",
+      "principal": {
+        "type": "l3333333367y::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "l3333333367y::r",
+        "id": ""
+      },
+      "action": {
+        "type": "l3333333367y::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "l3333333367y::r::\"\"",
-      "action": "l3333333367y::Action::\"action\"",
-      "resource": "l3333333367y::r::\"\"",
+      "principal": {
+        "type": "l3333333367y::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "l3333333367y::r",
+        "id": ""
+      },
+      "action": {
+        "type": "l3333333367y::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "l3333333367y::r::\"\"",
-      "action": "l3333333367y::Action::\"action\"",
-      "resource": "l3333333367y::r::\"\"",
+      "principal": {
+        "type": "l3333333367y::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "l3333333367y::r",
+        "id": ""
+      },
+      "action": {
+        "type": "l3333333367y::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "l3333333367y::r::\"\"",
-      "action": "l3333333367y::Action::\"action\"",
-      "resource": "l3333333367y::r::\"\"",
+      "principal": {
+        "type": "l3333333367y::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "l3333333367y::r",
+        "id": ""
+      },
+      "action": {
+        "type": "l3333333367y::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "l3333333367y::r::\"\"",
-      "action": "l3333333367y::Action::\"action\"",
-      "resource": "l3333333367y::r::\"\"",
+      "principal": {
+        "type": "l3333333367y::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "l3333333367y::r",
+        "id": ""
+      },
+      "action": {
+        "type": "l3333333367y::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "l3333333367y::r::\"\"",
-      "action": "l3333333367y::Action::\"action\"",
-      "resource": "l3333333367y::r::\"\"",
+      "principal": {
+        "type": "l3333333367y::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "l3333333367y::r",
+        "id": ""
+      },
+      "action": {
+        "type": "l3333333367y::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "l3333333367y::r::\"\"",
-      "action": "l3333333367y::Action::\"action\"",
-      "resource": "l3333333367y::r::\"\"",
+      "principal": {
+        "type": "l3333333367y::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "l3333333367y::r",
+        "id": ""
+      },
+      "action": {
+        "type": "l3333333367y::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "l3333333367y::r::\"\"",
-      "action": "l3333333367y::Action::\"action\"",
-      "resource": "l3333333367y::r::\"\"",
+      "principal": {
+        "type": "l3333333367y::r",
+        "id": ""
+      },
+      "resource": {
+        "type": "l3333333367y::r",
+        "id": ""
+      },
+      "action": {
+        "type": "l3333333367y::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f93f63d216acc608101bc400cb436f26296bf478.json b/cedar-integration-tests/corpus_tests/f93f63d216acc608101bc400cb436f26296bf478.json
index 44e8e3eeb..de60ac1c6 100644
--- a/cedar-integration-tests/corpus_tests/f93f63d216acc608101bc400cb436f26296bf478.json
+++ b/cedar-integration-tests/corpus_tests/f93f63d216acc608101bc400cb436f26296bf478.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "G666666::\"\\0\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "G666666::\"\\0\\u{2}\"",
+      "principal": {
+        "type": "G666666",
+        "id": "\u0000\u0002"
+      },
+      "resource": {
+        "type": "G666666",
+        "id": "\u0000\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "G666666::\"\\0\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "G666666::\"\\0\\u{2}\"",
+      "principal": {
+        "type": "G666666",
+        "id": "\u0000\u0002"
+      },
+      "resource": {
+        "type": "G666666",
+        "id": "\u0000\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "G666666::\"\\0\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "G666666::\"\\0\\u{2}\"",
+      "principal": {
+        "type": "G666666",
+        "id": "\u0000\u0002"
+      },
+      "resource": {
+        "type": "G666666",
+        "id": "\u0000\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "G666666::\"\\0\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "G666666::\"\\0\\u{2}\"",
+      "principal": {
+        "type": "G666666",
+        "id": "\u0000\u0002"
+      },
+      "resource": {
+        "type": "G666666",
+        "id": "\u0000\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "G666666::\"\\0\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "G666666::\"\\0\\u{2}\"",
+      "principal": {
+        "type": "G666666",
+        "id": "\u0000\u0002"
+      },
+      "resource": {
+        "type": "G666666",
+        "id": "\u0000\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "G666666::\"\\0\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "G666666::\"\\0\\u{2}\"",
+      "principal": {
+        "type": "G666666",
+        "id": "\u0000\u0002"
+      },
+      "resource": {
+        "type": "G666666",
+        "id": "\u0000\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "G666666::\"\\0\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "G666666::\"\\0\\u{2}\"",
+      "principal": {
+        "type": "G666666",
+        "id": "\u0000\u0002"
+      },
+      "resource": {
+        "type": "G666666",
+        "id": "\u0000\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "G666666::\"\\0\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "G666666::\"\\0\\u{2}\"",
+      "principal": {
+        "type": "G666666",
+        "id": "\u0000\u0002"
+      },
+      "resource": {
+        "type": "G666666",
+        "id": "\u0000\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f95a4cb686d10f338ec0ebce6dbdde50a49435af.json b/cedar-integration-tests/corpus_tests/f95a4cb686d10f338ec0ebce6dbdde50a49435af.json
index ec002f5dc..a3f3ed992 100644
--- a/cedar-integration-tests/corpus_tests/f95a4cb686d10f338ec0ebce6dbdde50a49435af.json
+++ b/cedar-integration-tests/corpus_tests/f95a4cb686d10f338ec0ebce6dbdde50a49435af.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f96c84bca96fd4eb21a657935bb955db3f241de4.json b/cedar-integration-tests/corpus_tests/f96c84bca96fd4eb21a657935bb955db3f241de4.json
index ca035ebcd..d15a949ad 100644
--- a/cedar-integration-tests/corpus_tests/f96c84bca96fd4eb21a657935bb955db3f241de4.json
+++ b/cedar-integration-tests/corpus_tests/f96c84bca96fd4eb21a657935bb955db3f241de4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::x::a::\"\"",
-      "action": "A::x::Action::\"action\"",
-      "resource": "A::x::a::\"ff\\0\"",
+      "principal": {
+        "type": "A::x::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::x::a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "A::x::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::x::a::\"ff\\0\"",
-      "action": "A::x::Action::\"action\"",
-      "resource": "A::x::a::\"ff\\0\"",
+      "principal": {
+        "type": "A::x::a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "A::x::a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "A::x::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::x::a::\"ff\\0\"",
-      "action": "A::x::Action::\"action\"",
-      "resource": "A::x::a::\"ff\\0\"",
+      "principal": {
+        "type": "A::x::a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "A::x::a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "A::x::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::x::a::\"ff\\0\"",
-      "action": "A::x::Action::\"action\"",
-      "resource": "A::x::a::\"ff\\0\"",
+      "principal": {
+        "type": "A::x::a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "A::x::a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "A::x::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::x::a::\"ff\\0\"",
-      "action": "A::x::Action::\"action\"",
-      "resource": "A::x::a::\"ff\\0\"",
+      "principal": {
+        "type": "A::x::a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "A::x::a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "A::x::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::x::a::\"ff\\0\"",
-      "action": "A::x::Action::\"action\"",
-      "resource": "A::x::a::\"ff\\0\"",
+      "principal": {
+        "type": "A::x::a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "A::x::a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "A::x::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::x::a::\"ff\\0\"",
-      "action": "A::x::Action::\"action\"",
-      "resource": "A::x::a::\"ff\\0\"",
+      "principal": {
+        "type": "A::x::a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "A::x::a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "A::x::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::x::a::\"ff\\0\"",
-      "action": "A::x::Action::\"action\"",
-      "resource": "A::x::a::\"ff\\0\"",
+      "principal": {
+        "type": "A::x::a",
+        "id": "ff\u0000"
+      },
+      "resource": {
+        "type": "A::x::a",
+        "id": "ff\u0000"
+      },
+      "action": {
+        "type": "A::x::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f9c354e3ba7eb40a2a786e83eba1831d1c00a8ce.json b/cedar-integration-tests/corpus_tests/f9c354e3ba7eb40a2a786e83eba1831d1c00a8ce.json
index 6b0e13535..a51fa4472 100644
--- a/cedar-integration-tests/corpus_tests/f9c354e3ba7eb40a2a786e83eba1831d1c00a8ce.json
+++ b/cedar-integration-tests/corpus_tests/f9c354e3ba7eb40a2a786e83eba1831d1c00a8ce.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{2}6\"",
-      "resource": "a::\"6\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "6"
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u00026"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"6\"",
-      "action": "Action::\"\\u{2}6\"",
-      "resource": "a::\"6\"",
+      "principal": {
+        "type": "a",
+        "id": "6"
+      },
+      "resource": {
+        "type": "a",
+        "id": "6"
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u00026"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"6\"",
-      "action": "Action::\"\\u{2}6\"",
-      "resource": "a::\"6\"",
+      "principal": {
+        "type": "a",
+        "id": "6"
+      },
+      "resource": {
+        "type": "a",
+        "id": "6"
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u00026"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"6\"",
-      "action": "Action::\"\\u{2}6\"",
-      "resource": "a::\"6\"",
+      "principal": {
+        "type": "a",
+        "id": "6"
+      },
+      "resource": {
+        "type": "a",
+        "id": "6"
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u00026"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"6\"",
-      "action": "Action::\"\\u{2}6\"",
-      "resource": "a::\"6\"",
+      "principal": {
+        "type": "a",
+        "id": "6"
+      },
+      "resource": {
+        "type": "a",
+        "id": "6"
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u00026"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"6\"",
-      "action": "Action::\"\\u{2}6\"",
-      "resource": "a::\"6\"",
+      "principal": {
+        "type": "a",
+        "id": "6"
+      },
+      "resource": {
+        "type": "a",
+        "id": "6"
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u00026"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"6\"",
-      "action": "Action::\"\\u{2}6\"",
-      "resource": "a::\"6\"",
+      "principal": {
+        "type": "a",
+        "id": "6"
+      },
+      "resource": {
+        "type": "a",
+        "id": "6"
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u00026"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"6\"",
-      "action": "Action::\"\\u{2}6\"",
-      "resource": "a::\"6\"",
+      "principal": {
+        "type": "a",
+        "id": "6"
+      },
+      "resource": {
+        "type": "a",
+        "id": "6"
+      },
+      "action": {
+        "type": "Action",
+        "id": "\u00026"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f9dc7c46f28bc271d95fce5da6c6422e9590da14.json b/cedar-integration-tests/corpus_tests/f9dc7c46f28bc271d95fce5da6c6422e9590da14.json
index 0086102c1..55a746469 100644
--- a/cedar-integration-tests/corpus_tests/f9dc7c46f28bc271d95fce5da6c6422e9590da14.json
+++ b/cedar-integration-tests/corpus_tests/f9dc7c46f28bc271d95fce5da6c6422e9590da14.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f9e02a91691711a8be7fb43dc371d5a1d58aca0f.json b/cedar-integration-tests/corpus_tests/f9e02a91691711a8be7fb43dc371d5a1d58aca0f.json
index b573f5817..da69275b2 100644
--- a/cedar-integration-tests/corpus_tests/f9e02a91691711a8be7fb43dc371d5a1d58aca0f.json
+++ b/cedar-integration-tests/corpus_tests/f9e02a91691711a8be7fb43dc371d5a1d58aca0f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/f9ec5e083fd2ef98a00b97f5f8c13e384fc353a4.json b/cedar-integration-tests/corpus_tests/f9ec5e083fd2ef98a00b97f5f8c13e384fc353a4.json
index 4d0a04cc4..dcacb9131 100644
--- a/cedar-integration-tests/corpus_tests/f9ec5e083fd2ef98a00b97f5f8c13e384fc353a4.json
+++ b/cedar-integration-tests/corpus_tests/f9ec5e083fd2ef98a00b97f5f8c13e384fc353a4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "s::a::\"\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\"",
+      "principal": {
+        "type": "s::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "s::a",
+        "id": ""
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "s::a::\"\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\"",
+      "principal": {
+        "type": "s::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "s::a",
+        "id": ""
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "s::a::\"\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\"",
+      "principal": {
+        "type": "s::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "s::a",
+        "id": ""
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "s::a::\"\\0\\0\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\"",
+      "principal": {
+        "type": "s::a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "s::a",
+        "id": ""
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "s::a::\"\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\"",
+      "principal": {
+        "type": "s::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "s::a",
+        "id": ""
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "s::a::\"\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\"",
+      "principal": {
+        "type": "s::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "s::a",
+        "id": ""
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "s::a::\"\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\"",
+      "principal": {
+        "type": "s::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "s::a",
+        "id": ""
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "s::a::\"\"",
-      "action": "s::Action::\"action\"",
-      "resource": "s::a::\"\"",
+      "principal": {
+        "type": "s::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "s::a",
+        "id": ""
+      },
+      "action": {
+        "type": "s::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/f9f3ca4ef08b3ff39c1e2f4ce34a55ab243cf31b.json b/cedar-integration-tests/corpus_tests/f9f3ca4ef08b3ff39c1e2f4ce34a55ab243cf31b.json
index 60dba3f95..0c425cd8d 100644
--- a/cedar-integration-tests/corpus_tests/f9f3ca4ef08b3ff39c1e2f4ce34a55ab243cf31b.json
+++ b/cedar-integration-tests/corpus_tests/f9f3ca4ef08b3ff39c1e2f4ce34a55ab243cf31b.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -38,9 +65,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -48,9 +84,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -58,9 +103,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -68,9 +122,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +141,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\\0\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/fa37079bf737ea492a8a3f162500426b806c287e.json b/cedar-integration-tests/corpus_tests/fa37079bf737ea492a8a3f162500426b806c287e.json
index a00f2883b..9167186d0 100644
--- a/cedar-integration-tests/corpus_tests/fa37079bf737ea492a8a3f162500426b806c287e.json
+++ b/cedar-integration-tests/corpus_tests/fa37079bf737ea492a8a3f162500426b806c287e.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "G::\"fff\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"fff\"",
+      "principal": {
+        "type": "G",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "G",
+        "id": "fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "G::\"fff\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"fff\"",
+      "principal": {
+        "type": "G",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "G",
+        "id": "fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "G::\"fff\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"fff\"",
+      "principal": {
+        "type": "G",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "G",
+        "id": "fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "G::\"fff\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"fff\"",
+      "principal": {
+        "type": "G",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "G",
+        "id": "fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "G::\"fff\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"fff\"",
+      "principal": {
+        "type": "G",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "G",
+        "id": "fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "G::\"fff\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"fff\"",
+      "principal": {
+        "type": "G",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "G",
+        "id": "fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "G::\"fff\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"fff\"",
+      "principal": {
+        "type": "G",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "G",
+        "id": "fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "G::\"fff\"",
-      "action": "Action::\"action\"",
-      "resource": "G::\"fff\"",
+      "principal": {
+        "type": "G",
+        "id": "fff"
+      },
+      "resource": {
+        "type": "G",
+        "id": "fff"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/fa51f4b347bf4969490811f09fbb2fe495c09c4c.json b/cedar-integration-tests/corpus_tests/fa51f4b347bf4969490811f09fbb2fe495c09c4c.json
index ba0a1f1c7..026a36583 100644
--- a/cedar-integration-tests/corpus_tests/fa51f4b347bf4969490811f09fbb2fe495c09c4c.json
+++ b/cedar-integration-tests/corpus_tests/fa51f4b347bf4969490811f09fbb2fe495c09c4c.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/fa5b36a47a47b238757408e90592d612aabcdd20.json b/cedar-integration-tests/corpus_tests/fa5b36a47a47b238757408e90592d612aabcdd20.json
index 24324daa5..636f926ec 100644
--- a/cedar-integration-tests/corpus_tests/fa5b36a47a47b238757408e90592d612aabcdd20.json
+++ b/cedar-integration-tests/corpus_tests/fa5b36a47a47b238757408e90592d612aabcdd20.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "cP::v::a::\"\"",
-      "action": "cP::v::Action::\"action\"",
-      "resource": "cP::v::a::\"\"",
+      "principal": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "cP::v::a",
+        "id": ""
+      },
+      "action": {
+        "type": "cP::v::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/faa2a6fa10c7e7030f995f2bc077e6ccecbeee4f.json b/cedar-integration-tests/corpus_tests/faa2a6fa10c7e7030f995f2bc077e6ccecbeee4f.json
index efa0d2f73..bfd294bc2 100644
--- a/cedar-integration-tests/corpus_tests/faa2a6fa10c7e7030f995f2bc077e6ccecbeee4f.json
+++ b/cedar-integration-tests/corpus_tests/faa2a6fa10c7e7030f995f2bc077e6ccecbeee4f.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/fab46891298893ba3b4d08c901aa65d615be3ae5.json b/cedar-integration-tests/corpus_tests/fab46891298893ba3b4d08c901aa65d615be3ae5.json
index 24f6aa9e2..c57c87407 100644
--- a/cedar-integration-tests/corpus_tests/fab46891298893ba3b4d08c901aa65d615be3ae5.json
+++ b/cedar-integration-tests/corpus_tests/fab46891298893ba3b4d08c901aa65d615be3ae5.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "A::a::\"\"",
-      "action": "A::Action::\"action\"",
-      "resource": "A::a::\"\"",
+      "principal": {
+        "type": "A::a",
+        "id": ""
+      },
+      "resource": {
+        "type": "A::a",
+        "id": ""
+      },
+      "action": {
+        "type": "A::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/fac24523ee7d9a3a3dc192bf6fac1a15ac3aa723.json b/cedar-integration-tests/corpus_tests/fac24523ee7d9a3a3dc192bf6fac1a15ac3aa723.json
index 8c08a336e..d7e1939cf 100644
--- a/cedar-integration-tests/corpus_tests/fac24523ee7d9a3a3dc192bf6fac1a15ac3aa723.json
+++ b/cedar-integration-tests/corpus_tests/fac24523ee7d9a3a3dc192bf6fac1a15ac3aa723.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"00\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"00\"",
+      "principal": {
+        "type": "a",
+        "id": "00"
+      },
+      "resource": {
+        "type": "a",
+        "id": "00"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/fae02fa9de9b4bdbb061e07c183ff5bab73d20cf.json b/cedar-integration-tests/corpus_tests/fae02fa9de9b4bdbb061e07c183ff5bab73d20cf.json
index 4e227eda0..181183e3c 100644
--- a/cedar-integration-tests/corpus_tests/fae02fa9de9b4bdbb061e07c183ff5bab73d20cf.json
+++ b/cedar-integration-tests/corpus_tests/fae02fa9de9b4bdbb061e07c183ff5bab73d20cf.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/faf56bf278f227911d0481fabba6afebcd204e57.json b/cedar-integration-tests/corpus_tests/faf56bf278f227911d0481fabba6afebcd204e57.json
index 2cbb84231..91442eaf7 100644
--- a/cedar-integration-tests/corpus_tests/faf56bf278f227911d0481fabba6afebcd204e57.json
+++ b/cedar-integration-tests/corpus_tests/faf56bf278f227911d0481fabba6afebcd204e57.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/fb09e70cc5feb386582051b75d829fc2efe22b65.json b/cedar-integration-tests/corpus_tests/fb09e70cc5feb386582051b75d829fc2efe22b65.json
index eb68dfb5c..d40a15644 100644
--- a/cedar-integration-tests/corpus_tests/fb09e70cc5feb386582051b75d829fc2efe22b65.json
+++ b/cedar-integration-tests/corpus_tests/fb09e70cc5feb386582051b75d829fc2efe22b65.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\":::::\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::::\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":::::\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::::\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"o\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::::\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "o"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::::\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\":::::\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::::\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":::::\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::::\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\":::::\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::::\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":::::\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::::\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\":::::\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::::\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":::::\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::::\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\":::::\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::::\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":::::\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::::\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\":::::\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::::\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":::::\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::::\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\":::::\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\":::::\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ":::::\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ":::::\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/fb0e459d20b27044895c2bb1250c349fa89ace1a.json b/cedar-integration-tests/corpus_tests/fb0e459d20b27044895c2bb1250c349fa89ace1a.json
index ef4c7fe12..c03c1c165 100644
--- a/cedar-integration-tests/corpus_tests/fb0e459d20b27044895c2bb1250c349fa89ace1a.json
+++ b/cedar-integration-tests/corpus_tests/fb0e459d20b27044895c2bb1250c349fa89ace1a.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"zzz\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"zzz\"",
+      "principal": {
+        "type": "a",
+        "id": "zzz"
+      },
+      "resource": {
+        "type": "a",
+        "id": "zzz"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/fb15bae9c1989b7521bb52f5c61f7e3bc9eef686.json b/cedar-integration-tests/corpus_tests/fb15bae9c1989b7521bb52f5c61f7e3bc9eef686.json
index 79c2b3cce..fcc913b18 100644
--- a/cedar-integration-tests/corpus_tests/fb15bae9c1989b7521bb52f5c61f7e3bc9eef686.json
+++ b/cedar-integration-tests/corpus_tests/fb15bae9c1989b7521bb52f5c61f7e3bc9eef686.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "mzzzz655R55Fz": ""
@@ -21,9 +30,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "mzzzz655R55Fz": ""
@@ -36,9 +54,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "mzzzz655R55Fz": ""
@@ -51,9 +78,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "mzzzz655R55Fz": ""
@@ -66,9 +102,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "mzzzz655R55Fz": ""
@@ -81,9 +126,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "mzzzz655R55Fz": ""
@@ -96,9 +150,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "mzzzz655R55Fz": ""
@@ -111,9 +174,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {
         "A": false,
         "mzzzz655R55Fz": ""
diff --git a/cedar-integration-tests/corpus_tests/fb725623677e7858ffe3308c0fbf2e03c59fbb74.json b/cedar-integration-tests/corpus_tests/fb725623677e7858ffe3308c0fbf2e03c59fbb74.json
index a4ec8b2f5..95cbbeb11 100644
--- a/cedar-integration-tests/corpus_tests/fb725623677e7858ffe3308c0fbf2e03c59fbb74.json
+++ b/cedar-integration-tests/corpus_tests/fb725623677e7858ffe3308c0fbf2e03c59fbb74.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Gxxxx1000::a::\"\\u{7f}\\0\\0\\0\\0\"",
-      "action": "Gxxxx1000::Action::\"action\"",
-      "resource": "Gxxxx1000::a::\"\\u{7f}\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "Gxxxx1000::a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "Gxxxx1000::a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Gxxxx1000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Gxxxx1000::a::\"\\u{7f}\\0\\0\\0\\0\"",
-      "action": "Gxxxx1000::Action::\"action\"",
-      "resource": "Gxxxx1000::a::\"\\u{7f}\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "Gxxxx1000::a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "Gxxxx1000::a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Gxxxx1000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Gxxxx1000::a::\"\\u{7f}\\0\\0\\0\\0\"",
-      "action": "Gxxxx1000::Action::\"action\"",
-      "resource": "Gxxxx1000::a::\"\\u{7f}\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "Gxxxx1000::a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "Gxxxx1000::a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Gxxxx1000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Gxxxx1000::a::\"\\u{7f}\\0\\0\\0\\0\"",
-      "action": "Gxxxx1000::Action::\"action\"",
-      "resource": "Gxxxx1000::a::\"\\u{7f}\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "Gxxxx1000::a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "Gxxxx1000::a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Gxxxx1000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Gxxxx1000::a::\"\\u{7f}\\0\\0\\0\\0\"",
-      "action": "Gxxxx1000::Action::\"action\"",
-      "resource": "Gxxxx1000::a::\"\\u{7f}\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "Gxxxx1000::a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "Gxxxx1000::a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Gxxxx1000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Gxxxx1000::a::\"\\u{7f}\\0\\0\\0\\0\"",
-      "action": "Gxxxx1000::Action::\"action\"",
-      "resource": "Gxxxx1000::a::\"\\u{7f}\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "Gxxxx1000::a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "Gxxxx1000::a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Gxxxx1000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Gxxxx1000::a::\"\\u{7f}\\0\\0\\0\\0\"",
-      "action": "Gxxxx1000::Action::\"action\"",
-      "resource": "Gxxxx1000::a::\"\\u{7f}\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "Gxxxx1000::a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "Gxxxx1000::a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Gxxxx1000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Gxxxx1000::a::\"\\u{7f}\\0\\0\\0\\0\"",
-      "action": "Gxxxx1000::Action::\"action\"",
-      "resource": "Gxxxx1000::a::\"\\u{7f}\\0\\0\\0\\0\"",
+      "principal": {
+        "type": "Gxxxx1000::a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "resource": {
+        "type": "Gxxxx1000::a",
+        "id": "\u0000\u0000\u0000\u0000"
+      },
+      "action": {
+        "type": "Gxxxx1000::Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/fb9262fa84996a553a19a60a48cc74477b0c20a0.json b/cedar-integration-tests/corpus_tests/fb9262fa84996a553a19a60a48cc74477b0c20a0.json
index 06392c6d2..cd8afcbaa 100644
--- a/cedar-integration-tests/corpus_tests/fb9262fa84996a553a19a60a48cc74477b0c20a0.json
+++ b/cedar-integration-tests/corpus_tests/fb9262fa84996a553a19a60a48cc74477b0c20a0.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{c5148}\\u{5}\\u{6}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "󅅈\u0005\u0006"
+      },
       "context": {
         "ukkkk00000000": ""
       },
@@ -20,9 +29,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{c5148}\\u{5}\\u{6}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "󅅈\u0005\u0006"
+      },
       "context": {
         "ukkkk00000000": ""
       },
@@ -34,9 +52,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{c5148}\\u{5}\\u{6}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "󅅈\u0005\u0006"
+      },
       "context": {
         "ukkkk00000000": ""
       },
@@ -48,9 +75,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{c5148}\\u{5}\\u{6}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "󅅈\u0005\u0006"
+      },
       "context": {
         "ukkkk00000000": ""
       },
@@ -62,9 +98,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{c5148}\\u{5}\\u{6}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "󅅈\u0005\u0006"
+      },
       "context": {
         "ukkkk00000000": ""
       },
@@ -76,9 +121,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{c5148}\\u{5}\\u{6}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "󅅈\u0005\u0006"
+      },
       "context": {
         "ukkkk00000000": ""
       },
@@ -90,9 +144,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{c5148}\\u{5}\\u{6}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "󅅈\u0005\u0006"
+      },
       "context": {
         "ukkkk00000000": ""
       },
@@ -104,9 +167,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"\\u{c5148}\\u{5}\\u{6}\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "󅅈\u0005\u0006"
+      },
       "context": {
         "ukkkk00000000": ""
       },
diff --git a/cedar-integration-tests/corpus_tests/fbb67cf9a24d6f669bc498ce002672d38048b513.json b/cedar-integration-tests/corpus_tests/fbb67cf9a24d6f669bc498ce002672d38048b513.json
index 319f492fd..4bf543810 100644
--- a/cedar-integration-tests/corpus_tests/fbb67cf9a24d6f669bc498ce002672d38048b513.json
+++ b/cedar-integration-tests/corpus_tests/fbb67cf9a24d6f669bc498ce002672d38048b513.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "OJJJ::\"RR\"",
-      "action": "Action::\"action\"",
-      "resource": "OJJJ::\"RR\"",
+      "principal": {
+        "type": "OJJJ",
+        "id": "RR"
+      },
+      "resource": {
+        "type": "OJJJ",
+        "id": "RR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "OJJJ::\"RR\"",
-      "action": "Action::\"action\"",
-      "resource": "OJJJ::\"RR\"",
+      "principal": {
+        "type": "OJJJ",
+        "id": "RR"
+      },
+      "resource": {
+        "type": "OJJJ",
+        "id": "RR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "OJJJ::\"RR\"",
-      "action": "Action::\"action\"",
-      "resource": "OJJJ::\"RR\"",
+      "principal": {
+        "type": "OJJJ",
+        "id": "RR"
+      },
+      "resource": {
+        "type": "OJJJ",
+        "id": "RR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "OJJJ::\"RR\"",
-      "action": "Action::\"action\"",
-      "resource": "OJJJ::\"RR\"",
+      "principal": {
+        "type": "OJJJ",
+        "id": "RR"
+      },
+      "resource": {
+        "type": "OJJJ",
+        "id": "RR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "OJJJ::\"RR\"",
-      "action": "Action::\"action\"",
-      "resource": "OJJJ::\"RR\"",
+      "principal": {
+        "type": "OJJJ",
+        "id": "RR"
+      },
+      "resource": {
+        "type": "OJJJ",
+        "id": "RR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "OJJJ::\"RR\"",
-      "action": "Action::\"action\"",
-      "resource": "OJJJ::\"RR\"",
+      "principal": {
+        "type": "OJJJ",
+        "id": "RR"
+      },
+      "resource": {
+        "type": "OJJJ",
+        "id": "RR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "OJJJ::\"RR\"",
-      "action": "Action::\"action\"",
-      "resource": "OJJJ::\"RR\"",
+      "principal": {
+        "type": "OJJJ",
+        "id": "RR"
+      },
+      "resource": {
+        "type": "OJJJ",
+        "id": "RR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "OJJJ::\"RR\"",
-      "action": "Action::\"action\"",
-      "resource": "OJJJ::\"RR\"",
+      "principal": {
+        "type": "OJJJ",
+        "id": "RR"
+      },
+      "resource": {
+        "type": "OJJJ",
+        "id": "RR"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/fbcd6f770f6ea35ce8531fd4587f05de7935db29.json b/cedar-integration-tests/corpus_tests/fbcd6f770f6ea35ce8531fd4587f05de7935db29.json
index e2ac1082c..770c0d3e2 100644
--- a/cedar-integration-tests/corpus_tests/fbcd6f770f6ea35ce8531fd4587f05de7935db29.json
+++ b/cedar-integration-tests/corpus_tests/fbcd6f770f6ea35ce8531fd4587f05de7935db29.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}com/f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}com/f\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002com/f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002com/f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}com/f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}com/f\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002com/f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002com/f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}com/f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}com/f\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002com/f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002com/f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}com/f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}com/f\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002com/f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002com/f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}com/f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}com/f\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002com/f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002com/f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}com/f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}com/f\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002com/f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002com/f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}com/f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}com/f\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002com/f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002com/f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}com/f\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}\\u{2}com/f\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002com/f"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002\u0002com/f"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/fc68e0680604a1abef56806cd2b3d0867a3a2e12.json b/cedar-integration-tests/corpus_tests/fc68e0680604a1abef56806cd2b3d0867a3a2e12.json
index c78b1436f..0063255b8 100644
--- a/cedar-integration-tests/corpus_tests/fc68e0680604a1abef56806cd2b3d0867a3a2e12.json
+++ b/cedar-integration-tests/corpus_tests/fc68e0680604a1abef56806cd2b3d0867a3a2e12.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/fca2f45c5b79fb2b1c3e08f663883fc020d2f8ad.json b/cedar-integration-tests/corpus_tests/fca2f45c5b79fb2b1c3e08f663883fc020d2f8ad.json
index fcfef609a..18e86af0e 100644
--- a/cedar-integration-tests/corpus_tests/fca2f45c5b79fb2b1c3e08f663883fc020d2f8ad.json
+++ b/cedar-integration-tests/corpus_tests/fca2f45c5b79fb2b1c3e08f663883fc020d2f8ad.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/fcc4ead5e89eb1f4cc6a1e756cbb4c377fe8f573.json b/cedar-integration-tests/corpus_tests/fcc4ead5e89eb1f4cc6a1e756cbb4c377fe8f573.json
index ba73ebe72..ebdd6204f 100644
--- a/cedar-integration-tests/corpus_tests/fcc4ead5e89eb1f4cc6a1e756cbb4c377fe8f573.json
+++ b/cedar-integration-tests/corpus_tests/fcc4ead5e89eb1f4cc6a1e756cbb4c377fe8f573.json
@@ -7,8 +7,11 @@
     {
       "desc": "Query 0",
       "principal": null,
-      "action": "Action::\"l/ja\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "l/ja"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -19,8 +22,11 @@
     {
       "desc": "Query 1",
       "principal": null,
-      "action": "Action::\"l/ja\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "l/ja"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -31,8 +37,11 @@
     {
       "desc": "Query 2",
       "principal": null,
-      "action": "Action::\"l/ja\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "l/ja"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -43,8 +52,11 @@
     {
       "desc": "Query 3",
       "principal": null,
-      "action": "Action::\"l/ja\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "l/ja"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -55,8 +67,11 @@
     {
       "desc": "Query 4",
       "principal": null,
-      "action": "Action::\"l/ja\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "l/ja"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -67,8 +82,11 @@
     {
       "desc": "Query 5",
       "principal": null,
-      "action": "Action::\"l/ja\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "l/ja"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -79,8 +97,11 @@
     {
       "desc": "Query 6",
       "principal": null,
-      "action": "Action::\"l/ja\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "l/ja"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -91,8 +112,11 @@
     {
       "desc": "Query 7",
       "principal": null,
-      "action": "Action::\"l/ja\"",
       "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "l/ja"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/fcfdf92babb9d6b8a7837c7b11cf923d74b43e52.json b/cedar-integration-tests/corpus_tests/fcfdf92babb9d6b8a7837c7b11cf923d74b43e52.json
index 58aa429fc..d2225ef3d 100644
--- a/cedar-integration-tests/corpus_tests/fcfdf92babb9d6b8a7837c7b11cf923d74b43e52.json
+++ b/cedar-integration-tests/corpus_tests/fcfdf92babb9d6b8a7837c7b11cf923d74b43e52.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/fd3136155170ca1db87756f7775d75281b5647d4.json b/cedar-integration-tests/corpus_tests/fd3136155170ca1db87756f7775d75281b5647d4.json
index 600dc193e..0cfce7260 100644
--- a/cedar-integration-tests/corpus_tests/fd3136155170ca1db87756f7775d75281b5647d4.json
+++ b/cedar-integration-tests/corpus_tests/fd3136155170ca1db87756f7775d75281b5647d4.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Kfhhhhh::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"....\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Kfhhhhh::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"....\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Kfhhhhh::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"....\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Kfhhhhh::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"....\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Kfhhhhh::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"....\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Kfhhhhh::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"....\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Kfhhhhh::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"....\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Kfhhhhh::\"....\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhh::\"....\"",
+      "principal": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "resource": {
+        "type": "Kfhhhhh",
+        "id": "...."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/fd4855a6b7c2e0189ede9509e242a8463c29e380.json b/cedar-integration-tests/corpus_tests/fd4855a6b7c2e0189ede9509e242a8463c29e380.json
index c24eb83e5..3bb2027d1 100644
--- a/cedar-integration-tests/corpus_tests/fd4855a6b7c2e0189ede9509e242a8463c29e380.json
+++ b/cedar-integration-tests/corpus_tests/fd4855a6b7c2e0189ede9509e242a8463c29e380.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/fd6c0162c36cf2a9f7b0f1f63cba50e26b7c7473.json b/cedar-integration-tests/corpus_tests/fd6c0162c36cf2a9f7b0f1f63cba50e26b7c7473.json
index 2d914c9f8..ad5579921 100644
--- a/cedar-integration-tests/corpus_tests/fd6c0162c36cf2a9f7b0f1f63cba50e26b7c7473.json
+++ b/cedar-integration-tests/corpus_tests/fd6c0162c36cf2a9f7b0f1f63cba50e26b7c7473.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -28,9 +46,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -40,9 +67,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -52,9 +88,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -64,9 +109,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +130,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -88,9 +151,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/fdbc43fb8590b30134d3051354baca39abcc4846.json b/cedar-integration-tests/corpus_tests/fdbc43fb8590b30134d3051354baca39abcc4846.json
index c2699d950..7780a73fa 100644
--- a/cedar-integration-tests/corpus_tests/fdbc43fb8590b30134d3051354baca39abcc4846.json
+++ b/cedar-integration-tests/corpus_tests/fdbc43fb8590b30134d3051354baca39abcc4846.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/fde8acc835ba1326b9a688e85fb82d5207d02cf2.json b/cedar-integration-tests/corpus_tests/fde8acc835ba1326b9a688e85fb82d5207d02cf2.json
index 02ba1b109..82e19a204 100644
--- a/cedar-integration-tests/corpus_tests/fde8acc835ba1326b9a688e85fb82d5207d02cf2.json
+++ b/cedar-integration-tests/corpus_tests/fde8acc835ba1326b9a688e85fb82d5207d02cf2.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"m/\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "m/"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"m/\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "m/"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"m/\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "m/"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"m/\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "m/"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"m/\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "m/"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"m/\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "m/"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"m/\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "m/"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"m/\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "m/"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/fdfa1af780d53db9313ac161f3fc5a7335836ba7.json b/cedar-integration-tests/corpus_tests/fdfa1af780d53db9313ac161f3fc5a7335836ba7.json
index 7c0b1dafd..8da47a284 100644
--- a/cedar-integration-tests/corpus_tests/fdfa1af780d53db9313ac161f3fc5a7335836ba7.json
+++ b/cedar-integration-tests/corpus_tests/fdfa1af780d53db9313ac161f3fc5a7335836ba7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "W::\"::!:\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"::!:\"",
+      "principal": {
+        "type": "W",
+        "id": "::!:"
+      },
+      "resource": {
+        "type": "W",
+        "id": "::!:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "W::\"::!:\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"::!:\"",
+      "principal": {
+        "type": "W",
+        "id": "::!:"
+      },
+      "resource": {
+        "type": "W",
+        "id": "::!:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "W::\"::!:\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"::!:\"",
+      "principal": {
+        "type": "W",
+        "id": "::!:"
+      },
+      "resource": {
+        "type": "W",
+        "id": "::!:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "W::\"::!:\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"::!:\"",
+      "principal": {
+        "type": "W",
+        "id": "::!:"
+      },
+      "resource": {
+        "type": "W",
+        "id": "::!:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "W::\"::!:\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"::!:\"",
+      "principal": {
+        "type": "W",
+        "id": "::!:"
+      },
+      "resource": {
+        "type": "W",
+        "id": "::!:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "W::\"::!:\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"::!:\"",
+      "principal": {
+        "type": "W",
+        "id": "::!:"
+      },
+      "resource": {
+        "type": "W",
+        "id": "::!:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "W::\"::!:\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"::!:\"",
+      "principal": {
+        "type": "W",
+        "id": "::!:"
+      },
+      "resource": {
+        "type": "W",
+        "id": "::!:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "W::\"::!:\"",
-      "action": "Action::\"action\"",
-      "resource": "W::\"::!:\"",
+      "principal": {
+        "type": "W",
+        "id": "::!:"
+      },
+      "resource": {
+        "type": "W",
+        "id": "::!:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/fdffaf881b658a19fb59cc82cbd942a12747a9dc.json b/cedar-integration-tests/corpus_tests/fdffaf881b658a19fb59cc82cbd942a12747a9dc.json
index 69d7f15dd..99f974381 100644
--- a/cedar-integration-tests/corpus_tests/fdffaf881b658a19fb59cc82cbd942a12747a9dc.json
+++ b/cedar-integration-tests/corpus_tests/fdffaf881b658a19fb59cc82cbd942a12747a9dc.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"FFFFFFFFFF&\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFFFFFFFF&\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFFFFFFFF&\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFFFFFFFF&\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"FFFFFFFFFF&\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFFFFFFFF&\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFFFFFFFF&\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFFFFFFFF&\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"FFFFFFFFFF&\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFFFFFFFF&\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFFFFFFFF&\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFFFFFFFF&\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"FFFFFFFFFF&\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFFFFFFFF&\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFFFFFFFF&\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFFFFFFFF&\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"FFFFFFFFFF&\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFFFFFFFF&\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFFFFFFFF&\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFFFFFFFF&\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"FFFFFFFFFF&\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFFFFFFFF&\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFFFFFFFF&\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFFFFFFFF&\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"FFFFFFFFFF&\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFFFFFFFF&\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFFFFFFFF&\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFFFFFFFF&\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"FFFFFFFFFF&\\0\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"FFFFFFFFFF&\\0\"",
+      "principal": {
+        "type": "a",
+        "id": "FFFFFFFFFF&\u0000"
+      },
+      "resource": {
+        "type": "a",
+        "id": "FFFFFFFFFF&\u0000"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/fe82e4c8f1e0fc7dffe20c92ddee7696b523ab04.json b/cedar-integration-tests/corpus_tests/fe82e4c8f1e0fc7dffe20c92ddee7696b523ab04.json
index cccdfdeb2..5a2bccc0b 100644
--- a/cedar-integration-tests/corpus_tests/fe82e4c8f1e0fc7dffe20c92ddee7696b523ab04.json
+++ b/cedar-integration-tests/corpus_tests/fe82e4c8f1e0fc7dffe20c92ddee7696b523ab04.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "u::\"\"",
-      "action": "Action::\"O..D\"",
-      "resource": "u::\"\"",
+      "principal": {
+        "type": "u",
+        "id": ""
+      },
+      "resource": {
+        "type": "u",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "O..D"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "u::\"\"",
-      "action": "Action::\"O..D\"",
-      "resource": "u::\"\"",
+      "principal": {
+        "type": "u",
+        "id": ""
+      },
+      "resource": {
+        "type": "u",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "O..D"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "u::\"\"",
-      "action": "Action::\"O..D\"",
-      "resource": "u::\"\"",
+      "principal": {
+        "type": "u",
+        "id": ""
+      },
+      "resource": {
+        "type": "u",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "O..D"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "u::\"\"",
-      "action": "Action::\"O..D\"",
-      "resource": "u::\"\"",
+      "principal": {
+        "type": "u",
+        "id": ""
+      },
+      "resource": {
+        "type": "u",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "O..D"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "u::\"\"",
-      "action": "Action::\"O..D\"",
-      "resource": "u::\"\"",
+      "principal": {
+        "type": "u",
+        "id": ""
+      },
+      "resource": {
+        "type": "u",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "O..D"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "u::\"\"",
-      "action": "Action::\"O..D\"",
-      "resource": "u::\"\"",
+      "principal": {
+        "type": "u",
+        "id": ""
+      },
+      "resource": {
+        "type": "u",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "O..D"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "u::\"\"",
-      "action": "Action::\"O..D\"",
-      "resource": "u::\"\"",
+      "principal": {
+        "type": "u",
+        "id": ""
+      },
+      "resource": {
+        "type": "u",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "O..D"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "u::\"\"",
-      "action": "Action::\"O..D\"",
-      "resource": "u::\"\"",
+      "principal": {
+        "type": "u",
+        "id": ""
+      },
+      "resource": {
+        "type": "u",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "O..D"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/feb6b9ba954ed24c15e13e0b191576ff48e4e578.json b/cedar-integration-tests/corpus_tests/feb6b9ba954ed24c15e13e0b191576ff48e4e578.json
index 948d460f8..5ba000c9e 100644
--- a/cedar-integration-tests/corpus_tests/feb6b9ba954ed24c15e13e0b191576ff48e4e578.json
+++ b/cedar-integration-tests/corpus_tests/feb6b9ba954ed24c15e13e0b191576ff48e4e578.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ff06c4ecb3b77a633e4127b138b788d82f45cd87.json b/cedar-integration-tests/corpus_tests/ff06c4ecb3b77a633e4127b138b788d82f45cd87.json
index 77786ba30..bad7c7720 100644
--- a/cedar-integration-tests/corpus_tests/ff06c4ecb3b77a633e4127b138b788d82f45cd87.json
+++ b/cedar-integration-tests/corpus_tests/ff06c4ecb3b77a633e4127b138b788d82f45cd87.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "ZJJJ::\"zzz\\nzzzl\"",
-      "action": "Action::\"action\"",
-      "resource": "ZJJJ::\"zzz\\nzzzl\"",
+      "principal": {
+        "type": "ZJJJ",
+        "id": "zzz\nzzzl"
+      },
+      "resource": {
+        "type": "ZJJJ",
+        "id": "zzz\nzzzl"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "ZJJJ::\"zzz\\nzzzl\"",
-      "action": "Action::\"action\"",
-      "resource": "ZJJJ::\"zzz\\nzzzl\"",
+      "principal": {
+        "type": "ZJJJ",
+        "id": "zzz\nzzzl"
+      },
+      "resource": {
+        "type": "ZJJJ",
+        "id": "zzz\nzzzl"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "ZJJJ::\"zzz\\nzzzl\"",
-      "action": "Action::\"action\"",
-      "resource": "ZJJJ::\"zzz\\nzzzl\"",
+      "principal": {
+        "type": "ZJJJ",
+        "id": "zzz\nzzzl"
+      },
+      "resource": {
+        "type": "ZJJJ",
+        "id": "zzz\nzzzl"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "ZJJJ::\"zzz\\nzzzl\"",
-      "action": "Action::\"action\"",
-      "resource": "ZJJJ::\"zzz\\nzzzl\"",
+      "principal": {
+        "type": "ZJJJ",
+        "id": "zzz\nzzzl"
+      },
+      "resource": {
+        "type": "ZJJJ",
+        "id": "zzz\nzzzl"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "ZJJJ::\"zzz\\nzzzl\"",
-      "action": "Action::\"action\"",
-      "resource": "ZJJJ::\"zzz\\nzzzl\"",
+      "principal": {
+        "type": "ZJJJ",
+        "id": "zzz\nzzzl"
+      },
+      "resource": {
+        "type": "ZJJJ",
+        "id": "zzz\nzzzl"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "ZJJJ::\"zzz\\nzzzl\"",
-      "action": "Action::\"action\"",
-      "resource": "ZJJJ::\"zzz\\nzzzl\"",
+      "principal": {
+        "type": "ZJJJ",
+        "id": "zzz\nzzzl"
+      },
+      "resource": {
+        "type": "ZJJJ",
+        "id": "zzz\nzzzl"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "ZJJJ::\"zzz\\nzzzl\"",
-      "action": "Action::\"action\"",
-      "resource": "ZJJJ::\"zzz\\nzzzl\"",
+      "principal": {
+        "type": "ZJJJ",
+        "id": "zzz\nzzzl"
+      },
+      "resource": {
+        "type": "ZJJJ",
+        "id": "zzz\nzzzl"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "ZJJJ::\"zzz\\nzzzl\"",
-      "action": "Action::\"action\"",
-      "resource": "ZJJJ::\"zzz\\nzzzl\"",
+      "principal": {
+        "type": "ZJJJ",
+        "id": "zzz\nzzzl"
+      },
+      "resource": {
+        "type": "ZJJJ",
+        "id": "zzz\nzzzl"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ff09477226aef69a6b55bec714847f7758466e90.json b/cedar-integration-tests/corpus_tests/ff09477226aef69a6b55bec714847f7758466e90.json
index 39f5295ae..b46b53bfd 100644
--- a/cedar-integration-tests/corpus_tests/ff09477226aef69a6b55bec714847f7758466e90.json
+++ b/cedar-integration-tests/corpus_tests/ff09477226aef69a6b55bec714847f7758466e90.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\u{2}1\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\u{2}1\"",
+      "principal": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u00021"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ff23be3f809396eeaf59bfb08c9a9f4b034b8fd7.json b/cedar-integration-tests/corpus_tests/ff23be3f809396eeaf59bfb08c9a9f4b034b8fd7.json
index 1b739bc3d..cc4af756b 100644
--- a/cedar-integration-tests/corpus_tests/ff23be3f809396eeaf59bfb08c9a9f4b034b8fd7.json
+++ b/cedar-integration-tests/corpus_tests/ff23be3f809396eeaf59bfb08c9a9f4b034b8fd7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"::::::\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"::::::\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"::::::\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"::::::\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"::::::\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"::::::\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"::::::\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"::::::\\u{2}\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"::::::\\u{2}\"",
+      "principal": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "resource": {
+        "type": "a",
+        "id": "::::::\u0002"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/corpus_tests/ff2bb115942c7257de5f24a3985fa4f2fdd49108.json b/cedar-integration-tests/corpus_tests/ff2bb115942c7257de5f24a3985fa4f2fdd49108.json
index 613f72627..5f97647ca 100644
--- a/cedar-integration-tests/corpus_tests/ff2bb115942c7257de5f24a3985fa4f2fdd49108.json
+++ b/cedar-integration-tests/corpus_tests/ff2bb115942c7257de5f24a3985fa4f2fdd49108.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\"",
+      "principal": {
+        "type": "a",
+        "id": ""
+      },
+      "resource": {
+        "type": "a",
+        "id": ""
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ff4d2518acef2025edd52399c6bbaf8c2642eda6.json b/cedar-integration-tests/corpus_tests/ff4d2518acef2025edd52399c6bbaf8c2642eda6.json
index 1dfb98a39..fddcaa0c1 100644
--- a/cedar-integration-tests/corpus_tests/ff4d2518acef2025edd52399c6bbaf8c2642eda6.json
+++ b/cedar-integration-tests/corpus_tests/ff4d2518acef2025edd52399c6bbaf8c2642eda6.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "a::\"\\0:\\0:\\0\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0:\\0:\\0\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000:\u0000:\u0000\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000:\u0000:\u0000\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -16,9 +25,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "a::\"\\0:\\0:\\0\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0:\\0:\\0\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000:\u0000:\u0000\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000:\u0000:\u0000\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -26,9 +44,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "a::\"\\0:\\0:\\0\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0:\\0:\\0\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000:\u0000:\u0000\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000:\u0000:\u0000\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -36,9 +63,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "a::\"\\0:\\0:\\0\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0:\\0:\\0\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000:\u0000:\u0000\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000:\u0000:\u0000\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -46,9 +82,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "a::\"\\0:\\0:\\0\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0:\\0:\\0\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000:\u0000:\u0000\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000:\u0000:\u0000\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -56,9 +101,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "a::\"\\0:\\0:\\0\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0:\\0:\\0\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000:\u0000:\u0000\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000:\u0000:\u0000\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -66,9 +120,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "a::\"\\0:\\0:\\0\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0:\\0:\\0\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000:\u0000:\u0000\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000:\u0000:\u0000\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
@@ -76,9 +139,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "a::\"\\0:\\0:\\0\\0\\0:\"",
-      "action": "Action::\"action\"",
-      "resource": "a::\"\\0:\\0:\\0\\0\\0:\"",
+      "principal": {
+        "type": "a",
+        "id": "\u0000:\u0000:\u0000\u0000\u0000:"
+      },
+      "resource": {
+        "type": "a",
+        "id": "\u0000:\u0000:\u0000\u0000\u0000:"
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Deny",
       "reasons": [],
diff --git a/cedar-integration-tests/corpus_tests/ffc71657bf844fa7533226aa6332feb267d448f7.json b/cedar-integration-tests/corpus_tests/ffc71657bf844fa7533226aa6332feb267d448f7.json
index 252057233..72abeb52d 100644
--- a/cedar-integration-tests/corpus_tests/ffc71657bf844fa7533226aa6332feb267d448f7.json
+++ b/cedar-integration-tests/corpus_tests/ffc71657bf844fa7533226aa6332feb267d448f7.json
@@ -6,9 +6,18 @@
   "queries": [
     {
       "desc": "Query 0",
-      "principal": "Kfhhhhhh::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\".\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -18,9 +27,18 @@
     },
     {
       "desc": "Query 1",
-      "principal": "Kfhhhhhh::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\".\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -30,9 +48,18 @@
     },
     {
       "desc": "Query 2",
-      "principal": "Kfhhhhhh::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\".\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -42,9 +69,18 @@
     },
     {
       "desc": "Query 3",
-      "principal": "Kfhhhhhh::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\".\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -54,9 +90,18 @@
     },
     {
       "desc": "Query 4",
-      "principal": "Kfhhhhhh::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\".\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -66,9 +111,18 @@
     },
     {
       "desc": "Query 5",
-      "principal": "Kfhhhhhh::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\".\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -78,9 +132,18 @@
     },
     {
       "desc": "Query 6",
-      "principal": "Kfhhhhhh::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\".\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
@@ -90,9 +153,18 @@
     },
     {
       "desc": "Query 7",
-      "principal": "Kfhhhhhh::\".\"",
-      "action": "Action::\"action\"",
-      "resource": "Kfhhhhhh::\".\"",
+      "principal": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "resource": {
+        "type": "Kfhhhhhh",
+        "id": "."
+      },
+      "action": {
+        "type": "Action",
+        "id": "action"
+      },
       "context": {},
       "decision": "Allow",
       "reasons": [
diff --git a/cedar-integration-tests/tests/decimal/1.json b/cedar-integration-tests/tests/decimal/1.json
index 144aa31e6..b9627af42 100644
--- a/cedar-integration-tests/tests/decimal/1.json
+++ b/cedar-integration-tests/tests/decimal/1.json
@@ -1,36 +1,66 @@
 {
-    "policies": "tests/decimal/policies_1.cedar",
-    "entities": "sample-data/sandbox_b/entities.json",
-    "schema": "sample-data/sandbox_b/schema_exts.cedarschema.json",
-    "should_validate": true,
-    "queries": [
-        {
-            "desc": "alice should be able to view the photo given a confidence score of 0.8",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "confidence_score": {"__extn" : {"fn": "decimal", "arg":"0.8" }},
-                "source_ip": "123.123.123.123",
-                "authenticated": false
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "alice should not be allowed to view the photo when given a confidence score of 0.2345",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "confidence_score": {"__extn" : {"fn": "decimal", "arg":"0.2345" }},
-                "source_ip": "123.123.123.123",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        }
-    ]
+ "policies": "tests/decimal/policies_1.cedar",
+ "entities": "sample-data/sandbox_b/entities.json",
+ "schema": "sample-data/sandbox_b/schema_exts.cedarschema.json",
+ "should_validate": true,
+ "queries": [
+  {
+   "desc": "alice should be able to view the photo given a confidence score of 0.8",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "confidence_score": {
+     "__extn": {
+      "fn": "decimal",
+      "arg": "0.8"
+     }
+    },
+    "source_ip": "123.123.123.123",
+    "authenticated": false
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "alice should not be allowed to view the photo when given a confidence score of 0.2345",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "confidence_score": {
+     "__extn": {
+      "fn": "decimal",
+      "arg": "0.2345"
+     }
+    },
+    "source_ip": "123.123.123.123",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  }
+ ]
 }
diff --git a/cedar-integration-tests/tests/decimal/2.json b/cedar-integration-tests/tests/decimal/2.json
index f8c2b4eec..236dc6ed3 100644
--- a/cedar-integration-tests/tests/decimal/2.json
+++ b/cedar-integration-tests/tests/decimal/2.json
@@ -1,50 +1,94 @@
 {
-    "policies": "tests/decimal/policies_2.cedar",
-    "entities": "sample-data/sandbox_b/entities.json",
-    "schema": "sample-data/sandbox_b/schema_exts.cedarschema.json",
-    "should_validate": true,
-    "queries": [
-        {
-            "desc": "alice should be able to view the photo given a confidence score of 0.455",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "confidence_score": {"__extn" : {"fn": "decimal", "arg": "0.455"} },
-                "source_ip": "123.123.123.123",
-                "authenticated": false
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "alice should not be allowed to view the photo when given a confidence score of 0.0001",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "confidence_score": {"__extn" : {"fn": "decimal", "arg": "0.0001"} },
-                "source_ip": "123.123.123.123",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        },
-        {
-            "desc": "alice should not be allowed to view the photo when given a confidence score of 0.9",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "confidence_score": {"__extn" : {"fn": "decimal", "arg": "0.9"} },
-                "source_ip": "123.123.123.123",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        }
-    ]
+ "policies": "tests/decimal/policies_2.cedar",
+ "entities": "sample-data/sandbox_b/entities.json",
+ "schema": "sample-data/sandbox_b/schema_exts.cedarschema.json",
+ "should_validate": true,
+ "queries": [
+  {
+   "desc": "alice should be able to view the photo given a confidence score of 0.455",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "confidence_score": {
+     "__extn": {
+      "fn": "decimal",
+      "arg": "0.455"
+     }
+    },
+    "source_ip": "123.123.123.123",
+    "authenticated": false
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "alice should not be allowed to view the photo when given a confidence score of 0.0001",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "confidence_score": {
+     "__extn": {
+      "fn": "decimal",
+      "arg": "0.0001"
+     }
+    },
+    "source_ip": "123.123.123.123",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  },
+  {
+   "desc": "alice should not be allowed to view the photo when given a confidence score of 0.9",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "confidence_score": {
+     "__extn": {
+      "fn": "decimal",
+      "arg": "0.9"
+     }
+    },
+    "source_ip": "123.123.123.123",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  }
+ ]
 }
diff --git a/cedar-integration-tests/tests/example_use_cases_doc/1a.json b/cedar-integration-tests/tests/example_use_cases_doc/1a.json
index e2441d12c..7e924c3ba 100644
--- a/cedar-integration-tests/tests/example_use_cases_doc/1a.json
+++ b/cedar-integration-tests/tests/example_use_cases_doc/1a.json
@@ -1,64 +1,102 @@
 {
-    "policies": "tests/example_use_cases_doc/policies_1a.cedar",
-    "entities": "sample-data/sandbox_a/entities.json",
-    "schema": "sample-data/sandbox_a/schema.cedarschema.json",
-    "should_validate": true,
-    "queries": [
-        {
-            "desc": "alice should be able to view the photo",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "bob should not be allowed to view the photo (wrong Principal)",
-            "principal": "User::\"bob\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        },
-        {
-            "desc": "alice should not be allowed to delete the photo (wrong Action)",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"delete\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        },
-        {
-            "desc": "alice should not be allowed to view an unrelated photo (wrong Resource)",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"passportscan.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        }
-    ]
+ "policies": "tests/example_use_cases_doc/policies_1a.cedar",
+ "entities": "sample-data/sandbox_a/entities.json",
+ "schema": "sample-data/sandbox_a/schema.cedarschema.json",
+ "should_validate": true,
+ "queries": [
+  {
+   "desc": "alice should be able to view the photo",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "bob should not be allowed to view the photo (wrong Principal)",
+   "principal": {
+    "type": "User",
+    "id": "bob"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  },
+  {
+   "desc": "alice should not be allowed to delete the photo (wrong Action)",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "delete"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  },
+  {
+   "desc": "alice should not be allowed to view an unrelated photo (wrong Resource)",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "passportscan.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  }
+ ]
 }
diff --git a/cedar-integration-tests/tests/example_use_cases_doc/2a.json b/cedar-integration-tests/tests/example_use_cases_doc/2a.json
index 325e3622b..600116f7c 100644
--- a/cedar-integration-tests/tests/example_use_cases_doc/2a.json
+++ b/cedar-integration-tests/tests/example_use_cases_doc/2a.json
@@ -1,50 +1,79 @@
 {
-    "policies": "tests/example_use_cases_doc/policies_2a.cedar",
-    "entities": "sample-data/sandbox_a/entities.json",
-    "schema": "sample-data/sandbox_a/schema.cedarschema.json",
-    "should_validate": true,
-    "queries": [
-        {
-            "desc": "alice should be able to view the photo",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "bob should not be allowed to view the photo",
-            "principal": "User::\"bob\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        },
-        {
-            "desc": "alice should not be allowed to view an unrelated photo",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"passportscan.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        }
-    ]
+ "policies": "tests/example_use_cases_doc/policies_2a.cedar",
+ "entities": "sample-data/sandbox_a/entities.json",
+ "schema": "sample-data/sandbox_a/schema.cedarschema.json",
+ "should_validate": true,
+ "queries": [
+  {
+   "desc": "alice should be able to view the photo",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "bob should not be allowed to view the photo",
+   "principal": {
+    "type": "User",
+    "id": "bob"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  },
+  {
+   "desc": "alice should not be allowed to view an unrelated photo",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "passportscan.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  }
+ ]
 }
diff --git a/cedar-integration-tests/tests/example_use_cases_doc/2b.json b/cedar-integration-tests/tests/example_use_cases_doc/2b.json
index 20813fbc1..c7e7470b8 100644
--- a/cedar-integration-tests/tests/example_use_cases_doc/2b.json
+++ b/cedar-integration-tests/tests/example_use_cases_doc/2b.json
@@ -1,50 +1,79 @@
 {
-    "policies": "tests/example_use_cases_doc/policies_2b.cedar",
-    "entities": "sample-data/sandbox_a/entities.json",
-    "schema": "sample-data/sandbox_a/schema.cedarschema.json",
-    "should_validate": true,
-    "queries": [
-        {
-            "desc": "alice should be able to view the photo",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "bob should not be allowed to view the photo",
-            "principal": "User::\"bob\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        },
-        {
-            "desc": "alice should not be allowed to view an unrelated photo",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"passportscan.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        }
-    ]
+ "policies": "tests/example_use_cases_doc/policies_2b.cedar",
+ "entities": "sample-data/sandbox_a/entities.json",
+ "schema": "sample-data/sandbox_a/schema.cedarschema.json",
+ "should_validate": true,
+ "queries": [
+  {
+   "desc": "alice should be able to view the photo",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "bob should not be allowed to view the photo",
+   "principal": {
+    "type": "User",
+    "id": "bob"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  },
+  {
+   "desc": "alice should not be allowed to view an unrelated photo",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "passportscan.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  }
+ ]
 }
diff --git a/cedar-integration-tests/tests/example_use_cases_doc/2c.json b/cedar-integration-tests/tests/example_use_cases_doc/2c.json
index 54429f7c2..ef93b826c 100644
--- a/cedar-integration-tests/tests/example_use_cases_doc/2c.json
+++ b/cedar-integration-tests/tests/example_use_cases_doc/2c.json
@@ -1,64 +1,102 @@
 {
-    "policies": "tests/example_use_cases_doc/policies_2c.cedar",
-    "entities": "sample-data/sandbox_a/entities.json",
-    "schema": "sample-data/sandbox_a/schema.cedarschema.json",
-    "should_validate": true,
-    "queries": [
-        {
-            "desc": "alice should be allowed to edit the photo",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"edit\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "alice should not be allowed to delete the photo",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"delete\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        },
-        {
-            "desc": "bob should not be allowed to edit the photo",
-            "principal": "User::\"bob\"",
-            "action": "Action::\"edit\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        },
-        {
-            "desc": "alice should not be allowed to view an unrelated photo",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"passportscan.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        }
-    ]
+ "policies": "tests/example_use_cases_doc/policies_2c.cedar",
+ "entities": "sample-data/sandbox_a/entities.json",
+ "schema": "sample-data/sandbox_a/schema.cedarschema.json",
+ "should_validate": true,
+ "queries": [
+  {
+   "desc": "alice should be allowed to edit the photo",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "edit"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "alice should not be allowed to delete the photo",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "delete"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  },
+  {
+   "desc": "bob should not be allowed to edit the photo",
+   "principal": {
+    "type": "User",
+    "id": "bob"
+   },
+   "action": {
+    "type": "Action",
+    "id": "edit"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  },
+  {
+   "desc": "alice should not be allowed to view an unrelated photo",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "passportscan.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  }
+ ]
 }
diff --git a/cedar-integration-tests/tests/example_use_cases_doc/3a.json b/cedar-integration-tests/tests/example_use_cases_doc/3a.json
index 3a4a57673..81197573f 100644
--- a/cedar-integration-tests/tests/example_use_cases_doc/3a.json
+++ b/cedar-integration-tests/tests/example_use_cases_doc/3a.json
@@ -1,64 +1,106 @@
 {
-    "policies": "tests/example_use_cases_doc/policies_3a.cedar",
-    "entities": "sample-data/sandbox_a/entities.json",
-    "schema": "sample-data/sandbox_a/schema.cedarschema.json",
-    "should_validate": true,
-    "queries": [
-        {
-            "desc": "alice should be able to view the photo",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "bob should be able to view the photo",
-            "principal": "User::\"bob\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "ahmad should be able to view the photo",
-            "principal": "Administrator::\"ahmad\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "alice should not be allowed to view an unrelated photo",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"passportscan.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        }
-    ]
+ "policies": "tests/example_use_cases_doc/policies_3a.cedar",
+ "entities": "sample-data/sandbox_a/entities.json",
+ "schema": "sample-data/sandbox_a/schema.cedarschema.json",
+ "should_validate": true,
+ "queries": [
+  {
+   "desc": "alice should be able to view the photo",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "bob should be able to view the photo",
+   "principal": {
+    "type": "User",
+    "id": "bob"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "ahmad should be able to view the photo",
+   "principal": {
+    "type": "Administrator",
+    "id": "ahmad"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "alice should not be allowed to view an unrelated photo",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "passportscan.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  }
+ ]
 }
diff --git a/cedar-integration-tests/tests/example_use_cases_doc/3b.json b/cedar-integration-tests/tests/example_use_cases_doc/3b.json
index a4f9ff2a8..f94b07c06 100644
--- a/cedar-integration-tests/tests/example_use_cases_doc/3b.json
+++ b/cedar-integration-tests/tests/example_use_cases_doc/3b.json
@@ -1,64 +1,106 @@
 {
-    "policies": "tests/example_use_cases_doc/policies_3b.cedar",
-    "entities": "sample-data/sandbox_a/entities.json",
-    "schema": "sample-data/sandbox_a/schema.cedarschema.json",
-    "should_validate": true,
-    "queries": [
-        {
-            "desc": "alice should be able to view a photo in jane's account",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "alice should be able to list photos in an album in jane's account",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"listPhotos\"",
-            "resource": "Album::\"jane_vacation\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "alice should be able to list albums in jane's account",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"listAlbums\"",
-            "resource": "Account::\"jane\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "alice should not be able to view a photo in bob's account",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"selfie.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        }
-    ]
+ "policies": "tests/example_use_cases_doc/policies_3b.cedar",
+ "entities": "sample-data/sandbox_a/entities.json",
+ "schema": "sample-data/sandbox_a/schema.cedarschema.json",
+ "should_validate": true,
+ "queries": [
+  {
+   "desc": "alice should be able to view a photo in jane's account",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "alice should be able to list photos in an album in jane's account",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "listPhotos"
+   },
+   "resource": {
+    "type": "Album",
+    "id": "jane_vacation"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "alice should be able to list albums in jane's account",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "listAlbums"
+   },
+   "resource": {
+    "type": "Account",
+    "id": "jane"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "alice should not be able to view a photo in bob's account",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "selfie.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  }
+ ]
 }
diff --git a/cedar-integration-tests/tests/example_use_cases_doc/3c.json b/cedar-integration-tests/tests/example_use_cases_doc/3c.json
index ee87c48e4..e0ec06730 100644
--- a/cedar-integration-tests/tests/example_use_cases_doc/3c.json
+++ b/cedar-integration-tests/tests/example_use_cases_doc/3c.json
@@ -1,50 +1,83 @@
 {
-    "policies": "tests/example_use_cases_doc/policies_3c.cedar",
-    "entities": "sample-data/sandbox_a/entities.json",
-    "schema": "sample-data/sandbox_a/schema.cedarschema.json",
-    "should_validate": true,
-    "queries": [
-        {
-            "desc": "alice should be able to view a photo in the album",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "alice should be able to edit a photo in the album",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"edit\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "alice should be able to view a video in the album",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Video::\"surf.mp4\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        }
-    ]
+ "policies": "tests/example_use_cases_doc/policies_3c.cedar",
+ "entities": "sample-data/sandbox_a/entities.json",
+ "schema": "sample-data/sandbox_a/schema.cedarschema.json",
+ "should_validate": true,
+ "queries": [
+  {
+   "desc": "alice should be able to view a photo in the album",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "alice should be able to edit a photo in the album",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "edit"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "alice should be able to view a video in the album",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Video",
+    "id": "surf.mp4"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  }
+ ]
 }
diff --git a/cedar-integration-tests/tests/example_use_cases_doc/4a.json b/cedar-integration-tests/tests/example_use_cases_doc/4a.json
index 6b4a80ca6..86e5ec605 100644
--- a/cedar-integration-tests/tests/example_use_cases_doc/4a.json
+++ b/cedar-integration-tests/tests/example_use_cases_doc/4a.json
@@ -1,44 +1,73 @@
 {
-    "policies": "tests/example_use_cases_doc/policies_4a.cedar",
-    "entities": "sample-data/sandbox_b/entities.json",
-    "schema": "sample-data/sandbox_b/schema.cedarschema.json",
-    "should_validate": true,
-    "queries": [
-        {
-            "desc": "alice should be able to view the photo",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"prototype_v0.jpg\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "ahmad should not be allowed to view the photo",
-            "principal": "User::\"ahmad\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"prototype_v0.jpg\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        },
-        {
-            "desc": "stacey should not be allowed to view the photo",
-            "principal": "User::\"stacey\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"prototype_v0.jpg\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        }
-    ]
+ "policies": "tests/example_use_cases_doc/policies_4a.cedar",
+ "entities": "sample-data/sandbox_b/entities.json",
+ "schema": "sample-data/sandbox_b/schema.cedarschema.json",
+ "should_validate": true,
+ "queries": [
+  {
+   "desc": "alice should be able to view the photo",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "prototype_v0.jpg"
+   },
+   "context": {
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "ahmad should not be allowed to view the photo",
+   "principal": {
+    "type": "User",
+    "id": "ahmad"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "prototype_v0.jpg"
+   },
+   "context": {
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  },
+  {
+   "desc": "stacey should not be allowed to view the photo",
+   "principal": {
+    "type": "User",
+    "id": "stacey"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "prototype_v0.jpg"
+   },
+   "context": {
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  }
+ ]
 }
diff --git a/cedar-integration-tests/tests/example_use_cases_doc/4c.json b/cedar-integration-tests/tests/example_use_cases_doc/4c.json
index 002b5c639..27c224e6b 100644
--- a/cedar-integration-tests/tests/example_use_cases_doc/4c.json
+++ b/cedar-integration-tests/tests/example_use_cases_doc/4c.json
@@ -1,56 +1,96 @@
 {
-    "policies": "tests/example_use_cases_doc/policies_4c.cedar",
-    "entities": "sample-data/sandbox_b/entities.json",
-    "schema": "sample-data/sandbox_b/schema.cedarschema.json",
-    "should_validate": false,
-    "queries": [
-        {
-            "desc": "alice should be able to view any photo",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"prototype_v0.jpg\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "alice should not be allowed to edit any photo",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"edit\"",
-            "resource": "Photo::\"prototype_v0.jpg\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        },
-        {
-            "desc": "alice should be able to list photos in any album",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"listPhotos\"",
-            "resource": "Album::\"device_prototypes\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "alice should not be allowed to list albums in an account",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"listAlbums\"",
-            "resource": "Account::\"alice\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        }
-    ]
+ "policies": "tests/example_use_cases_doc/policies_4c.cedar",
+ "entities": "sample-data/sandbox_b/entities.json",
+ "schema": "sample-data/sandbox_b/schema.cedarschema.json",
+ "should_validate": false,
+ "queries": [
+  {
+   "desc": "alice should be able to view any photo",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "prototype_v0.jpg"
+   },
+   "context": {
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "alice should not be allowed to edit any photo",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "edit"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "prototype_v0.jpg"
+   },
+   "context": {
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  },
+  {
+   "desc": "alice should be able to list photos in any album",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "listPhotos"
+   },
+   "resource": {
+    "type": "Album",
+    "id": "device_prototypes"
+   },
+   "context": {
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "alice should not be allowed to list albums in an account",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "listAlbums"
+   },
+   "resource": {
+    "type": "Account",
+    "id": "alice"
+   },
+   "context": {
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  }
+ ]
 }
diff --git a/cedar-integration-tests/tests/example_use_cases_doc/4d.json b/cedar-integration-tests/tests/example_use_cases_doc/4d.json
index b5dd464d0..04e7500d9 100644
--- a/cedar-integration-tests/tests/example_use_cases_doc/4d.json
+++ b/cedar-integration-tests/tests/example_use_cases_doc/4d.json
@@ -1,44 +1,75 @@
 {
-    "policies": "tests/example_use_cases_doc/policies_4d.cedar",
-    "entities": "sample-data/sandbox_b/entities.json",
-    "schema": "sample-data/sandbox_b/schema.cedarschema.json",
-    "should_validate": true,
-    "queries": [
-        {
-            "desc": "alice should be able to view a photo in her account",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"vacation.jpg\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "alice should be able to edit a photo in her account",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"edit\"",
-            "resource": "Photo::\"alice_w2.jpg\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "alice should not be allowed to view a photo in someone else's account",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"prototype_v0.jpg\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        }
-    ]
+ "policies": "tests/example_use_cases_doc/policies_4d.cedar",
+ "entities": "sample-data/sandbox_b/entities.json",
+ "schema": "sample-data/sandbox_b/schema.cedarschema.json",
+ "should_validate": true,
+ "queries": [
+  {
+   "desc": "alice should be able to view a photo in her account",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "vacation.jpg"
+   },
+   "context": {
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "alice should be able to edit a photo in her account",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "edit"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "alice_w2.jpg"
+   },
+   "context": {
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "alice should not be allowed to view a photo in someone else's account",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "prototype_v0.jpg"
+   },
+   "context": {
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  }
+ ]
 }
diff --git a/cedar-integration-tests/tests/example_use_cases_doc/4e.json b/cedar-integration-tests/tests/example_use_cases_doc/4e.json
index 8e58a017a..5d39cd82e 100644
--- a/cedar-integration-tests/tests/example_use_cases_doc/4e.json
+++ b/cedar-integration-tests/tests/example_use_cases_doc/4e.json
@@ -1,56 +1,98 @@
 {
-    "policies": "tests/example_use_cases_doc/policies_4e.cedar",
-    "entities": "sample-data/sandbox_b/entities.json",
-    "schema": "sample-data/sandbox_b/schema.cedarschema.json",
-    "should_validate": true,
-    "queries": [
-        {
-            "desc": "alice should be able to view her own photo",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"vacation.jpg\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "alice should be able to view ahmad's photo",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"prototype_v0.jpg\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "ahmad should be able to view alice's photo",
-            "principal": "User::\"ahmad\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"vacation.jpg\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "stacey should not be able to view alice's photo",
-            "principal": "User::\"stacey\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"vacation.jpg\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        }
-    ]
+ "policies": "tests/example_use_cases_doc/policies_4e.cedar",
+ "entities": "sample-data/sandbox_b/entities.json",
+ "schema": "sample-data/sandbox_b/schema.cedarschema.json",
+ "should_validate": true,
+ "queries": [
+  {
+   "desc": "alice should be able to view her own photo",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "vacation.jpg"
+   },
+   "context": {
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "alice should be able to view ahmad's photo",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "prototype_v0.jpg"
+   },
+   "context": {
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "ahmad should be able to view alice's photo",
+   "principal": {
+    "type": "User",
+    "id": "ahmad"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "vacation.jpg"
+   },
+   "context": {
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "stacey should not be able to view alice's photo",
+   "principal": {
+    "type": "User",
+    "id": "stacey"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "vacation.jpg"
+   },
+   "context": {
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  }
+ ]
 }
diff --git a/cedar-integration-tests/tests/example_use_cases_doc/4f.json b/cedar-integration-tests/tests/example_use_cases_doc/4f.json
index afaf1070b..36c054589 100644
--- a/cedar-integration-tests/tests/example_use_cases_doc/4f.json
+++ b/cedar-integration-tests/tests/example_use_cases_doc/4f.json
@@ -1,44 +1,75 @@
 {
-    "policies": "tests/example_use_cases_doc/policies_4f.cedar",
-    "entities": "sample-data/sandbox_b/entities.json",
-    "schema": "sample-data/sandbox_b/schema.cedarschema.json",
-    "should_validate": true,
-    "queries": [
-        {
-            "desc": "alice should be able to view her own photo",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"vacation.jpg\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "alice should not be able to view a photo in stacey's account",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"sales_projections.jpg\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        },
-        {
-            "desc": "giuseppe should be able to view the photo since he is an admin on it",
-            "principal": "User::\"giuseppe\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"sales_projections.jpg\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        }
-    ]
+ "policies": "tests/example_use_cases_doc/policies_4f.cedar",
+ "entities": "sample-data/sandbox_b/entities.json",
+ "schema": "sample-data/sandbox_b/schema.cedarschema.json",
+ "should_validate": true,
+ "queries": [
+  {
+   "desc": "alice should be able to view her own photo",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "vacation.jpg"
+   },
+   "context": {
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "alice should not be able to view a photo in stacey's account",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "sales_projections.jpg"
+   },
+   "context": {
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  },
+  {
+   "desc": "giuseppe should be able to view the photo since he is an admin on it",
+   "principal": {
+    "type": "User",
+    "id": "giuseppe"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "sales_projections.jpg"
+   },
+   "context": {
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  }
+ ]
 }
diff --git a/cedar-integration-tests/tests/example_use_cases_doc/5b.json b/cedar-integration-tests/tests/example_use_cases_doc/5b.json
index 268f75872..34f423584 100644
--- a/cedar-integration-tests/tests/example_use_cases_doc/5b.json
+++ b/cedar-integration-tests/tests/example_use_cases_doc/5b.json
@@ -1,112 +1,214 @@
 {
-    "policies": "tests/example_use_cases_doc/policies_5b.cedar",
-    "entities": "sample-data/sandbox_b/entities.json",
-    "schema": "sample-data/sandbox_b/schema.cedarschema.json",
-    "should_validate": true,
-    "queries": [
-        {
-            "desc": "ahmad should be able upload a 1MB PNG",
-            "principal": "User::\"ahmad\"",
-            "action": "Action::\"addPhoto\"",
-            "resource": "Album::\"alice_vacation\"",
-            "context": {
-                "authenticated": true,
-                "photo": { "filetype": "PNG", "filesize_mb": 1 }
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "ahmad should not be able to upload a 2MB PNG",
-            "principal": "User::\"ahmad\"",
-            "action": "Action::\"addPhoto\"",
-            "resource": "Album::\"alice_vacation\"",
-            "context": {
-                "authenticated": true,
-                "photo": { "filetype": "PNG", "filesize_mb": 2 }
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        },
-        {
-            "desc": "ahmad should not be able to upload a 1MB GIF",
-            "principal": "User::\"ahmad\"",
-            "action": "Action::\"addPhoto\"",
-            "resource": "Album::\"alice_vacation\"",
-            "context": {
-                "authenticated": true,
-                "photo": { "filetype": "GIF", "filesize_mb": 1 }
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        },
-        {
-            "desc": "ahmad should not be able to upload an 80MB RAW",
-            "principal": "User::\"ahmad\"",
-            "action": "Action::\"addPhoto\"",
-            "resource": "Album::\"alice_vacation\"",
-            "context": {
-                "authenticated": true,
-                "photo": { "filetype": "RAW", "filesize_mb": 80 }
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        },
-        {
-            "desc": "giuseppe should be able upload a 1MB PNG",
-            "principal": "User::\"giuseppe\"",
-            "action": "Action::\"addPhoto\"",
-            "resource": "Album::\"alice_vacation\"",
-            "context": {
-                "authenticated": true,
-                "photo": { "filetype": "PNG", "filesize_mb": 1 }
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "giuseppe should not be able to upload a 2MB PNG",
-            "principal": "User::\"giuseppe\"",
-            "action": "Action::\"addPhoto\"",
-            "resource": "Album::\"alice_vacation\"",
-            "context": {
-                "authenticated": true,
-                "photo": { "filetype": "PNG", "filesize_mb": 2 }
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        },
-        {
-            "desc": "giuseppe should not be able to upload a 1MB GIF",
-            "principal": "User::\"giuseppe\"",
-            "action": "Action::\"addPhoto\"",
-            "resource": "Album::\"alice_vacation\"",
-            "context": {
-                "authenticated": true,
-                "photo": { "filetype": "GIF", "filesize_mb": 1 }
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        },
-        {
-            "desc": "giuseppe should be able to upload an 80MB RAW",
-            "principal": "User::\"giuseppe\"",
-            "action": "Action::\"addPhoto\"",
-            "resource": "Album::\"alice_vacation\"",
-            "context": {
-                "authenticated": true,
-                "photo": { "filetype": "RAW", "filesize_mb": 80 }
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        }
-    ]
+ "policies": "tests/example_use_cases_doc/policies_5b.cedar",
+ "entities": "sample-data/sandbox_b/entities.json",
+ "schema": "sample-data/sandbox_b/schema.cedarschema.json",
+ "should_validate": true,
+ "queries": [
+  {
+   "desc": "ahmad should be able upload a 1MB PNG",
+   "principal": {
+    "type": "User",
+    "id": "ahmad"
+   },
+   "action": {
+    "type": "Action",
+    "id": "addPhoto"
+   },
+   "resource": {
+    "type": "Album",
+    "id": "alice_vacation"
+   },
+   "context": {
+    "authenticated": true,
+    "photo": {
+     "filetype": "PNG",
+     "filesize_mb": 1
+    }
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "ahmad should not be able to upload a 2MB PNG",
+   "principal": {
+    "type": "User",
+    "id": "ahmad"
+   },
+   "action": {
+    "type": "Action",
+    "id": "addPhoto"
+   },
+   "resource": {
+    "type": "Album",
+    "id": "alice_vacation"
+   },
+   "context": {
+    "authenticated": true,
+    "photo": {
+     "filetype": "PNG",
+     "filesize_mb": 2
+    }
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  },
+  {
+   "desc": "ahmad should not be able to upload a 1MB GIF",
+   "principal": {
+    "type": "User",
+    "id": "ahmad"
+   },
+   "action": {
+    "type": "Action",
+    "id": "addPhoto"
+   },
+   "resource": {
+    "type": "Album",
+    "id": "alice_vacation"
+   },
+   "context": {
+    "authenticated": true,
+    "photo": {
+     "filetype": "GIF",
+     "filesize_mb": 1
+    }
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  },
+  {
+   "desc": "ahmad should not be able to upload an 80MB RAW",
+   "principal": {
+    "type": "User",
+    "id": "ahmad"
+   },
+   "action": {
+    "type": "Action",
+    "id": "addPhoto"
+   },
+   "resource": {
+    "type": "Album",
+    "id": "alice_vacation"
+   },
+   "context": {
+    "authenticated": true,
+    "photo": {
+     "filetype": "RAW",
+     "filesize_mb": 80
+    }
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  },
+  {
+   "desc": "giuseppe should be able upload a 1MB PNG",
+   "principal": {
+    "type": "User",
+    "id": "giuseppe"
+   },
+   "action": {
+    "type": "Action",
+    "id": "addPhoto"
+   },
+   "resource": {
+    "type": "Album",
+    "id": "alice_vacation"
+   },
+   "context": {
+    "authenticated": true,
+    "photo": {
+     "filetype": "PNG",
+     "filesize_mb": 1
+    }
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "giuseppe should not be able to upload a 2MB PNG",
+   "principal": {
+    "type": "User",
+    "id": "giuseppe"
+   },
+   "action": {
+    "type": "Action",
+    "id": "addPhoto"
+   },
+   "resource": {
+    "type": "Album",
+    "id": "alice_vacation"
+   },
+   "context": {
+    "authenticated": true,
+    "photo": {
+     "filetype": "PNG",
+     "filesize_mb": 2
+    }
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  },
+  {
+   "desc": "giuseppe should not be able to upload a 1MB GIF",
+   "principal": {
+    "type": "User",
+    "id": "giuseppe"
+   },
+   "action": {
+    "type": "Action",
+    "id": "addPhoto"
+   },
+   "resource": {
+    "type": "Album",
+    "id": "alice_vacation"
+   },
+   "context": {
+    "authenticated": true,
+    "photo": {
+     "filetype": "GIF",
+     "filesize_mb": 1
+    }
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  },
+  {
+   "desc": "giuseppe should be able to upload an 80MB RAW",
+   "principal": {
+    "type": "User",
+    "id": "giuseppe"
+   },
+   "action": {
+    "type": "Action",
+    "id": "addPhoto"
+   },
+   "resource": {
+    "type": "Album",
+    "id": "alice_vacation"
+   },
+   "context": {
+    "authenticated": true,
+    "photo": {
+     "filetype": "RAW",
+     "filesize_mb": 80
+    }
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  }
+ ]
 }
diff --git a/cedar-integration-tests/tests/ip/1.json b/cedar-integration-tests/tests/ip/1.json
index 3186e4e9b..c33a0c005 100644
--- a/cedar-integration-tests/tests/ip/1.json
+++ b/cedar-integration-tests/tests/ip/1.json
@@ -1,36 +1,66 @@
 {
-    "policies": "tests/ip/policies_1.cedar",
-    "entities": "sample-data/sandbox_a/entities.json",
-    "schema": "sample-data/sandbox_a/schema.cedarschema.json",
-    "should_validate": true,
-    "queries": [
-        {
-            "desc": "alice should be able to view the photo when coming from 222.222.222.222",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": {"__extn" : {"fn": "ip", "arg": "222.222.222.222"} },
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "alice should not be allowed to view the photo when coming from 222.222.222.111",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": {"__extn" : {"fn": "ip", "arg": "222.222.222.111"} },
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        }
-    ]
+ "policies": "tests/ip/policies_1.cedar",
+ "entities": "sample-data/sandbox_a/entities.json",
+ "schema": "sample-data/sandbox_a/schema.cedarschema.json",
+ "should_validate": true,
+ "queries": [
+  {
+   "desc": "alice should be able to view the photo when coming from 222.222.222.222",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": {
+     "__extn": {
+      "fn": "ip",
+      "arg": "222.222.222.222"
+     }
+    },
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "alice should not be allowed to view the photo when coming from 222.222.222.111",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": {
+     "__extn": {
+      "fn": "ip",
+      "arg": "222.222.222.111"
+     }
+    },
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  }
+ ]
 }
diff --git a/cedar-integration-tests/tests/ip/2.json b/cedar-integration-tests/tests/ip/2.json
index 059314c04..19c4192cd 100644
--- a/cedar-integration-tests/tests/ip/2.json
+++ b/cedar-integration-tests/tests/ip/2.json
@@ -1,64 +1,122 @@
 {
-    "policies": "tests/ip/policies_2.cedar",
-    "entities": "sample-data/sandbox_a/entities.json",
-    "schema": "sample-data/sandbox_a/schema.cedarschema.json",
-    "should_validate": true,
-    "queries": [
-        {
-            "desc": "alice should be able to view the photo when coming from 222.222.222.222",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": {"__extn" : {"fn": "ip", "arg": "222.222.222.222"} },
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "alice should not be allowed to view the photo when coming from a loopback address, 127.0.0.100",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": {"__extn" : {"fn": "ip", "arg": "127.0.0.100"} },
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        },
-        {
-            "desc": "alice should not be allowed to view the photo when coming from a loopback address, ::1",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": {"__extn" : {"fn": "ip", "arg": "::1"} },
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        },
-        {
-            "desc": "alice should not be allowed to view the photo when coming from a multicast address",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": {"__extn" : {"fn": "ip", "arg": "228.222.222.222"} },
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        }
-    ]
+ "policies": "tests/ip/policies_2.cedar",
+ "entities": "sample-data/sandbox_a/entities.json",
+ "schema": "sample-data/sandbox_a/schema.cedarschema.json",
+ "should_validate": true,
+ "queries": [
+  {
+   "desc": "alice should be able to view the photo when coming from 222.222.222.222",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": {
+     "__extn": {
+      "fn": "ip",
+      "arg": "222.222.222.222"
+     }
+    },
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "alice should not be allowed to view the photo when coming from a loopback address, 127.0.0.100",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": {
+     "__extn": {
+      "fn": "ip",
+      "arg": "127.0.0.100"
+     }
+    },
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  },
+  {
+   "desc": "alice should not be allowed to view the photo when coming from a loopback address, ::1",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": {
+     "__extn": {
+      "fn": "ip",
+      "arg": "::1"
+     }
+    },
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  },
+  {
+   "desc": "alice should not be allowed to view the photo when coming from a multicast address",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": {
+     "__extn": {
+      "fn": "ip",
+      "arg": "228.222.222.222"
+     }
+    },
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  }
+ ]
 }
diff --git a/cedar-integration-tests/tests/ip/3.json b/cedar-integration-tests/tests/ip/3.json
index e5c42d70d..1cea56eea 100644
--- a/cedar-integration-tests/tests/ip/3.json
+++ b/cedar-integration-tests/tests/ip/3.json
@@ -1,36 +1,66 @@
 {
-    "policies": "tests/ip/policies_3.cedar",
-    "entities": "sample-data/sandbox_a/entities.json",
-    "schema": "sample-data/sandbox_a/schema.cedarschema.json",
-    "should_validate": true,
-    "queries": [
-        {
-            "desc": "alice should be able to view the photo when coming from 222.222.222.222",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": {"__extn" : {"fn": "ip", "arg": "222.222.222.222"} },
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "alice should not be allowed to view the photo when coming from 222.222.111.0",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": {"__extn" : {"fn": "ip", "arg": "222.222.111.0"} },
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        }
-    ]
+ "policies": "tests/ip/policies_3.cedar",
+ "entities": "sample-data/sandbox_a/entities.json",
+ "schema": "sample-data/sandbox_a/schema.cedarschema.json",
+ "should_validate": true,
+ "queries": [
+  {
+   "desc": "alice should be able to view the photo when coming from 222.222.222.222",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": {
+     "__extn": {
+      "fn": "ip",
+      "arg": "222.222.222.222"
+     }
+    },
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "alice should not be allowed to view the photo when coming from 222.222.111.0",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": {
+     "__extn": {
+      "fn": "ip",
+      "arg": "222.222.111.0"
+     }
+    },
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  }
+ ]
 }
diff --git a/cedar-integration-tests/tests/multi/1.json b/cedar-integration-tests/tests/multi/1.json
index 6fffc79c9..19f1e8bed 100644
--- a/cedar-integration-tests/tests/multi/1.json
+++ b/cedar-integration-tests/tests/multi/1.json
@@ -1,64 +1,104 @@
 {
-    "policies": "tests/multi/policies_1.cedar",
-    "entities": "sample-data/sandbox_a/entities.json",
-    "schema": "sample-data/sandbox_a/schema.cedarschema.json",
-    "should_validate": true,
-    "queries": [
-        {
-            "desc": "alice should be able to view photos in the album",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "bob should be able to edit photos in his own account",
-            "principal": "User::\"bob\"",
-            "action": "Action::\"edit\"",
-            "resource": "Photo::\"selfie.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy1"],
-            "errors": []
-        },
-        {
-            "desc": "alice should not be able to edit photos in bob's account",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"edit\"",
-            "resource": "Photo::\"selfie.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        },
-        {
-            "desc": "bob should not be able to view photos in jane's album",
-            "principal": "User::\"bob\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        }
-    ]
+ "policies": "tests/multi/policies_1.cedar",
+ "entities": "sample-data/sandbox_a/entities.json",
+ "schema": "sample-data/sandbox_a/schema.cedarschema.json",
+ "should_validate": true,
+ "queries": [
+  {
+   "desc": "alice should be able to view photos in the album",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "bob should be able to edit photos in his own account",
+   "principal": {
+    "type": "User",
+    "id": "bob"
+   },
+   "action": {
+    "type": "Action",
+    "id": "edit"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "selfie.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy1"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "alice should not be able to edit photos in bob's account",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "edit"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "selfie.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  },
+  {
+   "desc": "bob should not be able to view photos in jane's album",
+   "principal": {
+    "type": "User",
+    "id": "bob"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [],
+   "errors": []
+  }
+ ]
 }
diff --git a/cedar-integration-tests/tests/multi/2.json b/cedar-integration-tests/tests/multi/2.json
index b0ec5aeea..69c31f2ea 100644
--- a/cedar-integration-tests/tests/multi/2.json
+++ b/cedar-integration-tests/tests/multi/2.json
@@ -1,36 +1,58 @@
 {
-    "policies": "tests/multi/policies_2.cedar",
-    "entities": "sample-data/sandbox_a/entities.json",
-    "schema": "sample-data/sandbox_a/schema.cedarschema.json",
-    "should_validate": true,
-    "queries": [
-        {
-            "desc": "alice should be able to view the photo",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "bob should not be allowed to view the photo",
-            "principal": "User::\"bob\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"VacationPhoto94.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": ["policy1"],
-            "errors": []
-        }
-    ]
+ "policies": "tests/multi/policies_2.cedar",
+ "entities": "sample-data/sandbox_a/entities.json",
+ "schema": "sample-data/sandbox_a/schema.cedarschema.json",
+ "should_validate": true,
+ "queries": [
+  {
+   "desc": "alice should be able to view the photo",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "bob should not be allowed to view the photo",
+   "principal": {
+    "type": "User",
+    "id": "bob"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [
+    "policy1"
+   ],
+   "errors": []
+  }
+ ]
 }
diff --git a/cedar-integration-tests/tests/multi/3.json b/cedar-integration-tests/tests/multi/3.json
index 055fd52c1..44b2ff7a9 100644
--- a/cedar-integration-tests/tests/multi/3.json
+++ b/cedar-integration-tests/tests/multi/3.json
@@ -1,64 +1,108 @@
 {
-    "policies": "tests/multi/policies_3.cedar",
-    "entities": "sample-data/sandbox_b/entities.json",
-    "schema": "sample-data/sandbox_b/schema_exts.cedarschema.json",
-    "should_validate": true,
-    "queries": [
-        {
-            "desc": "alice should be able to view the vacation photo",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"vacation.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "alice should be able to view the W2 photo",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"alice_w2.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "stacey should be allowed to view the vacation photo",
-            "principal": "User::\"stacey\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"vacation.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "stacey should not be allowed to view the W2 photo",
-            "principal": "User::\"stacey\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"alice_w2.jpg\"",
-            "context": {
-                "source_ip": "123.123.123.123",
-                "confidence_score": "0.6",
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": ["policy1"],
-            "errors": []
-        }
-    ]
+ "policies": "tests/multi/policies_3.cedar",
+ "entities": "sample-data/sandbox_b/entities.json",
+ "schema": "sample-data/sandbox_b/schema_exts.cedarschema.json",
+ "should_validate": true,
+ "queries": [
+  {
+   "desc": "alice should be able to view the vacation photo",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "vacation.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "alice should be able to view the W2 photo",
+   "principal": {
+    "type": "User",
+    "id": "alice"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "alice_w2.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "stacey should be allowed to view the vacation photo",
+   "principal": {
+    "type": "User",
+    "id": "stacey"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "vacation.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "stacey should not be allowed to view the W2 photo",
+   "principal": {
+    "type": "User",
+    "id": "stacey"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "alice_w2.jpg"
+   },
+   "context": {
+    "source_ip": "123.123.123.123",
+    "confidence_score": "0.6",
+    "authenticated": true
+   },
+   "decision": "Deny",
+   "reasons": [
+    "policy1"
+   ],
+   "errors": []
+  }
+ ]
 }
diff --git a/cedar-integration-tests/tests/multi/4.json b/cedar-integration-tests/tests/multi/4.json
index 672d59ec8..203ded2db 100644
--- a/cedar-integration-tests/tests/multi/4.json
+++ b/cedar-integration-tests/tests/multi/4.json
@@ -1,44 +1,79 @@
 {
-    "policies": "tests/multi/policies_4.cedar",
-    "entities": "sample-data/sandbox_b/entities.json",
-    "schema": "sample-data/sandbox_b/schema.cedarschema.json",
-    "should_validate": true,
-    "queries": [
-        {
-            "desc": "stacey should be able to view this photo for multiple reasons",
-            "principal": "User::\"stacey\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"vacation.jpg\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0", "policy1"],
-            "errors": []
-        },
-        {
-            "desc": "stacey shouldn't be able to view this photo due to multiple explicit Forbids",
-            "principal": "User::\"stacey\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"alice_w2.jpg\"",
-            "context": {
-                "authenticated": false
-            },
-            "decision": "Deny",
-            "reasons": ["policy2", "policy3"],
-            "errors": []
-        },
-        {
-            "desc": "one explicit Forbid can override multiple Permits",
-            "principal": "User::\"stacey\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"vacation.jpg\"",
-            "context": {
-                "authenticated": false
-            },
-            "decision": "Deny",
-            "reasons": ["policy3"],
-            "errors": []
-        }
-    ]
+ "policies": "tests/multi/policies_4.cedar",
+ "entities": "sample-data/sandbox_b/entities.json",
+ "schema": "sample-data/sandbox_b/schema.cedarschema.json",
+ "should_validate": true,
+ "queries": [
+  {
+   "desc": "stacey should be able to view this photo for multiple reasons",
+   "principal": {
+    "type": "User",
+    "id": "stacey"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "vacation.jpg"
+   },
+   "context": {
+    "authenticated": true
+   },
+   "decision": "Allow",
+   "reasons": [
+    "policy0",
+    "policy1"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "stacey shouldn't be able to view this photo due to multiple explicit Forbids",
+   "principal": {
+    "type": "User",
+    "id": "stacey"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "alice_w2.jpg"
+   },
+   "context": {
+    "authenticated": false
+   },
+   "decision": "Deny",
+   "reasons": [
+    "policy2",
+    "policy3"
+   ],
+   "errors": []
+  },
+  {
+   "desc": "one explicit Forbid can override multiple Permits",
+   "principal": {
+    "type": "User",
+    "id": "stacey"
+   },
+   "action": {
+    "type": "Action",
+    "id": "view"
+   },
+   "resource": {
+    "type": "Photo",
+    "id": "vacation.jpg"
+   },
+   "context": {
+    "authenticated": false
+   },
+   "decision": "Deny",
+   "reasons": [
+    "policy3"
+   ],
+   "errors": []
+  }
+ ]
 }
diff --git a/cedar-integration-tests/tests/multi/5.json b/cedar-integration-tests/tests/multi/5.json
index 84d8eb071..3a7dd2f04 100644
--- a/cedar-integration-tests/tests/multi/5.json
+++ b/cedar-integration-tests/tests/multi/5.json
@@ -1,77 +1,138 @@
 {
-    "policies": "tests/multi/policies_5.cedar",
-    "entities": "sample-data/sandbox_b/entities.json",
-    "schema": "sample-data/sandbox_b/schema.cedarschema.json",
-    "should_validate": true,
-    "queries": [
-        {
-            "desc": "stacey should be able to view photos in alice_vacation",
-            "principal": "User::\"stacey\"",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"vacation.jpg\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy0"],
-            "errors": []
-        },
-        {
-            "desc": "an unspecified user should not be able to view photos in alice_vacation",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"vacation.jpg\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": ["error occurred while evaluating policy `policy0`: cannot access attribute `department` of unspecified entity", "error occurred while evaluating policy `policy2`: cannot access attribute `jobLevel` of unspecified entity"]
-        },
-        {
-            "desc": "a request with unspecified entities should be implicitly denied",
-            "principal": "User::\"alice\"",
-            "action": "Action::\"comment\"",
-            "resource": "Photo::\"photo_2.jpg\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Deny",
-            "reasons": [],
-            "errors": []
-        },
-        {
-            "desc": "a request with unspecified entities and an unauthenticated context should be denied with a reason",
-            "action": "Action::\"view\"",
-            "resource": "Photo::\"photo_2.jpg\"",
-            "context": {
-                "authenticated": false
-            },
-            "decision": "Deny",
-            "reasons": ["policy1"],
-            "errors": ["error occurred while evaluating policy `policy2`: cannot access attribute `jobLevel` of unspecified entity"]
-        },
-        {
-            "desc": "giuseppe should be able to read any file",
-            "action": "Action::\"view\"",
-            "principal": "User::\"giuseppe\"",
-            "resource": "Photo::\"sales_projections.jpg\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy2"],
-            "errors": []
-        },
-        {
-            "desc": "giuseppe should be able to read an unspecified file",
-            "action": "Action::\"view\"",
-            "principal": "User::\"giuseppe\"",
-            "context": {
-                "authenticated": true
-            },
-            "decision": "Allow",
-            "reasons": ["policy2"],
-            "errors": []
-        }
-    ]
-}
+  "schema": "sample-data/sandbox_b/schema.cedarschema.json",
+  "policies": "tests/multi/policies_5.cedar",
+  "should_validate": true,
+  "entities": "sample-data/sandbox_b/entities.json",
+  "queries": [
+    {
+      "desc": "stacey should be able to view photos in alice_vacation",
+      "principal": {
+        "type": "User",
+        "id": "stacey"
+      },
+      "resource": {
+        "type": "Photo",
+        "id": "vacation.jpg"
+      },
+      "action": {
+        "type": "Action",
+        "id": "view"
+      },
+      "context": {
+        "authenticated": true
+      },
+      "decision": "Allow",
+      "reasons": [
+        "policy0"
+      ],
+      "errors": []
+    },
+    {
+      "desc": "an unspecified user should not be able to view photos in alice_vacation",
+      "principal": null,
+      "resource": {
+        "type": "Photo",
+        "id": "vacation.jpg"
+      },
+      "action": {
+        "type": "Action",
+        "id": "view"
+      },
+      "context": {
+        "authenticated": true
+      },
+      "decision": "Deny",
+      "reasons": [],
+      "errors": [
+        "error occurred while evaluating policy `policy0`: cannot access attribute `department` of unspecified entity",
+        "error occurred while evaluating policy `policy2`: cannot access attribute `jobLevel` of unspecified entity"
+      ]
+    },
+    {
+      "desc": "a request with unspecified entities should be implicitly denied",
+      "principal": {
+        "type": "User",
+        "id": "alice"
+      },
+      "resource": {
+        "type": "Photo",
+        "id": "photo_2.jpg"
+      },
+      "action": {
+        "type": "Action",
+        "id": "comment"
+      },
+      "context": {
+        "authenticated": true
+      },
+      "decision": "Deny",
+      "reasons": [],
+      "errors": []
+    },
+    {
+      "desc": "a request with unspecified entities and an unauthenticated context should be denied with a reason",
+      "principal": null,
+      "resource": {
+        "type": "Photo",
+        "id": "photo_2.jpg"
+      },
+      "action": {
+        "type": "Action",
+        "id": "view"
+      },
+      "context": {
+        "authenticated": false
+      },
+      "decision": "Deny",
+      "reasons": [
+        "policy1"
+      ],
+      "errors": [
+        "error occurred while evaluating policy `policy2`: cannot access attribute `jobLevel` of unspecified entity"
+      ]
+    },
+    {
+      "desc": "giuseppe should be able to read any file",
+      "principal": {
+        "type": "User",
+        "id": "giuseppe"
+      },
+      "resource": {
+        "type": "Photo",
+        "id": "sales_projections.jpg"
+      },
+      "action": {
+        "type": "Action",
+        "id": "view"
+      },
+      "context": {
+        "authenticated": true
+      },
+      "decision": "Allow",
+      "reasons": [
+        "policy2"
+      ],
+      "errors": []
+    },
+    {
+      "desc": "giuseppe should be able to read an unspecified file",
+      "principal": {
+        "type": "User",
+        "id": "giuseppe"
+      },
+      "resource": null,
+      "action": {
+        "type": "Action",
+        "id": "view"
+      },
+      "context": {
+        "authenticated": true
+      },
+      "decision": "Allow",
+      "reasons": [
+        "policy2"
+      ],
+      "errors": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/cedar-policy-core/src/entities.rs b/cedar-policy-core/src/entities.rs
index a79a9925a..a03d90a5e 100644
--- a/cedar-policy-core/src/entities.rs
+++ b/cedar-policy-core/src/entities.rs
@@ -485,16 +485,50 @@ pub enum TCComputation {
 #[allow(clippy::panic)]
 #[cfg(test)]
 mod json_parsing_tests {
+
     use super::*;
     use crate::{extensions::Extensions, transitive_closure::TcError};
     use cool_asserts::assert_matches;
 
+    #[test]
+    fn simple_json_parse1() {
+        let v = serde_json::json!(
+            [
+                {
+                    "uid" : { "type" : "A", "id" : "b"},
+                    "attrs" : {},
+                    "parents" : [ { "type" : "A", "id" : "c" }]
+                }
+            ]
+        );
+        let parser: EntityJsonParser<'_> =
+            EntityJsonParser::new(None, Extensions::all_available(), TCComputation::ComputeNow);
+        parser.from_json_value(v).unwrap();
+    }
+
     #[test]
     fn enforces_tc_fail_cycle_almost() {
         let parser: EntityJsonParser<'_> =
             EntityJsonParser::new(None, Extensions::all_available(), TCComputation::ComputeNow);
         let new = serde_json::json!([
-            {"uid":{"__expr":"Test::\"george\""}, "attrs" : { "foo" : 3 }, "parents" : ["Test::\"george\"", "Test::\"janet\""]}]);
+            {
+                "uid" : {
+                    "type" : "Test",
+                    "id" : "george"
+                },
+                "attrs" : { "foo" : 3},
+                "parents" : [
+                    {
+                        "type" : "Test",
+                        "id" : "george"
+                    },
+                    {
+                        "type" : "Test",
+                        "id" : "janet"
+                    }
+                ]
+            }
+        ]);
 
         let stream = parser
             .iter_from_json_value(new)
@@ -523,7 +557,20 @@ mod json_parsing_tests {
         let parser: EntityJsonParser<'_> =
             EntityJsonParser::new(None, Extensions::all_available(), TCComputation::ComputeNow);
         let new = serde_json::json!([
-            {"uid":{"__expr":"Test::\"george\""}, "attrs" : { "foo" : 3 }, "parents" : ["Test::\"henry\""]}]);
+            {
+                "uid" : {
+                    "type" : "Test",
+                    "id" : "george"
+                },
+                "attrs" : { "foo" : 3 },
+                "parents" : [
+                    {
+                        "type" : "Test",
+                        "id" : "henry"
+                    }
+                ]
+            }
+        ]);
 
         let stream = parser
             .iter_from_json_value(new)
@@ -551,7 +598,20 @@ mod json_parsing_tests {
         let parser: EntityJsonParser<'_> =
             EntityJsonParser::new(None, Extensions::all_available(), TCComputation::ComputeNow);
         let new = serde_json::json!([
-            {"uid":{"__expr":"Test::\"jeff\""}, "attrs" : { "foo" : 3 }, "parents" : ["Test::\"alice\""]}]);
+            {
+                "uid" : {
+                    "type" : "Test",
+                    "id" : "jeff",
+                },
+                "attrs" : { "foo" : 3 },
+                "parents" : [
+                    {
+                        "type" : "Test",
+                        "id" : "alice"
+                    }
+                ]
+            }
+        ]);
 
         let stream = parser
             .iter_from_json_value(new)
@@ -579,7 +639,24 @@ mod json_parsing_tests {
         let parser: EntityJsonParser<'_> =
             EntityJsonParser::new(None, Extensions::all_available(), TCComputation::ComputeNow);
         let new = serde_json::json!([
-            {"uid":{"__expr":"Test::\"jeff\""}, "attrs" : { "foo" : 3 }, "parents" : ["Test::\"alice\"", "Test::\"bob\""]}]);
+            {
+                "uid" : {
+                    "type" : "Test",
+                    "id" : "jeff"
+                },
+                "attrs" : { "foo" : 3 },
+                "parents" : [
+                    {
+                        "type" : "Test",
+                        "id" : "alice"
+                    },
+                    {
+                        "type" : "Test",
+                        "id" : "bob"
+                    }
+                ]
+            }
+        ]);
 
         let stream = parser
             .iter_from_json_value(new)
@@ -603,7 +680,20 @@ mod json_parsing_tests {
         let parser: EntityJsonParser<'_> =
             EntityJsonParser::new(None, Extensions::all_available(), TCComputation::ComputeNow);
         let new = serde_json::json!([
-            {"uid":{"__expr":"Test::\"george\""}, "attrs" : { "foo" : 3 }, "parents" : ["Test::\"henry\""] }]);
+            {
+                "uid" : {
+                    "type" : "Test",
+                    "id" : "george"
+                },
+                "attrs" : { "foo" : 3},
+                "parents" : [
+                    {
+                        "type" : "Test",
+                        "id" : "henry"
+                    }
+                ]
+            }
+        ]);
 
         let stream = parser
             .iter_from_json_value(new)
@@ -625,7 +715,22 @@ mod json_parsing_tests {
         let parser: EntityJsonParser<'_> =
             EntityJsonParser::new(None, Extensions::all_available(), TCComputation::ComputeNow);
         let new = serde_json::json!([
-            {"uid":{"__expr":"Test::\"jeff\""}, "attrs" : { "foo" : 3 }, "parents" : ["Test::\"alice\""]}]);
+            {
+                "uid" : {
+                    "type" : "Test",
+                    "id" : "jeff"
+                },
+                "attrs" : {
+                    "foo" : 3
+                },
+                "parents" : [
+                    {
+                        "type" : "Test",
+                        "id" : "alice"
+                    }
+                ]
+            }
+        ]);
 
         let stream = parser
             .iter_from_json_value(new)
@@ -646,7 +751,22 @@ mod json_parsing_tests {
         let parser: EntityJsonParser<'_> =
             EntityJsonParser::new(None, Extensions::all_available(), TCComputation::ComputeNow);
         let new = serde_json::json!([
-            {"uid":{"__expr":"Test::\"jeff\""}, "attrs" : { "foo" : 3 }, "parents" : ["Test::\"susan\""]}]);
+            {
+                "uid" : {
+                    "type" : "Test",
+                    "id" : "jeff"
+                },
+                "attrs" : {
+                    "foo" : 3
+                },
+                "parents" : [
+                    {
+                        "type" : "Test",
+                        "id" : "susan"
+                    }
+                ]
+            }
+        ]);
 
         let stream = parser
             .iter_from_json_value(new)
@@ -669,8 +789,8 @@ mod json_parsing_tests {
         let parser: EntityJsonParser<'_> =
             EntityJsonParser::new(None, Extensions::all_available(), TCComputation::ComputeNow);
         let new = serde_json::json!([
-            {"uid":{"__expr":"Test::\"jeff\""}, "attrs" : {}, "parents" : []},
-            {"uid":{"__expr":"Test::\"jeff\""}, "attrs" : {}, "parents" : []}]);
+            {"uid":{ "type" : "Test", "id" : "jeff" }, "attrs" : {}, "parents" : []},
+            {"uid":{ "type" : "Test", "id" : "jeff" }, "attrs" : {}, "parents" : []}]);
 
         let stream = parser
             .iter_from_json_value(new)
@@ -693,8 +813,7 @@ mod json_parsing_tests {
     fn add_duplicates_fail1() {
         let parser: EntityJsonParser<'_> =
             EntityJsonParser::new(None, Extensions::all_available(), TCComputation::ComputeNow);
-        let new =
-            serde_json::json!([{"uid":{"__expr":"Test::\"alice\""}, "attrs" : {}, "parents" : []}]);
+        let new = serde_json::json!([{"uid": { "type" : "Test", "id" : "alice"}, "attrs" : {}, "parents" : []}]);
         let stream = parser
             .iter_from_json_value(new)
             .unwrap()
@@ -712,26 +831,43 @@ mod json_parsing_tests {
         }
     }
 
+    #[test]
+    fn simple_entities_correct() {
+        let parser: EntityJsonParser<'_> =
+            EntityJsonParser::new(None, Extensions::all_available(), TCComputation::ComputeNow);
+        simple_entities(&parser);
+    }
+
     fn simple_entities(parser: &EntityJsonParser<'_>) -> Entities {
         let json = serde_json::json!(
             [
                 {
-                    "uid" : { "__expr" : "Test::\"alice\"" },
+                    "uid" : { "type" : "Test", "id": "alice" },
                     "attrs" : { "bar" : 2},
-                    "parents" : ["Test::\"bob\""]
+                    "parents" : [
+                        {
+                            "type" : "Test",
+                            "id" : "bob"
+                        }
+                    ]
                 },
                 {
-                    "uid" : { "__expr" : "Test::\"janet\"" },
+                    "uid" : { "type" : "Test", "id" : "janet"},
                     "attrs" : { "bar" : 2},
-                    "parents" : ["Test::\"george\""]
+                    "parents" : [
+                        {
+                            "type" : "Test",
+                            "id" : "george"
+                        }
+                    ]
                 },
                 {
-                    "uid" : { "__expr" : "Test::\"bob\"" },
+                    "uid" : { "type" : "Test", "id" : "bob"},
                     "attrs" : {},
                     "parents" : []
                 },
                 {
-                    "uid" : { "__expr" : "Test::\"henry\"" },
+                    "uid" : { "type" : "Test", "id" : "henry"},
                     "attrs" : {},
                     "parents" : []
                 },
@@ -799,24 +935,38 @@ mod json_parsing_tests {
     #[test]
     fn basic() {
         // Alice -> Jane -> Bob
-        let json = serde_json::json!(
-            [
+        let json = serde_json::json!([
             {
-                "uid": { "__expr": "test_entity_type::\"alice\"" },
+                "uid" : {
+                    "type" : "test_entity_type",
+                    "id" : "alice"
+                },
                 "attrs": {},
                 "parents": [
-                { "__expr": "test_entity_type::\"jane\"" }
+                    {
+                        "type" : "test_entity_type",
+                        "id" : "jane"
+                    }
                 ]
             },
             {
-                "uid": { "__expr": "test_entity_type::\"jane\"" },
+                "uid" : {
+                    "type" : "test_entity_type",
+                    "id" : "jane"
+                },
                 "attrs": {},
                 "parents": [
-                { "__expr": "test_entity_type::\"bob\"" }
+                    {
+                        "type" : "test_entity_type",
+                        "id" : "bob"
+                    }
                 ]
             },
             {
-                "uid": { "__expr": "test_entity_type::\"bob\"" },
+                "uid" : {
+                    "type" : "test_entity_type",
+                    "id" : "bob"
+                },
                 "attrs": {},
                 "parents": []
             }
@@ -850,27 +1000,36 @@ mod json_parsing_tests {
         let json = serde_json::json!(
             [
             {
-                "uid": { "__entity": { "type": "test_entity_type", "id": "alice" } },
+                "uid" : {
+                    "type" : "test_entity_type",
+                    "id" : "alice"
+                },
                 "attrs": {
                     "bacon": "eggs",
                     "pancakes": [1, 2, 3],
                     "waffles": { "key": "value" },
-                    "toast": { "__expr": "decimal(\"33.47\")" },
+                    "toast" : { "__extn" : { "fn" : "decimal", "arg" : "33.47" }},
                     "12345": { "__entity": { "type": "test_entity_type", "id": "bob" } },
                     "a b c": { "__extn": { "fn": "ip", "arg": "222.222.222.0/24" } }
                 },
                 "parents": [
-                    { "__expr": "test_entity_type::\"bob\"" },
+                    { "__entity": { "type" : "test_entity_type", "id" : "bob"} },
                     { "__entity": { "type": "test_entity_type", "id": "catherine" } }
                 ]
             },
             {
-                "uid": { "__expr": "test_entity_type::\"bob\"" },
+                "uid" : {
+                    "type" : "test_entity_type",
+                    "id" : "bob"
+                },
                 "attrs": {},
                 "parents": []
             },
             {
-                "uid": { "__expr": "test_entity_type::\"catherine\"" },
+                "uid" : {
+                    "type" : "test_entity_type",
+                    "id" : "catherine"
+                },
                 "attrs": {},
                 "parents": []
             }
@@ -924,12 +1083,11 @@ mod json_parsing_tests {
         let json = serde_json::json!(
             [
             {
-                "uid": { "__expr": "test_entity_type::\"alice\"" },
+                "uid": { "type" : "test_entity_type", "id" : "alice" },
                 "attrs": {},
                 "parents": [
-                    { "__expr": "test_entity_type::\"bob\"" },
+                    { "type" : "test_entity_type", "id" : "bob" },
                     { "__entity": { "type": "test_entity_type", "id": "charles" } },
-                    "test_entity_type::\"darwin\"",
                     { "type": "test_entity_type", "id": "elaine" }
                 ]
             },
@@ -939,9 +1097,12 @@ mod json_parsing_tests {
                 "parents": []
             },
             {
-                "uid": "test_entity_type::\"charles\"",
-                "attrs": {},
-                "parents": []
+                "uid" : {
+                    "type" : "test_entity_type",
+                    "id" : "charles"
+                },
+                "attrs" : {},
+                "parents" : []
             },
             {
                 "uid": { "type": "test_entity_type", "id": "darwin" },
@@ -951,7 +1112,12 @@ mod json_parsing_tests {
             {
                 "uid": { "type": "test_entity_type", "id": "elaine" },
                 "attrs": {},
-                "parents": [ "test_entity_type::\"darwin\"" ]
+                "parents" : [
+                    {
+                        "type" : "test_entity_type",
+                        "id" : "darwin"
+                    }
+                ]
             }
             ]
         );
@@ -997,6 +1163,7 @@ mod json_parsing_tests {
         let err = eparser
             .from_json_value(json)
             .expect_err("should be an invalid uid field");
+
         match err {
             EntitiesError::Deserialization(err) => {
                 assert!(
@@ -1043,9 +1210,13 @@ mod json_parsing_tests {
             .from_json_value(json)
             .expect_err("should be an invalid uid field");
         match err {
-            EntitiesError::Deserialization(err) => assert!(err
-                .to_string()
-                .contains("did not match any variant of untagged enum")),
+            EntitiesError::Deserialization(err) => assert!(
+                err.to_string().contains(
+                    r#"expected a literal entity reference, but got `{"spam":"eggs","type":"foo"}`"#
+                ),
+                "Actual error message was: {}",
+                err
+            ),
             _ => panic!("expected deserialization error, got a different error: {err}"),
         }
 
@@ -1084,9 +1255,12 @@ mod json_parsing_tests {
             .from_json_value(json)
             .expect_err("should be an invalid parents field");
         match err {
-            EntitiesError::Deserialization(err) => assert!(err
-                .to_string()
-                .contains("did not match any variant of untagged enum")),
+            EntitiesError::Deserialization(err) => assert!(
+                err.to_string()
+                    .contains(r#"in parents field of `foo::"bar"`, expected a literal entity reference, but got `"foo::\"help\""`"#),
+                "actual error was: {}",
+                err
+            ),
             _ => panic!("expected deserialization error, got a different error: {err}"),
         }
     }
diff --git a/cedar-policy-core/src/entities/json/entities.rs b/cedar-policy-core/src/entities/json/entities.rs
index acad281a0..ddbd9dffa 100644
--- a/cedar-policy-core/src/entities/json/entities.rs
+++ b/cedar-policy-core/src/entities/json/entities.rs
@@ -431,14 +431,13 @@ impl EntityJson {
     }
 }
 
-#[cfg(test)]
 // PANIC SAFETY unit test code
 #[allow(clippy::panic)]
+#[cfg(test)]
 mod test {
-
+    use super::*;
     use cool_asserts::assert_matches;
 
-    use super::*;
     #[test]
     fn reject_duplicates() {
         let json = serde_json::json!([
@@ -467,4 +466,15 @@ mod test {
           assert_eq!(bad_euid, euid, r#"Returned euid should be User::"alice""#);
         });
     }
+
+    #[test]
+    fn simple() {
+        let test = serde_json::json!({
+            "uid" : { "type" : "A", "id" : "b" },
+            "attrs" : {},
+            "parents" : []
+        });
+        let x: Result<EntityJSON, _> = serde_json::from_value(test);
+        x.unwrap();
+    }
 }
diff --git a/cedar-policy-core/src/entities/json/err.rs b/cedar-policy-core/src/entities/json/err.rs
index f698f4adf..988dee61a 100644
--- a/cedar-policy-core/src/entities/json/err.rs
+++ b/cedar-policy-core/src/entities/json/err.rs
@@ -22,6 +22,7 @@ use crate::ast::{
 };
 use crate::extensions::ExtensionFunctionLookupError;
 use crate::parser::err::ParseErrors;
+use either::Either;
 use smol_str::SmolStr;
 use thiserror::Error;
 
@@ -78,7 +79,7 @@ pub enum JsonDeserializationError {
         /// Context of this error
         ctx: Box<JsonDeserializationErrorContext>,
         /// the expression we got instead
-        got: Box<Expr>,
+        got: Box<Either<serde_json::Value, Expr>>,
     },
     /// A field that needs to be an extension value, was some other JSON value
     #[error("{ctx}, expected an extension value, but got `{got}`")]
@@ -86,7 +87,7 @@ pub enum JsonDeserializationError {
         /// Context of this error
         ctx: Box<JsonDeserializationErrorContext>,
         /// the expression we got instead
-        got: Box<Expr>,
+        got: Box<Either<serde_json::Value, Expr>>,
     },
     /// Contexts need to be records, but we got some other JSON value
     #[error("expected `context` to be a record, but got `{got}`")]
diff --git a/cedar-policy-core/src/entities/json/value.rs b/cedar-policy-core/src/entities/json/value.rs
index fdca1ee66..e575d3d09 100644
--- a/cedar-policy-core/src/entities/json/value.rs
+++ b/cedar-policy-core/src/entities/json/value.rs
@@ -19,12 +19,13 @@ use super::{
     JsonSerializationError, SchemaType,
 };
 use crate::ast::{
-    BorrowedRestrictedExpr, Eid, EntityUID, Expr, ExprConstructionError, ExprKind, Literal, Name,
+    BorrowedRestrictedExpr, Eid, EntityUID, ExprConstructionError, ExprKind, Literal, Name,
     RestrictedExpr,
 };
 use crate::entities::EscapeKind;
 use crate::extensions::{ExtensionFunctionLookupError, Extensions};
 use crate::FromNormalizedStr;
+use either::Either;
 use serde::{Deserialize, Serialize};
 use serde_with::serde_as;
 use smol_str::SmolStr;
@@ -41,23 +42,6 @@ use std::collections::{BTreeMap, HashMap, HashSet};
 #[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
 #[serde(untagged)]
 pub enum CedarValueJson {
-    /// Special JSON object with single reserved "__expr" key:
-    /// interpret the following string as a (restricted) Cedar expression.
-    /// Some escape (this or the following ones) is necessary for extension
-    /// values and entity references, but this `__expr` escape could also be
-    /// used for any other values.
-    ///
-    /// `__expr` is deprecated (starting with the 1.2 release) and will be
-    /// removed in favor of `__entity` and `__extn`, which together cover all of
-    /// the use-cases where `__expr` would have been necessary.
-    //
-    // listed before `Record` so that it takes priority: otherwise, the escape
-    // would be interpreted as a Record with a key "__expr". see docs on
-    // `serde(untagged)`
-    ExprEscape {
-        /// String to interpret as a (restricted) Cedar expression
-        __expr: SmolStr,
-    },
     /// Special JSON object with single reserved "__entity" key:
     /// the following item should be a JSON object of the form
     /// `{ "type": "xxx", "id": "yyy" }`.
@@ -236,17 +220,6 @@ impl CedarValueJson {
                     }
                 }
             })?),
-            Self::ExprEscape { __expr: expr } => {
-                use crate::parser;
-                let expr: Expr = parser::parse_expr(&expr).map_err(|errs| {
-                    JsonDeserializationError::ParseEscape {
-                        kind: EscapeKind::Expr,
-                        value: expr.to_string(),
-                        errs,
-                    }
-                })?;
-                Ok(RestrictedExpr::new(expr)?)
-            }
             Self::EntityEscape { __entity: entity } => Ok(RestrictedExpr::val(
                 EntityUID::try_from(entity.clone()).map_err(|errs| {
                     JsonDeserializationError::ParseEscape {
@@ -505,18 +478,6 @@ impl<'e> ValueParser<'e> {
         ctx: impl Fn() -> JsonDeserializationErrorContext + Clone,
     ) -> Result<RestrictedExpr, JsonDeserializationError> {
         match extnjson {
-            ExtnValueJson::ExplicitExprEscape { __expr } => {
-                // reuse the same logic that parses CedarValueJson
-                let jvalue = CedarValueJson::ExprEscape { __expr };
-                let expr = jvalue.into_expr(ctx.clone())?;
-                match expr.expr_kind() {
-                    ExprKind::ExtensionFunctionApp { .. } => Ok(expr),
-                    _ => Err(JsonDeserializationError::ExpectedExtnValue {
-                        ctx: Box::new(ctx()),
-                        got: Box::new(expr.clone().into()),
-                    }),
-                }
-            }
             ExtnValueJson::ExplicitExtnEscape { __extn }
             | ExtnValueJson::ImplicitExtnEscape(__extn) => {
                 // reuse the same logic that parses CedarValueJson
@@ -526,7 +487,7 @@ impl<'e> ValueParser<'e> {
                     ExprKind::ExtensionFunctionApp { .. } => Ok(expr),
                     _ => Err(JsonDeserializationError::ExpectedExtnValue {
                         ctx: Box::new(ctx()),
-                        got: Box::new(expr.clone().into()),
+                        got: Box::new(Either::Right(expr.clone().into())),
                     }),
                 }
             }
@@ -626,28 +587,17 @@ impl<'e> ValueParser<'e> {
 #[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
 #[serde(untagged)]
 pub enum EntityUidJson {
-    /// Explicit `__expr` escape; see notes on `CedarValueJson::ExprEscape`.
-    ///
-    /// Deprecated since the 1.2 release; use
-    /// `{ "__entity": { "type": "...", "id": "..." } }` instead.
-    ExplicitExprEscape {
-        /// String to interpret as a (restricted) Cedar expression.
-        /// In this case, it must evaluate to an entity reference.
-        __expr: SmolStr,
-    },
-    /// Explicit `__entity` escape; see notes on `CedarValueJson::EntityEscape`
+    /// Explicit `__entity` escape; see notes on JSONValue::EntityEscape
     ExplicitEntityEscape {
         /// JSON object containing the entity type and ID
         __entity: TypeAndId,
     },
-    /// Implicit `__expr` escape, in which case we'll just see a JSON string.
-    ///
-    /// Deprecated since the 1.2 release; use
-    /// `{ "type": "...", "id": "..." }` instead.
-    ImplicitExprEscape(SmolStr),
     /// Implicit `__entity` escape, in which case we'll see just the TypeAndId
     /// structure
     ImplicitEntityEscape(TypeAndId),
+
+    /// Implicit catch-call case for error handling
+    FoundValue(serde_json::Value),
 }
 
 /// Serde JSON format for Cedar values where we know we're expecting an
@@ -655,16 +605,7 @@ pub enum EntityUidJson {
 #[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
 #[serde(untagged)]
 pub enum ExtnValueJson {
-    /// Explicit `__expr` escape; see notes on `CedarValueJson::ExprEscape`.
-    ///
-    /// Deprecated since the 1.2 release; use
-    /// `{ "__extn": { "fn": "...", "arg": "..." } }` instead.
-    ExplicitExprEscape {
-        /// String to interpret as a (restricted) Cedar expression.
-        /// In this case, it must evaluate to an extension value.
-        __expr: SmolStr,
-    },
-    /// Explicit `__extn` escape; see notes on `CedarValueJson::ExtnEscape`
+    /// Explicit `__extn` escape; see notes on JSONValue::ExtnEscape
     ExplicitExtnEscape {
         /// JSON object containing the extension-constructor call
         __extn: FnAndArg,
@@ -696,46 +637,7 @@ impl EntityUidJson {
         self,
         ctx: impl Fn() -> JsonDeserializationErrorContext + Clone,
     ) -> Result<EntityUID, JsonDeserializationError> {
-        let is_implicit_expr = matches!(self, Self::ImplicitExprEscape(_));
         match self {
-            Self::ExplicitExprEscape { __expr } | Self::ImplicitExprEscape(__expr) => {
-                // reuse the same logic that parses CedarValueJson
-                let jvalue = CedarValueJson::ExprEscape {
-                    __expr: __expr.clone(),
-                };
-                let expr = jvalue.into_expr(ctx.clone()).map_err(|e| {
-                    if is_implicit_expr {
-                        // in this case, the user provided a string that wasn't
-                        // an appropriate entity reference.
-                        // Perhaps they didn't realize they needed to provide an
-                        // entity reference at all, or perhaps they just had an
-                        // entity syntax error.
-                        // We'll give them the `ExpectedLiteralEntityRef` error
-                        // message instead of the `ExprParseError` error message,
-                        // as it's likely to be more helpful in my opinion
-                        // PANIC SAFETY: Every `String` can be turned into a restricted expression
-                        #[allow(clippy::unwrap_used)]
-                        JsonDeserializationError::ExpectedLiteralEntityRef {
-                            ctx: Box::new(ctx()),
-                            got: Box::new(
-                                CedarValueJson::String(__expr)
-                                    .into_expr(ctx.clone())
-                                    .unwrap()
-                                    .into(),
-                            ),
-                        }
-                    } else {
-                        e
-                    }
-                })?;
-                match expr.expr_kind() {
-                    ExprKind::Lit(Literal::EntityUID(euid)) => Ok((**euid).clone()),
-                    _ => Err(JsonDeserializationError::ExpectedLiteralEntityRef {
-                        ctx: Box::new(ctx()),
-                        got: Box::new(expr.clone().into()),
-                    }),
-                }
-            }
             Self::ExplicitEntityEscape { __entity } | Self::ImplicitEntityEscape(__entity) => {
                 // reuse the same logic that parses CedarValueJson
                 let jvalue = CedarValueJson::EntityEscape { __entity };
@@ -744,10 +646,14 @@ impl EntityUidJson {
                     ExprKind::Lit(Literal::EntityUID(euid)) => Ok((**euid).clone()),
                     _ => Err(JsonDeserializationError::ExpectedLiteralEntityRef {
                         ctx: Box::new(ctx()),
-                        got: Box::new(expr.clone().into()),
+                        got: Box::new(Either::Right(expr.clone().into())),
                     }),
                 }
             }
+            Self::FoundValue(v) => Err(JsonDeserializationError::ExpectedLiteralEntityRef {
+                ctx: Box::new(ctx()),
+                got: Box::new(Either::Left(v)),
+            }),
         }
     }
 }
diff --git a/cedar-policy-core/src/parser/node.rs b/cedar-policy-core/src/parser/node.rs
index 00ba626b2..9dd09571b 100644
--- a/cedar-policy-core/src/parser/node.rs
+++ b/cedar-policy-core/src/parser/node.rs
@@ -195,8 +195,8 @@ impl<N: Error> Error for ASTNode<N> {
         self.node.source()
     }
 
+    #[allow(deprecated)]
     fn description(&self) -> &str {
-        #[allow(deprecated)]
         self.node.description()
     }
 
diff --git a/cedar-policy/src/frontend/is_authorized.rs b/cedar-policy/src/frontend/is_authorized.rs
index a7760f7cd..79c2081d6 100644
--- a/cedar-policy/src/frontend/is_authorized.rs
+++ b/cedar-policy/src/frontend/is_authorized.rs
@@ -448,12 +448,23 @@ mod test {
         let entities = serde_json::json!(
             [
                 {
-                    "uid": { "__expr": "user::\"alice\"" },
+                    "uid" : {
+                        "type" : "user",
+                        "id" : "alice"
+                    },
                     "attrs": { "foo": "bar" },
-                    "parents": [{ "__expr": "user::\"bob\"" }]
+                    "parents" : [
+                        {
+                            "type" : "user",
+                            "id" : "bob"
+                        }
+                    ]
                 },
                 {
-                    "uid": { "__expr": "user::\"bob\"" },
+                    "uid" : {
+                        "type" : "user",
+                        "id" : "bob"
+                    },
                     "attrs": {},
                     "parents": []
                 }
@@ -498,15 +509,25 @@ mod test {
     #[test]
     fn test_not_authorized_on_empty_slice() {
         let call = r#"
-            { "principal": "User::\"alice\""
-            , "action" : "Photo::\"view\""
-            , "resource" : "Photo::\"door\""
-            , "context" : {}
-            , "slice" : {
-                  "policies" : {}
-                , "entities" : []
+        {
+            "principal": {
+             "type": "User",
+             "id": "alice"
+            },
+            "action": {
+             "type": "Photo",
+             "id": "view"
+            },
+            "resource": {
+             "type": "Photo",
+             "id": "door"
+            },
+            "context": {},
+            "slice": {
+             "policies": {},
+             "entities": []
             }
-         }
+           }
         "#;
 
         assert_is_not_authorized(json_is_authorized(call));
@@ -515,17 +536,27 @@ mod test {
     #[test]
     fn test_authorized_on_simple_slice() {
         let call = r#"
-            { "principal": "User::\"alice\""
-            , "action" : "Photo::\"view\""
-            , "resource" : "Photo::\"door\""
-            , "context" : {}
-            , "slice" : {
-                  "policies" : {
-                    "ID1": "permit(principal == User::\"alice\", action, resource);"
-                  }
-                , "entities" : []
+        {
+            "principal": {
+             "type": "User",
+             "id": "alice"
+            },
+            "action": {
+             "type": "Photo",
+             "id": "view"
+            },
+            "resource": {
+             "type": "Photo",
+             "id": "door"
+            },
+            "context": {},
+            "slice": {
+             "policies": {
+              "ID1": "permit(principal == User::\"alice\", action, resource);"
+             },
+             "entities": []
             }
-         }
+           }
         "#;
 
         assert_is_authorized(json_is_authorized(call));
@@ -534,15 +565,25 @@ mod test {
     #[test]
     fn test_authorized_on_simple_slice_with_string_policies() {
         let call = r#"
-	             { "principal": "User::\"alice\""
-	             , "action" : "Photo::\"view\""
-	             , "resource" : "Photo::\"door\""
-	             , "context" : {}
-	             , "slice" : {
-	                   "policies" : "permit(principal == User::\"alice\", action, resource);"
-	                 , "entities" : []
-	             }
-	          }
+        {
+            "principal": {
+             "type": "User",
+             "id": "alice"
+            },
+            "action": {
+             "type": "Photo",
+             "id": "view"
+            },
+            "resource": {
+             "type": "Photo",
+             "id": "door"
+            },
+            "context": {},
+            "slice": {
+             "policies": "permit(principal == User::\"alice\", action, resource);",
+             "entities": []
+            }
+           }
 	         "#;
 
         assert_is_authorized(json_is_authorized(call));
@@ -551,18 +592,30 @@ mod test {
     #[test]
     fn test_authorized_on_simple_slice_with_context() {
         let call = r#"
-            { "principal": "User::\"alice\""
-            , "action" : "Photo::\"view\""
-            , "resource" : "Photo::\"door\""
-            , "context" : {
-                "is_authenticated": true,
-                "source_ip": { "__expr": "ip(\"222.222.222.222\")" }
-            }
-            , "slice" : {
-                  "policies" : "permit(principal == User::\"alice\", action, resource) when { context.is_authenticated && context.source_ip.isInRange(ip(\"222.222.222.0/24\")) };"
-                , "entities" : []
-            }
+        {
+            "principal": {
+             "type": "User",
+             "id": "alice"
+            },
+            "action": {
+             "type": "Photo",
+             "id": "view"
+            },
+            "resource": {
+             "type": "Photo",
+             "id": "door"
+            },
+            "context": {
+             "is_authenticated": true,
+             "source_ip": {
+                "__extn" : { "fn" : "ip", "arg" : "222.222.222.222" }
+             }
+            },
+            "slice": {
+             "policies": "permit(principal == User::\"alice\", action, resource) when { context.is_authenticated && context.source_ip.isInRange(ip(\"222.222.222.0/24\")) };",
+             "entities": []
             }
+           }
         "#;
 
         assert_is_authorized(json_is_authorized(call));
@@ -571,33 +624,70 @@ mod test {
     #[test]
     fn test_authorized_on_simple_slice_with_attrs_and_parents() {
         let call = r#"
-            { "principal": "User::\"alice\""
-            , "action" : "Photo::\"view\""
-            , "resource" : "Photo::\"door\""
-            , "context" : {}
-            , "slice" : {
-                  "policies" : "permit(principal, action, resource in Folder::\"house\") when { resource.owner == principal };"
-                , "entities" : [
-                    {
-                        "uid": { "__expr": "User::\"alice\"" },
-                        "attrs": {},
-                        "parents": []
-                    },
-                    {
-                        "uid": { "__expr": "Photo::\"door\"" },
-                        "attrs": {
-                            "owner": { "__expr": "User::\"alice\"" }
-                        },
-                        "parents": [{ "__expr": "Folder::\"house\"" }]
-                    },
-                    {
-                        "uid": { "__expr": "Folder::\"house\"" },
-                        "attrs": {},
-                        "parents": []
-                    }
-                ]
-            }
+        {
+            "principal": {
+             "type": "User",
+             "id": "alice"
+            },
+            "action": {
+             "type": "Photo",
+             "id": "view"
+            },
+            "resource": {
+             "type": "Photo",
+             "id": "door"
+            },
+            "context": {},
+            "slice": {
+             "policies": "permit(principal, action, resource in Folder::\"house\") when { resource.owner == principal };",
+             "entities": [
+              {
+               "uid": {
+                "__entity": {
+                 "type": "User",
+                 "id": "alice"
+                }
+               },
+               "attrs": {},
+               "parents": []
+              },
+              {
+               "uid": {
+                "__entity": {
+                 "type": "Photo",
+                 "id": "door"
+                }
+               },
+               "attrs": {
+                "owner": {
+                 "__entity": {
+                  "type": "User",
+                  "id": "alice"
+                 }
+                }
+               },
+               "parents": [
+                {
+                 "__entity": {
+                  "type": "Folder",
+                  "id": "house"
+                 }
+                }
+               ]
+              },
+              {
+               "uid": {
+                "__entity": {
+                 "type": "Folder",
+                 "id": "house"
+                }
+               },
+               "attrs": {},
+               "parents": []
+              }
+             ]
             }
+           }
         "#;
 
         assert_is_authorized(json_is_authorized(call));
@@ -606,19 +696,29 @@ mod test {
     #[test]
     fn test_authorized_on_multi_policy_slice() {
         let call = r#"
-	             { "principal": "User::\"alice\""
-	             , "action" : "Photo::\"view\""
-	             , "resource" : "Photo::\"door\""
-	             , "context" : {}
-	             , "slice" : {
-	                   "policies" : {
-	                     "ID0": "permit(principal == User::\"jerry\", action, resource == Photo::\"doorx\");",
-	                     "ID1": "permit(principal == User::\"tom\", action, resource == Photo::\"doory\");",
-	                     "ID2": "permit(principal == User::\"alice\", action, resource == Photo::\"door\");"
-	                   }
-	                 , "entities" : []
-	             }
-	          }
+        {
+            "principal": {
+             "type": "User",
+             "id": "alice"
+            },
+            "action": {
+             "type": "Photo",
+             "id": "view"
+            },
+            "resource": {
+             "type": "Photo",
+             "id": "door"
+            },
+            "context": {},
+            "slice": {
+             "policies": {
+              "ID0": "permit(principal == User::\"jerry\", action, resource == Photo::\"doorx\");",
+              "ID1": "permit(principal == User::\"tom\", action, resource == Photo::\"doory\");",
+              "ID2": "permit(principal == User::\"alice\", action, resource == Photo::\"door\");"
+             },
+             "entities": []
+            }
+           }
 	         "#;
         assert_is_authorized(json_is_authorized(call));
     }
@@ -626,15 +726,70 @@ mod test {
     #[test]
     fn test_authorized_on_multi_policy_slice_with_string_policies() {
         let call = r#"
-	             { "principal": "User::\"alice\""
-	             , "action" : "Photo::\"view\""
-	             , "resource" : "Photo::\"door\""
-	             , "context" : {}
-	             , "slice" : {
-	                   "policies" : "permit(principal == User::\"jerry\", action, resource == Photo::\"doorx\");permit(principal == User::\"tom\", action, resource == Photo::\"doory\");permit(principal == User::\"alice\", action, resource == Photo::\"door\");"
-	                 , "entities" : []
-	             }
-	          }
+        {
+            "principal": {
+             "type": "User",
+             "id": "alice"
+            },
+            "action": {
+             "type": "Photo",
+             "id": "view"
+            },
+            "resource": {
+             "type": "Photo",
+             "id": "door"
+            },
+            "context": {},
+            "slice": {
+             "policies": "permit(principal, action, resource in Folder::\"house\") when { resource.owner == principal };",
+             "entities": [
+              {
+               "uid": {
+                "__entity": {
+                 "type": "User",
+                 "id": "alice"
+                }
+               },
+               "attrs": {},
+               "parents": []
+              },
+              {
+               "uid": {
+                "__entity": {
+                 "type": "Photo",
+                 "id": "door"
+                }
+               },
+               "attrs": {
+                "owner": {
+                 "__entity": {
+                  "type": "User",
+                  "id": "alice"
+                 }
+                }
+               },
+               "parents": [
+                {
+                 "__entity": {
+                  "type": "Folder",
+                  "id": "house"
+                 }
+                }
+               ]
+              },
+              {
+               "uid": {
+                "__entity": {
+                 "type": "Folder",
+                 "id": "house"
+                }
+               },
+               "attrs": {},
+               "parents": []
+              }
+             ]
+            }
+           }
 	         "#;
         assert_is_authorized(json_is_authorized(call));
     }
@@ -642,18 +797,28 @@ mod test {
     #[test]
     fn test_authorized_on_multi_policy_slice_denies_when_expected() {
         let call = r#"
-	             { "principal": "User::\"alice\""
-	             , "action" : "Photo::\"view\""
-	             , "resource" : "Photo::\"door\""
-	             , "context" : {}
-	             , "slice" : {
-	                   "policies" : {
-	                     "ID0": "permit(principal, action, resource);",
-	                     "ID1": "forbid(principal == User::\"alice\", action, resource == Photo::\"door\");"
-	                   }
-	                 , "entities" : []
-	             }
-	          }
+        {
+            "principal": {
+             "type": "User",
+             "id": "alice"
+            },
+            "action": {
+             "type": "Photo",
+             "id": "view"
+            },
+            "resource": {
+             "type": "Photo",
+             "id": "door"
+            },
+            "context": {},
+            "slice": {
+             "policies": {
+              "ID0": "permit(principal, action, resource);",
+              "ID1": "forbid(principal == User::\"alice\", action, resource == Photo::\"door\");"
+             },
+             "entities": []
+            }
+           }
 	         "#;
         assert_is_not_authorized(json_is_authorized(call));
     }
@@ -661,15 +826,25 @@ mod test {
     #[test]
     fn test_authorized_on_multi_policy_slice_with_string_policies_denies_when_expected() {
         let call = r#"
-	             { "principal": "User::\"alice\""
-	             , "action" : "Photo::\"view\""
-	             , "resource" : "Photo::\"door\""
-	             , "context" : {}
-	             , "slice" : {
-	                   "policies": "permit(principal, action, resource);forbid(principal == User::\"alice\", action, resource);"
-	                 , "entities" : []
-	             }
-	          }
+        {
+            "principal": {
+             "type": "User",
+             "id": "alice"
+            },
+            "action": {
+             "type": "Photo",
+             "id": "view"
+            },
+            "resource": {
+             "type": "Photo",
+             "id": "door"
+            },
+            "context": {},
+            "slice": {
+             "policies": "permit(principal, action, resource);forbid(principal == User::\"alice\", action, resource);",
+             "entities": []
+            }
+           }
 	         "#;
 
         assert_is_not_authorized(json_is_authorized(call));
@@ -678,16 +853,26 @@ mod test {
     #[test]
     fn test_authorized_with_template_as_policy_should_fail() {
         let call = r#"
-	             { "principal": "User::\"alice\""
-	             , "action" : "Photo::\"view\""
-	             , "resource" : "Photo::\"door\""
-	             , "context" : {}
-	             , "slice" : {
-	                   "policies" : "permit(principal == ?principal, action, resource);"
-	                 , "entities" : []
-                     , "templates" : {}
-	             }
-	          }
+        {
+            "principal": {
+             "type": "User",
+             "id": "alice"
+            },
+            "action": {
+             "type": "Photo",
+             "id": "view"
+            },
+            "resource": {
+             "type": "Photo",
+             "id": "door"
+            },
+            "context": {},
+            "slice": {
+             "policies": "permit(principal == ?principal, action, resource);",
+             "entities": [],
+             "templates": {}
+            }
+           }
 	         "#;
         assert_is_not_authorized(json_is_authorized(call));
     }
@@ -695,18 +880,28 @@ mod test {
     #[test]
     fn test_authorized_with_template_should_fail() {
         let call = r#"
-	             { "principal": "User::\"alice\""
-	             , "action" : "Photo::\"view\""
-	             , "resource" : "Photo::\"door\""
-	             , "context" : {}
-	             , "slice" : {
-	                   "policies" : {}
-	                 , "entities" : []
-                     , "templates" : {
-                        "ID0": "permit(principal == ?principal, action, resource);"
-                      }
-	             }
-	          }
+        {
+            "principal": {
+             "type": "User",
+             "id": "alice"
+            },
+            "action": {
+             "type": "Photo",
+             "id": "view"
+            },
+            "resource": {
+             "type": "Photo",
+             "id": "door"
+            },
+            "context": {},
+            "slice": {
+             "policies": {},
+             "entities": [],
+             "templates": {
+              "ID0": "permit(principal == ?principal, action, resource);"
+             }
+            }
+           }
 	         "#;
         assert_is_not_authorized(json_is_authorized(call));
     }
@@ -714,33 +909,43 @@ mod test {
     #[test]
     fn test_authorized_with_template_instantiation() {
         let call = r#"
-	             { "principal": "User::\"alice\""
-	             , "action" : "Photo::\"view\""
-	             , "resource" : "Photo::\"door\""
-	             , "context" : {}
-	             , "slice" : {
-	                   "policies" : {}
-	                 , "entities" : []
-                     , "templates" : {
-                        "ID0": "permit(principal == ?principal, action, resource);"
-                      }
-                     , "template_instantiations" : [
-                        {
-                            "template_id" : "ID0",
-                            "result_policy_id" : "ID0_User_alice",
-                            "instantiations" : [
-                                {
-                                    "slot": "?principal",
-                                    "value": {
-                                        "ty" : "User",
-                                        "eid" : "alice"
-                                    }
-                                }
-                            ]
-                        }
-                     ]
-	             }
-	          }
+        {
+            "principal": {
+             "type": "User",
+             "id": "alice"
+            },
+            "action": {
+             "type": "Photo",
+             "id": "view"
+            },
+            "resource": {
+             "type": "Photo",
+             "id": "door"
+            },
+            "context": {},
+            "slice": {
+             "policies": {},
+             "entities": [],
+             "templates": {
+              "ID0": "permit(principal == ?principal, action, resource);"
+             },
+             "template_instantiations": [
+              {
+               "template_id": "ID0",
+               "result_policy_id": "ID0_User_alice",
+               "instantiations": [
+                {
+                 "slot": "?principal",
+                 "value": {
+                  "ty": "User",
+                  "eid": "alice"
+                 }
+                }
+               ]
+              }
+             ]
+            }
+           }
 	         "#;
         assert_is_authorized(json_is_authorized(call));
     }
diff --git a/cedar-policy/tests/public_interface.rs b/cedar-policy/tests/public_interface.rs
index 49898611f..cae52091e 100644
--- a/cedar-policy/tests/public_interface.rs
+++ b/cedar-policy/tests/public_interface.rs
@@ -54,37 +54,88 @@ fn authorize_custom_request() -> Result<(), Box<dyn Error>> {
     // Entities must be added together because of some post-processing
     let entity_json = r#"
     [
-        {
-            "uid": { "__expr" :  "User::\"alice\""},
-            "attrs": {},
-            "parents": [ { "__expr" :"UserGroup::\"jane_friends\"" }]
-        },
-        {
-            "uid":  { "__expr" :"UserGroup::\"jane_friends\"" },
-            "attrs": {},
-            "parents": []
-        },
-        {
-            "uid":  { "__expr" :"Action::\"view\"" },
-            "attrs": {},
-            "parents": []
-        },
-        {
-            "uid":  { "__expr" :"Photo::\"VacationPhoto94.jpg\"" },
-            "attrs": {},
-            "parents": [ { "__expr" :"Album::\"jane_vacation\"" }]
-        },
-        {
-            "uid":  { "__expr" :"Album::\"jane_vacation\"" },
-            "attrs": {},
-            "parents": [ { "__expr" :"Account::\"jane\"" }]
-        },
-        {
-            "uid":  { "__expr" :"Account::\"jane\""},
-            "attrs": {},
-            "parents": []
-        }
-    ]
+ {
+  "uid": {
+   "__entity": {
+    "type": "User",
+    "id": "alice"
+   }
+  },
+  "attrs": {},
+  "parents": [
+   {
+    "__entity": {
+     "type": "UserGroup",
+     "id": "jane_friends"
+    }
+   }
+  ]
+ },
+ {
+  "uid": {
+   "__entity": {
+    "type": "UserGroup",
+    "id": "jane_friends"
+   }
+  },
+  "attrs": {},
+  "parents": []
+ },
+ {
+  "uid": {
+   "__entity": {
+    "type": "Action",
+    "id": "view"
+   }
+  },
+  "attrs": {},
+  "parents": []
+ },
+ {
+  "uid": {
+   "__entity": {
+    "type": "Photo",
+    "id": "VacationPhoto94.jpg"
+   }
+  },
+  "attrs": {},
+  "parents": [
+   {
+    "__entity": {
+     "type": "Album",
+     "id": "jane_vacation"
+    }
+   }
+  ]
+ },
+ {
+  "uid": {
+   "__entity": {
+    "type": "Album",
+    "id": "jane_vacation"
+   }
+  },
+  "attrs": {},
+  "parents": [
+   {
+    "__entity": {
+     "type": "Account",
+     "id": "jane"
+    }
+   }
+  ]
+ },
+ {
+  "uid": {
+   "__entity": {
+    "type": "Account",
+    "id": "jane"
+   }
+  },
+  "attrs": {},
+  "parents": []
+ }
+]
     "#;
     let entities = Entities::from_json_str(entity_json, None)?;
 
@@ -226,7 +277,7 @@ fn expression_eval_1() -> Result<(), Box<dyn Error>> {
 fn expression_eval_attr() -> Result<(), Box<dyn Error>> {
     let entity_json = r#"[
         {
-        "uid": { "__expr" :  "User::\"alice\"" },
+        "uid": { "__entity" :  { "type" : "User", "id" : "alice" } },
         "attrs": {"age":19},
         "parents": []
         }
@@ -270,7 +321,7 @@ fn expression_eval_attr() -> Result<(), Box<dyn Error>> {
 fn expression_eval_context() -> Result<(), Box<dyn Error>> {
     let entity_json = r#"[
         {
-        "uid": { "__expr" :  "User::\"alice\"" },
+        "uid": { "__entity" : { "type" : "User", "id" : "alice" }},
         "attrs": {"age":19},
         "parents": []
         }

From a919b5d77050f6ab952a4c345ef0de8bff2c4d45 Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Mon, 2 Oct 2023 19:52:06 +0000
Subject: [PATCH 02/28] Integrations tests in cli pass

---
 ...bc58b487d6a1ae58c2472ef0c51b282c17e65.json |  2 +-
 .../tests/integration_tests/main.rs           | 20 +++++++++++++------
 cedar-policy-cli/tests/sample.rs              |  2 ++
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/cedar-integration-tests/corpus_tests/016bc58b487d6a1ae58c2472ef0c51b282c17e65.json b/cedar-integration-tests/corpus_tests/016bc58b487d6a1ae58c2472ef0c51b282c17e65.json
index e4a83b00a..14c8c69a0 100644
--- a/cedar-integration-tests/corpus_tests/016bc58b487d6a1ae58c2472ef0c51b282c17e65.json
+++ b/cedar-integration-tests/corpus_tests/016bc58b487d6a1ae58c2472ef0c51b282c17e65.json
@@ -173,4 +173,4 @@
       "errors": []
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/cedar-policy-cli/tests/integration_tests/main.rs b/cedar-policy-cli/tests/integration_tests/main.rs
index 085827cb8..5e26269a7 100644
--- a/cedar-policy-cli/tests/integration_tests/main.rs
+++ b/cedar-policy-cli/tests/integration_tests/main.rs
@@ -29,6 +29,7 @@ mod ip;
 mod multi;
 
 use cedar_policy::Decision;
+use cedar_policy::EntityUid;
 use cedar_policy::PolicySet;
 use serde::Deserialize;
 use std::env;
@@ -61,13 +62,13 @@ struct JsonRequest {
     desc: String,
     /// Principal for the request
     #[serde(default)]
-    principal: Option<String>,
+    principal: Option<serde_json::Value>,
     /// Action for the request
     #[serde(default)]
-    action: Option<String>,
+    action: Option<serde_json::Value>,
     /// Resource for the request
     #[serde(default)]
-    resource: Option<String>,
+    resource: Option<serde_json::Value>,
     /// Context for the request
     context: serde_json::Value,
     /// Expected decision for the request
@@ -78,9 +79,14 @@ struct JsonRequest {
     errors: Vec<String>,
 }
 
+fn value_to_euid_string(v: serde_json::Value) -> Option<String> {
+    EntityUid::from_json(v).ok().map(|euid| euid.to_string())
+}
+
 /// For relative paths, return the absolute path, assuming that the path
 /// is relative to the root of the CedarIntegrationTests repo.
 /// For absolute paths, return them unchanged.
+#[allow(clippy::expect_used)]
 fn resolve_integration_test_path(path: impl AsRef<Path>) -> PathBuf {
     if path.as_ref().is_relative() {
         let manifest_dir = env::var("CARGO_MANIFEST_DIR")
@@ -101,6 +107,8 @@ fn resolve_integration_test_path(path: impl AsRef<Path>) -> PathBuf {
 /// Relative paths are assumed to be relative to the root of the
 /// cedar-integration-tests folder.
 /// Absolute paths are handled without modification.
+#[allow(clippy::unwrap_used)]
+#[allow(clippy::expect_used)]
 fn perform_integration_test_from_json(jsonfile: impl AsRef<Path>) {
     let jsonfile = resolve_integration_test_path(jsonfile);
     let jsonstr = std::fs::read_to_string(&jsonfile)
@@ -165,15 +173,15 @@ fn perform_integration_test_from_json(jsonfile: impl AsRef<Path>) {
         let mut entity_args = Vec::new();
         if let Some(s) = json_request.principal {
             entity_args.push("--principal".to_string());
-            entity_args.push(s);
+            entity_args.push(value_to_euid_string(s).unwrap());
         }
         if let Some(s) = json_request.resource {
             entity_args.push("--resource".to_string());
-            entity_args.push(s);
+            entity_args.push(value_to_euid_string(s).unwrap());
         }
         if let Some(s) = json_request.action {
             entity_args.push("--action".to_string());
-            entity_args.push(s);
+            entity_args.push(value_to_euid_string(s).unwrap());
         }
 
         let authorize_cmd = assert_cmd::Command::cargo_bin("cedar")
diff --git a/cedar-policy-cli/tests/sample.rs b/cedar-policy-cli/tests/sample.rs
index 873189309..40589cc98 100644
--- a/cedar-policy-cli/tests/sample.rs
+++ b/cedar-policy-cli/tests/sample.rs
@@ -102,6 +102,8 @@ fn run_link_test(
     assert_eq!(output, expected);
 }
 
+#[allow(clippy::expect_used)]
+#[allow(clippy::unwrap_used)]
 fn run_format_test(policies_file: &str) {
     let format_cmd = assert_cmd::Command::cargo_bin("cedar")
         .expect("bin exists")

From 6ccb1be47211b1658d029d4299fe4f336ed05d8f Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Mon, 2 Oct 2023 20:10:03 +0000
Subject: [PATCH 03/28] Updating some tests

---
 cedar-policy-core/src/entities.rs | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/cedar-policy-core/src/entities.rs b/cedar-policy-core/src/entities.rs
index a03d90a5e..5ed5b801a 100644
--- a/cedar-policy-core/src/entities.rs
+++ b/cedar-policy-core/src/entities.rs
@@ -895,21 +895,36 @@ mod json_parsing_tests {
         let json = serde_json::json!(
             [
             {
-                "uid": { "__expr": "test_entity_type::\"alice\"" },
+                "uid" : {
+                    "type" : "test_entity_type",
+                    "id" : "alice"
+                },
                 "attrs": {},
                 "parents": [
-                { "__expr": "test_entity_type::\"jane\"" }
+                {
+                    "type" : "test_entity_type",
+                    "id" : "jane"
+                }
                 ]
             },
             {
-                "uid": { "__expr": "test_entity_type::\"jane\"" },
+                "uid" : {
+                    "type" : "test_entity_type",
+                    "id" : "jane"
+                },
                 "attrs": {},
                 "parents": [
-                { "__expr": "test_entity_type::\"bob\"" }
+                {
+                    "type" : "test_entity_type",
+                    "id" : "bob",
+                }
                 ]
             },
             {
-                "uid": { "__expr": "test_entity_type::\"bob\"" },
+                "uid" : {
+                    "type" : "test_entity_type",
+                    "id" : "bob"
+                },
                 "attrs": {},
                 "parents": []
             }

From a7ee61a108cdafdc83ebf74edcde98475a2a513b Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Mon, 2 Oct 2023 20:10:11 +0000
Subject: [PATCH 04/28] Adding panic safety annotations

---
 cedar-policy-cli/tests/integration_tests/main.rs | 3 +++
 cedar-policy-cli/tests/sample.rs                 | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/cedar-policy-cli/tests/integration_tests/main.rs b/cedar-policy-cli/tests/integration_tests/main.rs
index 5e26269a7..66f49ab5b 100644
--- a/cedar-policy-cli/tests/integration_tests/main.rs
+++ b/cedar-policy-cli/tests/integration_tests/main.rs
@@ -86,6 +86,7 @@ fn value_to_euid_string(v: serde_json::Value) -> Option<String> {
 /// For relative paths, return the absolute path, assuming that the path
 /// is relative to the root of the CedarIntegrationTests repo.
 /// For absolute paths, return them unchanged.
+// PANIC SAFETY: this is all test code
 #[allow(clippy::expect_used)]
 fn resolve_integration_test_path(path: impl AsRef<Path>) -> PathBuf {
     if path.as_ref().is_relative() {
@@ -107,7 +108,9 @@ fn resolve_integration_test_path(path: impl AsRef<Path>) -> PathBuf {
 /// Relative paths are assumed to be relative to the root of the
 /// cedar-integration-tests folder.
 /// Absolute paths are handled without modification.
+// PANIC SAFETY: this is all test code
 #[allow(clippy::unwrap_used)]
+// PANIC SAFETY: this is all test code
 #[allow(clippy::expect_used)]
 fn perform_integration_test_from_json(jsonfile: impl AsRef<Path>) {
     let jsonfile = resolve_integration_test_path(jsonfile);
diff --git a/cedar-policy-cli/tests/sample.rs b/cedar-policy-cli/tests/sample.rs
index 40589cc98..dd6082d56 100644
--- a/cedar-policy-cli/tests/sample.rs
+++ b/cedar-policy-cli/tests/sample.rs
@@ -102,7 +102,9 @@ fn run_link_test(
     assert_eq!(output, expected);
 }
 
+// PANIC SAFETY: this is all test code
 #[allow(clippy::expect_used)]
+// PANIC SAFETY: this is all test code
 #[allow(clippy::unwrap_used)]
 fn run_format_test(policies_file: &str) {
     let format_cmd = assert_cmd::Command::cargo_bin("cedar")

From 65ab5530db724f96a38056ec0290c1397d0e6744 Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Mon, 2 Oct 2023 20:12:44 +0000
Subject: [PATCH 05/28] Updated changelog

---
 cedar-policy/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cedar-policy/CHANGELOG.md b/cedar-policy/CHANGELOG.md
index b9515d605..12743230f 100644
--- a/cedar-policy/CHANGELOG.md
+++ b/cedar-policy/CHANGELOG.md
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Removed `__expr` escape from Cedar JSON formats
 - Rename `cedar_policy_core::est::EstToAstError` to `cedar_policy_core::est::FromJsonError`.
 - Rename `cedar_policy_core::entities::JsonDeserializationError::ExtensionsError` to `cedar_policy_core::entities::JsonDeserializationError::FailedExtensionsFunctionLookup`.
 - Rename variants in `cedar_policy::SchemaError`.

From 72093410889eccadd261d868938016188a645732 Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Mon, 2 Oct 2023 20:20:48 +0000
Subject: [PATCH 06/28] Updated docs to remove __expr

---
 cedar-policy-core/src/entities.rs            | 4 ++--
 cedar-policy-core/src/entities/json/err.rs   | 9 +--------
 cedar-policy-core/src/entities/json/value.rs | 8 +++-----
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/cedar-policy-core/src/entities.rs b/cedar-policy-core/src/entities.rs
index 5ed5b801a..d30ada2b1 100644
--- a/cedar-policy-core/src/entities.rs
+++ b/cedar-policy-core/src/entities.rs
@@ -1009,7 +1009,7 @@ mod json_parsing_tests {
     }
 
     #[cfg(feature = "ipaddr")]
-    /// this one uses `__expr`, `__entity`, and `__extn` escapes, in various positions
+    /// this one uses `__entity`, and `__extn` escapes, in various positions
     #[test]
     fn more_escapes() {
         let json = serde_json::json!(
@@ -1093,7 +1093,7 @@ mod json_parsing_tests {
 
     #[test]
     fn implicit_and_explicit_escapes() {
-        // this one tests the implicit and explicit forms of `__expr` and `__entity` escapes
+        // this one tests the implicit and explicit forms of `__entity` escapes
         // for the `uid` and `parents` fields
         let json = serde_json::json!(
             [
diff --git a/cedar-policy-core/src/entities/json/err.rs b/cedar-policy-core/src/entities/json/err.rs
index 988dee61a..d2b4d8f30 100644
--- a/cedar-policy-core/src/entities/json/err.rs
+++ b/cedar-policy-core/src/entities/json/err.rs
@@ -29,10 +29,6 @@ use thiserror::Error;
 /// Escape kind
 #[derive(Debug)]
 pub enum EscapeKind {
-    /// Escape `__expr`
-    /// Note that `__expr` is deprecated and once it is
-    /// removed, this variant will also be removed
-    Expr,
     /// Escape `__entity`
     Entity,
     /// Escape `__extn`
@@ -43,7 +39,6 @@ impl Display for EscapeKind {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             Self::Entity => write!(f, "__entity"),
-            Self::Expr => write!(f, "__expr"),
             Self::Extension => write!(f, "__extn"),
         }
     }
@@ -56,9 +51,7 @@ pub enum JsonDeserializationError {
     #[error(transparent)]
     Serde(#[from] serde_json::Error),
     /// Contents of an escape failed to parse.
-    /// Note that escape `__expr` is deprecated and once it is
-    /// removed, `EscapeKind::Expr` will also be removed
-    #[error("failed to parse escape `{kind}` with value `{value}`: {errs}")]
+    #[error("failed to parse escape `{kind}`: {value}, errors: {errs}")]
     ParseEscape {
         /// Escape kind
         kind: EscapeKind,
diff --git a/cedar-policy-core/src/entities/json/value.rs b/cedar-policy-core/src/entities/json/value.rs
index e575d3d09..be6f9a85d 100644
--- a/cedar-policy-core/src/entities/json/value.rs
+++ b/cedar-policy-core/src/entities/json/value.rs
@@ -35,7 +35,7 @@ use std::collections::{BTreeMap, HashMap, HashSet};
 /// Many Cedar values have a natural one-to-one mapping to and from JSON values.
 /// Cedar values of some types, like entity references or extension values,
 /// cannot easily be represented in JSON and thus are represented using the
-/// `__expr`, `__entity`, or `__extn` escapes.
+/// `__entity`, or `__extn` escapes.
 ///
 /// For example, this is the JSON format for attribute values expected by
 /// `EntityJsonParser`, when schema-based parsing is not used.
@@ -45,8 +45,7 @@ pub enum CedarValueJson {
     /// Special JSON object with single reserved "__entity" key:
     /// the following item should be a JSON object of the form
     /// `{ "type": "xxx", "id": "yyy" }`.
-    /// Some escape (this or `__expr`, which is deprecated) is necessary for
-    /// entity references.
+    /// Some escape is necessary for entity references.
     //
     // listed before `Record` so that it takes priority: otherwise, the escape
     // would be interpreted as a Record with a key "__entity". see docs on
@@ -58,8 +57,7 @@ pub enum CedarValueJson {
     /// Special JSON object with single reserved "__extn" key:
     /// the following item should be a JSON object of the form
     /// `{ "fn": "xxx", "arg": "yyy" }`.
-    /// Some escape (this or `__expr`, which is deprecated) is necessary for
-    /// extension values.
+    /// Some escape is necessary for extension values.
     //
     // listed before `Record` so that it takes priority: otherwise, the escape
     // would be interpreted as a Record with a key "__extn". see docs on

From 7a0b19bc4f4b135b43804816b4de41b933c48bb2 Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Wed, 4 Oct 2023 14:55:03 +0000
Subject: [PATCH 07/28] Updating a test

---
 cedar-policy-core/src/entities.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cedar-policy-core/src/entities.rs b/cedar-policy-core/src/entities.rs
index d30ada2b1..05c85606b 100644
--- a/cedar-policy-core/src/entities.rs
+++ b/cedar-policy-core/src/entities.rs
@@ -1227,7 +1227,7 @@ mod json_parsing_tests {
         match err {
             EntitiesError::Deserialization(err) => assert!(
                 err.to_string().contains(
-                    r#"expected a literal entity reference, but got `{"spam":"eggs","type":"foo"}`"#
+                    r#"expected a literal entity reference, but got `{"type":"foo","spam":"eggs"}`"#
                 ),
                 "Actual error message was: {}",
                 err

From e97a511c4da3fffaaf63862617c36e29cdd1b409 Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Wed, 4 Oct 2023 15:51:28 +0000
Subject: [PATCH 08/28] Updating tests

---
 cedar-policy-core/src/entities.rs          |  2 +-
 cedar-policy-core/src/entities/json/err.rs | 26 +++++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/cedar-policy-core/src/entities.rs b/cedar-policy-core/src/entities.rs
index 05c85606b..d30ada2b1 100644
--- a/cedar-policy-core/src/entities.rs
+++ b/cedar-policy-core/src/entities.rs
@@ -1227,7 +1227,7 @@ mod json_parsing_tests {
         match err {
             EntitiesError::Deserialization(err) => assert!(
                 err.to_string().contains(
-                    r#"expected a literal entity reference, but got `{"type":"foo","spam":"eggs"}`"#
+                    r#"expected a literal entity reference, but got `{"spam":"eggs","type":"foo"}`"#
                 ),
                 "Actual error message was: {}",
                 err
diff --git a/cedar-policy-core/src/entities/json/err.rs b/cedar-policy-core/src/entities/json/err.rs
index d2b4d8f30..7bda38e60 100644
--- a/cedar-policy-core/src/entities/json/err.rs
+++ b/cedar-policy-core/src/entities/json/err.rs
@@ -23,6 +23,7 @@ use crate::ast::{
 use crate::extensions::ExtensionFunctionLookupError;
 use crate::parser::err::ParseErrors;
 use either::Either;
+use itertools::Itertools;
 use smol_str::SmolStr;
 use thiserror::Error;
 
@@ -67,7 +68,7 @@ pub enum JsonDeserializationError {
     #[error(transparent)]
     FailedExtensionFunctionLookup(#[from] ExtensionFunctionLookupError),
     /// A field that needs to be a literal entity reference, was some other JSON value
-    #[error("{ctx}, expected a literal entity reference, but got `{got}`")]
+    #[error("{ctx}, expected a literal entity reference, but got `{}`", display_json_value(.got.as_ref()))]
     ExpectedLiteralEntityRef {
         /// Context of this error
         ctx: Box<JsonDeserializationErrorContext>,
@@ -293,3 +294,26 @@ impl std::fmt::Display for JsonDeserializationErrorContext {
         }
     }
 }
+
+fn display_json_value(v: &Either<serde_json::Value, Expr>) -> String {
+    match v {
+        Either::Left(json) => display_value(json),
+        Either::Right(e) => e.to_string(),
+    }
+}
+
+fn display_value(v: &serde_json::Value) -> String {
+    match v {
+        serde_json::Value::Array(contents) => {
+            format!("[{}]", contents.iter().map(display_value).join(", "))
+        }
+        serde_json::Value::Object(map) => {
+            let mut v: Vec<_> = map.iter().collect();
+            // We sort the keys here so that our error messages are consistent and defined
+            v.sort_by_key(|p| p.0);
+            let display_kv = |kv: &(&String, &serde_json::Value)| format!("\"{}\":{}", kv.0, kv.1);
+            format!("{{{}}}", v.iter().map(display_kv).join(","))
+        }
+        other => other.to_string(),
+    }
+}

From 715efb338995a5deb72d4f75f55154f0342ec135 Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Fri, 6 Oct 2023 15:15:35 -0400
Subject: [PATCH 09/28] Update cedar-policy-core/src/entities/json/jsonvalue.rs

Co-authored-by: Craig Disselkoen <cdiss@amazon.com>
---
 cedar-policy-core/src/entities/json/value.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cedar-policy-core/src/entities/json/value.rs b/cedar-policy-core/src/entities/json/value.rs
index be6f9a85d..e2f67c4c6 100644
--- a/cedar-policy-core/src/entities/json/value.rs
+++ b/cedar-policy-core/src/entities/json/value.rs
@@ -45,7 +45,7 @@ pub enum CedarValueJson {
     /// Special JSON object with single reserved "__entity" key:
     /// the following item should be a JSON object of the form
     /// `{ "type": "xxx", "id": "yyy" }`.
-    /// Some escape is necessary for entity references.
+    /// This escape is necessary for entity references.
     //
     // listed before `Record` so that it takes priority: otherwise, the escape
     // would be interpreted as a Record with a key "__entity". see docs on

From e423eb46e3521e9a08e2c003825b523472450ba6 Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Fri, 6 Oct 2023 15:15:42 -0400
Subject: [PATCH 10/28] Update cedar-policy-core/src/entities.rs

Co-authored-by: Craig Disselkoen <cdiss@amazon.com>
---
 cedar-policy-core/src/entities.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cedar-policy-core/src/entities.rs b/cedar-policy-core/src/entities.rs
index d30ada2b1..69e258e64 100644
--- a/cedar-policy-core/src/entities.rs
+++ b/cedar-policy-core/src/entities.rs
@@ -1009,7 +1009,7 @@ mod json_parsing_tests {
     }
 
     #[cfg(feature = "ipaddr")]
-    /// this one uses `__entity`, and `__extn` escapes, in various positions
+    /// this one uses `__entity` and `__extn` escapes, in various positions
     #[test]
     fn more_escapes() {
         let json = serde_json::json!(

From 0f18131e424f2bd8e73ea40ad21bed834c429df5 Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Fri, 6 Oct 2023 15:15:49 -0400
Subject: [PATCH 11/28] Update cedar-policy-core/src/entities/json/jsonvalue.rs

Co-authored-by: Craig Disselkoen <cdiss@amazon.com>
---
 cedar-policy-core/src/entities/json/value.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cedar-policy-core/src/entities/json/value.rs b/cedar-policy-core/src/entities/json/value.rs
index e2f67c4c6..ceed5b051 100644
--- a/cedar-policy-core/src/entities/json/value.rs
+++ b/cedar-policy-core/src/entities/json/value.rs
@@ -57,7 +57,7 @@ pub enum CedarValueJson {
     /// Special JSON object with single reserved "__extn" key:
     /// the following item should be a JSON object of the form
     /// `{ "fn": "xxx", "arg": "yyy" }`.
-    /// Some escape is necessary for extension values.
+    /// This escape is necessary for extension values.
     //
     // listed before `Record` so that it takes priority: otherwise, the escape
     // would be interpreted as a Record with a key "__extn". see docs on

From c265a8a64149cc504a867aef827ee2b7a0838999 Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Fri, 6 Oct 2023 15:16:09 -0400
Subject: [PATCH 12/28] Update cedar-policy-core/src/entities/json/jsonvalue.rs

Co-authored-by: Craig Disselkoen <cdiss@amazon.com>
---
 cedar-policy-core/src/entities/json/value.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cedar-policy-core/src/entities/json/value.rs b/cedar-policy-core/src/entities/json/value.rs
index ceed5b051..9809739da 100644
--- a/cedar-policy-core/src/entities/json/value.rs
+++ b/cedar-policy-core/src/entities/json/value.rs
@@ -594,7 +594,7 @@ pub enum EntityUidJson {
     /// structure
     ImplicitEntityEscape(TypeAndId),
 
-    /// Implicit catch-call case for error handling
+    /// Implicit catch-all case for error handling
     FoundValue(serde_json::Value),
 }
 

From b558dbbf6ee1491000f0facc9ed0892f2dc5e5fb Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Thu, 5 Oct 2023 15:01:59 +0000
Subject: [PATCH 13/28] Updating panic safety

---
 cedar-policy-core/src/ast/request.rs          |    21 +-
 .../src/extensions/decimal.rs                 |    11 +-
 .../src/extensions/ipaddr.rs                  |    11 +-
 .../src/extensions/partial_evaluation.rs      |     9 +-
 cedar-policy-validator/src/typecheck.rs       |    27 +-
 cedar-policy/dhat-heap.json                   | 35057 ++++++++++++++++
 panic_safety.sh                               |     2 +-
 7 files changed, 35103 insertions(+), 35 deletions(-)
 create mode 100644 cedar-policy/dhat-heap.json

diff --git a/cedar-policy-core/src/ast/request.rs b/cedar-policy-core/src/ast/request.rs
index ab45acadb..6107e85e5 100644
--- a/cedar-policy-core/src/ast/request.rs
+++ b/cedar-policy-core/src/ast/request.rs
@@ -155,7 +155,8 @@ impl std::fmt::Display for Request {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Context {
     /// an `Expr::Record` that qualifies as a "restricted expression"
-    // INVARIANT: `context` must be a `Record`
+    /// INVARIANT: This must be of the variant `Record`
+    /// TOOD: This should be refactored if possible to require this runtime invariant
     #[serde(flatten)]
     context: RestrictedExpr,
 }
@@ -168,16 +169,11 @@ impl Context {
         Self::from_pairs([]).expect("empty set of keys cannot contain a duplicate key")
     }
 
-    /// Create a `Context` from a `RestrictedExpr`, which must be a `Record`.
-    /// If it is not a `Record`, then this function returns `Err` (returning
-    /// ownership of the non-record expression), otherwise it returns `Ok` of
-    /// a context for that record.
-    pub fn from_expr(expr: RestrictedExpr) -> Result<Self, RestrictedExpr> {
-        match expr.expr_kind() {
-            // INVARIANT: `context` must be a `Record`, which is guaranteed by the match case.
-            ExprKind::Record { .. } => Ok(Self { context: expr }),
-            _ => Err(expr),
-        }
+    /// Create a `Context` from a `RestrictedExpr`, which must be a `Record`
+    /// INVARIANT: It is only legal to call this function with the `Record` variant
+    pub fn from_expr(expr: RestrictedExpr) -> Self {
+        debug_assert!(matches!(expr.expr_kind(), ExprKind::Record { .. }));
+        Self { context: expr }
     }
 
     /// Create a `Context` from a map of key to `RestrictedExpr`, or a Vec of
@@ -186,6 +182,7 @@ impl Context {
     pub fn from_pairs(
         pairs: impl IntoIterator<Item = (SmolStr, RestrictedExpr)>,
     ) -> Result<Self, ExprConstructionError> {
+        // INVARIANT this always constructs a record
         Ok(Self {
             context: RestrictedExpr::record(pairs)?,
         })
@@ -228,6 +225,8 @@ impl Context {
     }
 
     /// Iterate over the (key, value) pairs in the `Context`
+    // PANIC SAFETY: This is safe due to the invariant on `self.context`, `self.context` must always be a record
+    #[allow(clippy::panic)]
     pub fn iter(&self) -> impl Iterator<Item = (&str, BorrowedRestrictedExpr<'_>)> {
         // PANIC SAFETY invariant on `self.context` ensures that it is a Record
         #[allow(clippy::panic)]
diff --git a/cedar-policy-validator/src/extensions/decimal.rs b/cedar-policy-validator/src/extensions/decimal.rs
index 19daa20ac..6cef42ab0 100644
--- a/cedar-policy-validator/src/extensions/decimal.rs
+++ b/cedar-policy-validator/src/extensions/decimal.rs
@@ -25,7 +25,12 @@ use cedar_policy_core::evaluator::RestrictedEvaluator;
 use cedar_policy_core::extensions::{decimal, Extensions};
 use std::str::FromStr;
 
-// PANIC SAFETY see note on panic safety above
+/// Note on safety:
+/// This module depends on the Cedar parser only constructing AST with valid extension calls
+/// If any of the panics in this file are triggered, that means that this file has become
+/// out-of-date with the decimal extension definition in CedarCore.
+
+// PANIC SAFETY see `Note on safety` above
 #[allow(clippy::panic)]
 fn get_argument_types(fname: &str, decimal_ty: &Type) -> Vec<types::Type> {
     match fname {
@@ -37,7 +42,7 @@ fn get_argument_types(fname: &str, decimal_ty: &Type) -> Vec<types::Type> {
     }
 }
 
-// PANIC SAFETY see note on panic safety above
+// PANIC SAFETY see `Note on safety` above
 #[allow(clippy::panic)]
 fn get_return_type(fname: &str, decimal_ty: &Type) -> Type {
     match fname {
@@ -49,7 +54,7 @@ fn get_return_type(fname: &str, decimal_ty: &Type) -> Type {
     }
 }
 
-// PANIC SAFETY see note on panic safety above
+// PANIC SAFETY see `Note on safety` above
 #[allow(clippy::panic)]
 fn get_argument_check(fname: &str) -> Option<ArgumentCheckFn> {
     match fname {
diff --git a/cedar-policy-validator/src/extensions/ipaddr.rs b/cedar-policy-validator/src/extensions/ipaddr.rs
index e25cf9a54..8fe97956c 100644
--- a/cedar-policy-validator/src/extensions/ipaddr.rs
+++ b/cedar-policy-validator/src/extensions/ipaddr.rs
@@ -25,7 +25,12 @@ use cedar_policy_core::evaluator::RestrictedEvaluator;
 use cedar_policy_core::extensions::{ipaddr, Extensions};
 use std::str::FromStr;
 
-// PANIC SAFETY see note on panic safety above
+/// Note on safety:
+/// This module depends on the Cedar parser only constructing AST with valid extension calls
+/// If any of the panics in this file are triggered, that means that this file has become
+/// out-of-date with the ipaddr extension definition in CedarCore.
+
+// PANIC SAFETY see `Note on safety` above
 #[allow(clippy::panic)]
 fn get_argument_types(fname: &str, ipaddr_ty: &Type) -> Vec<types::Type> {
     match fname {
@@ -36,7 +41,7 @@ fn get_argument_types(fname: &str, ipaddr_ty: &Type) -> Vec<types::Type> {
     }
 }
 
-// PANIC SAFETY see note on panic safety above
+// PANIC SAFETY see `Note on safety` above
 #[allow(clippy::panic)]
 fn get_return_type(fname: &str, ipaddr_ty: &Type) -> Type {
     match fname {
@@ -48,7 +53,7 @@ fn get_return_type(fname: &str, ipaddr_ty: &Type) -> Type {
     }
 }
 
-// PANIC SAFETY see note on panic safety above
+// PANIC SAFETY see `Note on safety` above
 #[allow(clippy::panic)]
 fn get_argument_check(fname: &str) -> Option<ArgumentCheckFn> {
     match fname {
diff --git a/cedar-policy-validator/src/extensions/partial_evaluation.rs b/cedar-policy-validator/src/extensions/partial_evaluation.rs
index 409e425e7..2f2268f85 100644
--- a/cedar-policy-validator/src/extensions/partial_evaluation.rs
+++ b/cedar-policy-validator/src/extensions/partial_evaluation.rs
@@ -22,7 +22,12 @@ use crate::extension_schema::{ExtensionFunctionType, ExtensionSchema};
 use crate::types::{self, Type};
 use cedar_policy_core::extensions::partial_evaluation;
 
-// PANIC SAFETY see note on panic safety above
+/// Note on safety:
+/// This module depends on the Cedar parser only constructing AST with valid extension calls
+/// If any of the panics in this file are triggered, that means that this file has become
+/// out-of-date with the decimal extension definition in CedarCore.
+
+// PANIC SAFETY see `Note on safety` above
 #[allow(clippy::panic)]
 fn get_argument_types(fname: &str) -> Vec<types::Type> {
     match fname {
@@ -32,7 +37,7 @@ fn get_argument_types(fname: &str) -> Vec<types::Type> {
     }
 }
 
-// PANIC SAFETY see note on panic safety above
+// PANIC SAFETY see `Note on safety` above
 #[allow(clippy::panic)]
 fn get_return_type(fname: &str) -> Type {
     match fname {
diff --git a/cedar-policy-validator/src/typecheck.rs b/cedar-policy-validator/src/typecheck.rs
index cfb9cb0c1..8dea1b3cf 100644
--- a/cedar-policy-validator/src/typecheck.rs
+++ b/cedar-policy-validator/src/typecheck.rs
@@ -914,19 +914,19 @@ impl<'a> Typechecker<'a> {
             }
 
             ExprKind::UnaryApp { .. } => {
-                // INVARIANT `e` is a `UnaryApp`, as required
+                // INVARIANT: typecheck_unary requires a `UnaryApp`, we've just ensured this
                 self.typecheck_unary(request_env, prior_eff, e, type_errors)
             }
             ExprKind::BinaryApp { .. } => {
-                // INVARIANT `e` is a `BinaryApp`, as required
+                // INVARIANT: typecheck_binary requires a `BinaryApp`, we've just ensured this
                 self.typecheck_binary(request_env, prior_eff, e, type_errors)
             }
             ExprKind::MulByConst { .. } => {
-                // INVARIANT `e` is a `MulByConst`, as required
+                // INVARIANT: typecheck_mul requires a `MulByConst`, we've just ensured this
                 self.typecheck_mul(request_env, prior_eff, e, type_errors)
             }
             ExprKind::ExtensionFunctionApp { .. } => {
-                // INVARIANT `e` is a `ExtensionFunctionApp`, as required
+                // INVARIANT: typecheck_extension requires a `ExtensionFunctionApp`, we've just ensured this
                 self.typecheck_extension(request_env, prior_eff, e, type_errors)
             }
 
@@ -1205,7 +1205,7 @@ impl<'a> Typechecker<'a> {
 
     /// A utility called by the main typecheck method to handle binary operator
     /// application.
-    /// INVARIANT `bin_expr` must be a `BinaryApp`
+    /// INVARIANT: `bin_expr` must be a `BinaryApp`
     fn typecheck_binary<'b>(
         &self,
         request_env: &RequestEnv,
@@ -1213,7 +1213,7 @@ impl<'a> Typechecker<'a> {
         bin_expr: &'b Expr,
         type_errors: &mut Vec<TypeError>,
     ) -> TypecheckAnswer<'b> {
-        // PANIC SAFETY by invariant on method
+        // PANIC SAFETY: maintained by invariant on this function
         #[allow(clippy::panic)]
         let ExprKind::BinaryApp { op, arg1, arg2 } = bin_expr.expr_kind() else {
             panic!("`typecheck_binary` called with an expression kind other than `BinaryApp`");
@@ -1424,7 +1424,7 @@ impl<'a> Typechecker<'a> {
 
     /// Like `typecheck_binary()`, but for multiplication, which isn't
     /// technically a `BinaryOp`
-    /// INVARIANT `mul_expr` must be a `MulByConst`
+    /// INVARIANT: must be called `mul_expr` being a `MulByConst`
     fn typecheck_mul<'b>(
         &self,
         request_env: &RequestEnv,
@@ -1432,7 +1432,7 @@ impl<'a> Typechecker<'a> {
         mul_expr: &'b Expr,
         type_errors: &mut Vec<TypeError>,
     ) -> TypecheckAnswer<'b> {
-        // PANIC SAFETY by invariant on method
+        // PANIC SAFETY: maintained by invariant on this function
         #[allow(clippy::panic)]
         let ExprKind::MulByConst { arg, constant } = mul_expr.expr_kind() else {
             panic!("`typecheck_mul` called with an expression kind other than `MulByConst`");
@@ -1933,7 +1933,7 @@ impl<'a> Typechecker<'a> {
 
     /// A utility called by the main typecheck method to handle unary operator
     /// application.
-    /// INVARIANT `unary_expr` must be a UnaryApp
+    /// INVARIANT: `unary_expr` must be of kind `UnaryApp`
     fn typecheck_unary<'b>(
         &self,
         request_env: &RequestEnv,
@@ -1941,11 +1941,8 @@ impl<'a> Typechecker<'a> {
         unary_expr: &'b Expr,
         type_errors: &mut Vec<TypeError>,
     ) -> TypecheckAnswer<'b> {
-        // PANIC SAFETY by invariant on method
-        #[allow(clippy::panic)]
-        let ExprKind::UnaryApp { op, arg } = unary_expr.expr_kind() else {
-            panic!("`typecheck_unary` called with an expression kind other than `UnaryApp`");
-        };
+        // PANIC SAFETY maintained by invariant on this function
+        panic!("`typecheck_unary` called with an expression kind other than `UnaryApp`");
         match op {
             UnaryOp::Not => {
                 let ans_arg = self.expect_type(
@@ -2150,7 +2147,7 @@ impl<'a> Typechecker<'a> {
         ext_expr: &'b Expr,
         type_errors: &mut Vec<TypeError>,
     ) -> TypecheckAnswer<'b> {
-        // PANIC SAFETY by invariant on method
+        // PANIC SAFETY maintained by invariant on this function
         #[allow(clippy::panic)]
         let ExprKind::ExtensionFunctionApp { fn_name, args } = ext_expr.expr_kind() else {
             panic!("`typecheck_extension` called with an expression kind other than `ExtensionFunctionApp`");
diff --git a/cedar-policy/dhat-heap.json b/cedar-policy/dhat-heap.json
new file mode 100644
index 000000000..838893b15
--- /dev/null
+++ b/cedar-policy/dhat-heap.json
@@ -0,0 +1,35057 @@
+{
+"dhatFileVersion": 2,
+"mode": "rust-heap",
+"verb": "Allocated",
+"bklt": true,
+"bkacc": false,
+"tu": "µs",
+"Mtu": "s",
+"tuth": 10,
+"cmd": "/local/home/aeline/cedar-github/cedar/target/debug/deps/corpus_tests-d070eacac1130215 --ignored",
+"pid": 4229,
+"tg": 61203296,
+"te": 64895887,
+"pps": [
+{
+"tb": 5376,
+"tbk": 48,
+"tl": 38609,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+4,
+5,
+6,
+7,
+8
+]
+},
+{
+"tb": 792020,
+"tbk": 1953,
+"tl": 468658,
+"mb": 1488,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+14,
+15,
+16,
+17
+]
+},
+{
+"tb": 48,
+"tbk": 1,
+"tl": 64597180,
+"mb": 48,
+"mbk": 1,
+"gb": 48,
+"gbk": 1,
+"eb": 48,
+"ebk": 1,
+"fs": [
+1,
+18,
+19,
+20,
+21,
+22,
+23,
+24,
+25
+]
+},
+{
+"tb": 40,
+"tbk": 1,
+"tl": 64597790,
+"mb": 40,
+"mbk": 1,
+"gb": 40,
+"gbk": 1,
+"eb": 40,
+"ebk": 1,
+"fs": [
+1,
+26,
+27,
+28,
+29,
+30,
+31,
+32,
+33
+]
+},
+{
+"tb": 8160,
+"tbk": 24,
+"tl": 468,
+"mb": 340,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+34,
+35,
+36,
+37
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 861,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+39,
+40,
+41,
+42,
+40
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 881,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+44,
+45,
+46,
+46,
+47
+]
+},
+{
+"tb": 7702560,
+"tbk": 139176,
+"tl": 74954332,
+"mb": 2012,
+"mbk": 38,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+48,
+49,
+50,
+51,
+52,
+53,
+54,
+55
+]
+},
+{
+"tb": 25088,
+"tbk": 224,
+"tl": 121640,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+4,
+5,
+6,
+7,
+56
+]
+},
+{
+"tb": 2787600,
+"tbk": 7575,
+"tl": 1338419,
+"mb": 4416,
+"mbk": 12,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+58,
+59,
+60,
+61,
+62,
+63
+]
+},
+{
+"tb": 1158656,
+"tbk": 12840,
+"tl": 819934,
+"mb": 128,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+65,
+66,
+67,
+68,
+69,
+70,
+71,
+72
+]
+},
+{
+"tb": 160896,
+"tbk": 412,
+"tl": 115890,
+"mb": 1536,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+73,
+74,
+75,
+76,
+77,
+78,
+79,
+80,
+81,
+82
+]
+},
+{
+"tb": 106344,
+"tbk": 1899,
+"tl": 6945,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+83,
+84,
+85,
+85,
+85,
+47
+]
+},
+{
+"tb": 3584,
+"tbk": 32,
+"tl": 31275,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+86,
+87,
+88,
+7,
+89
+]
+},
+{
+"tb": 37880,
+"tbk": 947,
+"tl": 26881,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+91,
+92,
+93,
+94,
+95,
+96,
+97
+]
+},
+{
+"tb": 10032,
+"tbk": 57,
+"tl": 1899,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+100,
+101,
+102,
+103,
+104
+]
+},
+{
+"tb": 22400,
+"tbk": 200,
+"tl": 109699,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+105,
+106,
+107,
+7,
+56
+]
+},
+{
+"tb": 6141696,
+"tbk": 70469,
+"tl": 56618252,
+"mb": 7872,
+"mbk": 88,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+65,
+108,
+109,
+110,
+111,
+112,
+113,
+114,
+115,
+116
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 861,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+117,
+118,
+119,
+46,
+85
+]
+},
+{
+"tb": 5760,
+"tbk": 80,
+"tl": 89049,
+"mb": 144,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+122,
+123,
+124,
+125,
+126
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 5971,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+129,
+130,
+131,
+7,
+132
+]
+},
+{
+"tb": 7680,
+"tbk": 16,
+"tl": 391,
+"mb": 480,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+133,
+134,
+135,
+136,
+137,
+138,
+139,
+140,
+141,
+142
+]
+},
+{
+"tb": 414848,
+"tbk": 3704,
+"tl": 2087253,
+"mb": 448,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+143,
+144,
+145,
+7,
+146
+]
+},
+{
+"tb": 1027200,
+"tbk": 12840,
+"tl": 22790576,
+"mb": 80,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+148,
+149,
+150,
+151,
+152,
+153,
+154,
+155
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 13630,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+156,
+157,
+158,
+7,
+159
+]
+},
+{
+"tb": 760,
+"tbk": 19,
+"tl": 699464,
+"mb": 520,
+"mbk": 13,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+160,
+161,
+162,
+163,
+164,
+165,
+166
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 3832,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+129,
+130,
+131,
+7,
+167
+]
+},
+{
+"tb": 606093,
+"tbk": 14,
+"tl": 23988380,
+"mb": 303104,
+"mbk": 1,
+"gb": 303104,
+"gbk": 1,
+"eb": 303104,
+"ebk": 1,
+"fs": [
+168,
+169,
+170,
+171,
+172,
+173,
+174,
+175,
+176,
+177,
+178,
+179,
+180,
+181,
+182,
+183,
+184,
+185,
+186,
+187,
+188
+]
+},
+{
+"tb": 187136,
+"tbk": 272,
+"tl": 110886,
+"mb": 2064,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+189,
+190,
+191,
+192,
+193,
+194
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6331,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+4,
+5,
+6,
+7,
+195
+]
+},
+{
+"tb": 2048,
+"tbk": 4,
+"tl": 258616823,
+"mb": 2048,
+"mbk": 4,
+"gb": 2048,
+"gbk": 4,
+"eb": 2048,
+"ebk": 4,
+"fs": [
+9,
+196,
+197,
+198,
+199,
+200,
+201,
+202,
+203
+]
+},
+{
+"tb": 7723200,
+"tbk": 3218,
+"tl": 62658012,
+"mb": 3200,
+"mbk": 1,
+"gb": 3200,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+206,
+207,
+208,
+209,
+210
+]
+},
+{
+"tb": 3136,
+"tbk": 196,
+"tl": 12682464116,
+"mb": 3136,
+"mbk": 196,
+"gb": 3136,
+"gbk": 196,
+"eb": 3136,
+"ebk": 196,
+"fs": [
+211,
+212,
+213,
+214,
+215,
+216,
+217,
+218
+]
+},
+{
+"tb": 1015144,
+"tbk": 6802,
+"tl": 4610678,
+"mb": 1992,
+"mbk": 9,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+219,
+220,
+221,
+222
+]
+},
+{
+"tb": 9760,
+"tbk": 244,
+"tl": 6447,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+223,
+224,
+225,
+226,
+227,
+228,
+229
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 823,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+117,
+41,
+46,
+46,
+47
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 4734,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+129,
+130,
+131,
+7,
+230
+]
+},
+{
+"tb": 77184,
+"tbk": 1072,
+"tl": 2784,
+"mb": 72,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+232,
+233,
+234,
+235,
+236,
+237,
+238
+]
+},
+{
+"tb": 4288,
+"tbk": 196,
+"tl": 1143,
+"mb": 80,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+239,
+240,
+241,
+242,
+243,
+244,
+245,
+246,
+247,
+248
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 6299,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+160,
+161,
+249,
+250,
+251,
+7,
+167
+]
+},
+{
+"tb": 2288,
+"tbk": 13,
+"tl": 3549,
+"mb": 528,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+252,
+253,
+254,
+255,
+256
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 7169,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+257,
+258,
+259,
+7,
+56
+]
+},
+{
+"tb": 2688,
+"tbk": 4,
+"tl": 996,
+"mb": 672,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+260,
+261,
+262,
+263,
+264
+]
+},
+{
+"tb": 49280,
+"tbk": 440,
+"tl": 305641,
+"mb": 336,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+156,
+157,
+158,
+7,
+230
+]
+},
+{
+"tb": 9856,
+"tbk": 88,
+"tl": 53588,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+265,
+157,
+158,
+7,
+8
+]
+},
+{
+"tb": 576,
+"tbk": 9,
+"tl": 293465,
+"mb": 192,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+266,
+267,
+268,
+269,
+270,
+271,
+272
+]
+},
+{
+"tb": 154224,
+"tbk": 1605,
+"tl": 9500,
+"mb": 120,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+273,
+274,
+275,
+276,
+277,
+278,
+279,
+280,
+281
+]
+},
+{
+"tb": 4480,
+"tbk": 40,
+"tl": 29674,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+265,
+157,
+158,
+7,
+282
+]
+},
+{
+"tb": 8176,
+"tbk": 73,
+"tl": 5299778,
+"mb": 336,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+283,
+284,
+285,
+286,
+287
+]
+},
+{
+"tb": 17280,
+"tbk": 45,
+"tl": 880510,
+"mb": 384,
+"mbk": 1,
+"gb": 384,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+288,
+289,
+290,
+291,
+292,
+293,
+294,
+295,
+296
+]
+},
+{
+"tb": 28224,
+"tbk": 392,
+"tl": 25355908407,
+"mb": 28224,
+"mbk": 392,
+"gb": 28224,
+"gbk": 392,
+"eb": 28224,
+"ebk": 392,
+"fs": [
+204,
+297,
+298,
+299,
+300,
+301,
+302
+]
+},
+{
+"tb": 91168,
+"tbk": 814,
+"tl": 592401,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+143,
+144,
+303,
+304,
+305
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 887,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+39,
+40,
+306,
+306,
+46
+]
+},
+{
+"tb": 768,
+"tbk": 8,
+"tl": 74325,
+"mb": 96,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+307,
+308,
+309,
+310,
+311,
+312,
+237,
+238
+]
+},
+{
+"tb": 10240,
+"tbk": 256,
+"tl": 35400,
+"mb": 120,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+313,
+314,
+315,
+316,
+317,
+318,
+319
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 6959,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+160,
+161,
+249,
+250,
+251,
+7,
+230
+]
+},
+{
+"tb": 56448,
+"tbk": 112,
+"tl": 183,
+"mb": 1848,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+320,
+321,
+322,
+323,
+324,
+325
+]
+},
+{
+"tb": 15360,
+"tbk": 384,
+"tl": 228958,
+"mb": 120,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+326,
+327,
+328,
+329,
+106,
+107,
+7
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 13900,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+330,
+5,
+6,
+7,
+331
+]
+},
+{
+"tb": 1760,
+"tbk": 10,
+"tl": 2170,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+252,
+332,
+333,
+334,
+335
+]
+},
+{
+"tb": 40,
+"tbk": 1,
+"tl": 64598021,
+"mb": 40,
+"mbk": 1,
+"gb": 40,
+"gbk": 1,
+"eb": 40,
+"ebk": 1,
+"fs": [
+1,
+26,
+27,
+28,
+336,
+337,
+338,
+339,
+340
+]
+},
+{
+"tb": 3520,
+"tbk": 20,
+"tl": 3928,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+341,
+342,
+343,
+344,
+345
+]
+},
+{
+"tb": 6336,
+"tbk": 88,
+"tl": 107126,
+"mb": 144,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+346,
+347,
+348,
+349,
+350
+]
+},
+{
+"tb": 768,
+"tbk": 3,
+"tl": 48,
+"mb": 256,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+351,
+352,
+353,
+354,
+355,
+356,
+357,
+358,
+359,
+360
+]
+},
+{
+"tb": 48,
+"tbk": 2,
+"tl": 5,
+"mb": 24,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+361,
+362,
+363,
+364,
+365,
+366,
+367,
+368
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 881,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+117,
+41,
+45,
+46,
+85
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 9283,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+369,
+370,
+371,
+7,
+56
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 781,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+372,
+373,
+374,
+375,
+376,
+377
+]
+},
+{
+"tb": 2120,
+"tbk": 53,
+"tl": 1157252,
+"mb": 240,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+160,
+161,
+162,
+163,
+164,
+165,
+378
+]
+},
+{
+"tb": 565120,
+"tbk": 14128,
+"tl": 24275,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+379,
+380,
+381,
+382,
+383,
+384,
+385,
+386
+]
+},
+{
+"tb": 500864,
+"tbk": 4472,
+"tl": 2381676,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+143,
+144,
+145,
+7,
+387
+]
+},
+{
+"tb": 112,
+"tbk": 1,
+"tl": 64597771,
+"mb": 112,
+"mbk": 1,
+"gb": 112,
+"gbk": 1,
+"eb": 112,
+"ebk": 1,
+"fs": [
+1,
+388,
+389,
+390,
+391,
+23,
+24,
+25
+]
+},
+{
+"tb": 1280,
+"tbk": 32,
+"tl": 3140,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+392,
+393,
+46,
+85,
+46,
+47
+]
+},
+{
+"tb": 8160,
+"tbk": 24,
+"tl": 23814,
+"mb": 680,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+394,
+395,
+396,
+397
+]
+},
+{
+"tb": 288900,
+"tbk": 1605,
+"tl": 112025,
+"mb": 180,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+398,
+399,
+400,
+401
+]
+},
+{
+"tb": 280,
+"tbk": 7,
+"tl": 97,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+313,
+314,
+402,
+46,
+46,
+47,
+403
+]
+},
+{
+"tb": 3392,
+"tbk": 1696,
+"tl": 7512873,
+"mb": 10,
+"mbk": 5,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+414,
+415
+]
+},
+{
+"tb": 77040,
+"tbk": 1605,
+"tl": 513696,
+"mb": 48,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+416,
+417,
+418,
+419,
+420,
+421,
+422
+]
+},
+{
+"tb": 3520,
+"tbk": 20,
+"tl": 327,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+423,
+424,
+425,
+103,
+426
+]
+},
+{
+"tb": 113120,
+"tbk": 505,
+"tl": 12577,
+"mb": 224,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+427,
+428,
+429,
+430,
+431,
+432,
+433,
+434,
+435,
+436
+]
+},
+{
+"tb": 23160,
+"tbk": 579,
+"tl": 59187,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+437,
+46,
+47,
+403,
+438
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5878,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+439,
+440,
+441,
+7,
+442
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 848,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+117,
+443,
+45,
+46,
+85
+]
+},
+{
+"tb": 816256,
+"tbk": 7288,
+"tl": 651952,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+143,
+144,
+444,
+304,
+445
+]
+},
+{
+"tb": 924480,
+"tbk": 12840,
+"tl": 44426544,
+"mb": 72,
+"mbk": 1,
+"gb": 72,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+446,
+447,
+448,
+449,
+450,
+451,
+452
+]
+},
+{
+"tb": 352,
+"tbk": 2,
+"tl": 786,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+252,
+453,
+454,
+455,
+456
+]
+},
+{
+"tb": 352,
+"tbk": 2,
+"tl": 139,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+457,
+458,
+459,
+460,
+461
+]
+},
+{
+"tb": 9480,
+"tbk": 237,
+"tl": 24396,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+437,
+85,
+85,
+46,
+47
+]
+},
+{
+"tb": 10752,
+"tbk": 96,
+"tl": 59317,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+86,
+87,
+88,
+7,
+56
+]
+},
+{
+"tb": 56,
+"tbk": 1,
+"tl": 64597308,
+"mb": 56,
+"mbk": 1,
+"gb": 56,
+"gbk": 1,
+"eb": 56,
+"ebk": 1,
+"fs": [
+1,
+462,
+463,
+21,
+22,
+23,
+24,
+25
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 8590,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+4,
+5,
+6,
+7,
+89
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 4907,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+105,
+106,
+107,
+7,
+464
+]
+},
+{
+"tb": 256000,
+"tbk": 16,
+"tl": 7736,
+"mb": 16000,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+465,
+466,
+467,
+468,
+469,
+470,
+471,
+472
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 854,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+473,
+474,
+475,
+476,
+477,
+377
+]
+},
+{
+"tb": 2816,
+"tbk": 87,
+"tl": 5481650076,
+"mb": 2816,
+"mbk": 87,
+"gb": 2816,
+"gbk": 87,
+"eb": 2816,
+"ebk": 87,
+"fs": [
+9,
+478,
+479,
+480,
+481,
+482,
+483,
+484,
+485
+]
+},
+{
+"tb": 71232,
+"tbk": 336,
+"tl": 362427,
+"mb": 212,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+486,
+487,
+488,
+489
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5975,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+490,
+491,
+492,
+7,
+493
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5939,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+439,
+440,
+441,
+7,
+230
+]
+},
+{
+"tb": 42000,
+"tbk": 1750,
+"tl": 627142,
+"mb": 168,
+"mbk": 7,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+494,
+495,
+496,
+497,
+498,
+499,
+500
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6394,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+501,
+502,
+503,
+7,
+230
+]
+},
+{
+"tb": 873120,
+"tbk": 1605,
+"tl": 63038,
+"mb": 544,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+504,
+505,
+506,
+507,
+508,
+509,
+510,
+511,
+512
+]
+},
+{
+"tb": 3520,
+"tbk": 20,
+"tl": 455,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+100,
+424,
+425,
+103,
+426
+]
+},
+{
+"tb": 10944,
+"tbk": 152,
+"tl": 993054,
+"mb": 1368,
+"mbk": 19,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+513,
+514,
+515,
+516,
+517,
+237,
+238
+]
+},
+{
+"tb": 16058388,
+"tbk": 396289,
+"tl": 2253235,
+"mb": 280,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+518,
+519,
+520,
+521,
+522,
+523,
+524
+]
+},
+{
+"tb": 751140,
+"tbk": 1605,
+"tl": 845444,
+"mb": 468,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+525,
+526,
+527,
+528
+]
+},
+{
+"tb": 5560,
+"tbk": 139,
+"tl": 261,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+379,
+380,
+381,
+382,
+383,
+529,
+530,
+531
+]
+},
+{
+"tb": 40,
+"tbk": 1,
+"tl": 64597694,
+"mb": 40,
+"mbk": 1,
+"gb": 40,
+"gbk": 1,
+"eb": 40,
+"ebk": 1,
+"fs": [
+1,
+26,
+27,
+28,
+532,
+533,
+534,
+535,
+536
+]
+},
+{
+"tb": 116808,
+"tbk": 471,
+"tl": 21429,
+"mb": 248,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+537,
+538,
+94,
+95,
+96,
+97,
+229
+]
+},
+{
+"tb": 11120,
+"tbk": 278,
+"tl": 72231,
+"mb": 160,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+539,
+540,
+541,
+542,
+543,
+316,
+317
+]
+},
+{
+"tb": 1856,
+"tbk": 31,
+"tl": 209,
+"mb": 160,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+544,
+545,
+546,
+547,
+548,
+549,
+550,
+551,
+552,
+553,
+554
+]
+},
+{
+"tb": 89880,
+"tbk": 1605,
+"tl": 498503,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+555,
+418,
+419,
+420,
+421,
+422
+]
+},
+{
+"tb": 6912,
+"tbk": 112,
+"tl": 43640,
+"mb": 544,
+"mbk": 7,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+556,
+557,
+558,
+559,
+560
+]
+},
+{
+"tb": 33120,
+"tbk": 8280,
+"tl": 28695430,
+"mb": 24,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+572
+]
+},
+{
+"tb": 280,
+"tbk": 7,
+"tl": 771,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+573,
+574,
+118,
+46,
+46,
+47
+]
+},
+{
+"tb": 97920,
+"tbk": 32,
+"tl": 258626451,
+"mb": 49152,
+"mbk": 4,
+"gb": 49152,
+"gbk": 4,
+"eb": 49152,
+"ebk": 4,
+"fs": [
+204,
+205,
+575,
+576,
+577,
+578,
+579
+]
+},
+{
+"tb": 2496,
+"tbk": 3,
+"tl": 79,
+"mb": 832,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+580,
+581,
+582,
+583,
+584
+]
+},
+{
+"tb": 563150,
+"tbk": 4827,
+"tl": 36727,
+"mb": 200,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+168,
+169,
+170,
+171,
+585,
+586,
+587,
+588,
+589,
+590,
+591,
+592,
+593,
+594,
+595,
+452,
+596
+]
+},
+{
+"tb": 572992,
+"tbk": 5116,
+"tl": 743391,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+265,
+157,
+597,
+598,
+599
+]
+},
+{
+"tb": 42560,
+"tbk": 1064,
+"tl": 29473,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+600,
+601,
+602,
+603,
+604,
+229,
+605
+]
+},
+{
+"tb": 6144,
+"tbk": 32,
+"tl": 138,
+"mb": 192,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+606,
+607,
+608,
+609,
+610
+]
+},
+{
+"tb": 265049,
+"tbk": 55112,
+"tl": 1177840865,
+"mb": 904,
+"mbk": 32,
+"gb": 98,
+"gbk": 28,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+611,
+612
+]
+},
+{
+"tb": 90,
+"tbk": 1,
+"tl": 64895751,
+"mb": 90,
+"mbk": 1,
+"gb": 90,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+613,
+614,
+615,
+616,
+617,
+618,
+619,
+620,
+621,
+622,
+623,
+624,
+625,
+626
+]
+},
+{
+"tb": 1120,
+"tbk": 10,
+"tl": 599341,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+627,
+628,
+629,
+630,
+631
+]
+},
+{
+"tb": 21792,
+"tbk": 350,
+"tl": 220772,
+"mb": 288,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+632,
+633,
+634,
+635,
+636,
+637
+]
+},
+{
+"tb": 394496,
+"tbk": 95864,
+"tl": 74285493,
+"mb": 519,
+"mbk": 123,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+638,
+639,
+640,
+641,
+642,
+643,
+644,
+645,
+646,
+647,
+648,
+116,
+111,
+112,
+113,
+114,
+115,
+116
+]
+},
+{
+"tb": 595036,
+"tbk": 1732,
+"tl": 68433,
+"mb": 1668,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+649,
+650,
+651,
+652
+]
+},
+{
+"tb": 55552,
+"tbk": 496,
+"tl": 332076,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+490,
+491,
+492,
+7,
+8
+]
+},
+{
+"tb": 153216,
+"tbk": 1596,
+"tl": 162993,
+"mb": 96,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+653,
+654,
+655,
+656,
+657
+]
+},
+{
+"tb": 1624,
+"tbk": 29,
+"tl": 8126,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+658,
+659,
+660,
+661,
+662,
+663,
+664
+]
+},
+{
+"tb": 1120,
+"tbk": 10,
+"tl": 612537,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+665,
+666,
+667,
+668,
+669
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 867,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+392,
+393,
+41,
+45,
+46,
+85
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 874,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+39,
+40,
+42,
+40,
+670
+]
+},
+{
+"tb": 26120,
+"tbk": 653,
+"tl": 1192,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+379,
+380,
+381,
+382,
+383,
+671,
+672,
+531
+]
+},
+{
+"tb": 188280,
+"tbk": 35120,
+"tl": 1177479,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+638,
+639,
+640,
+641,
+642,
+643,
+644,
+645,
+646,
+647,
+115,
+116,
+111,
+112,
+113,
+114,
+673,
+674
+]
+},
+{
+"tb": 768,
+"tbk": 32,
+"tl": 16422,
+"mb": 48,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+675,
+676,
+677,
+678,
+679,
+680,
+681,
+682
+]
+},
+{
+"tb": 2534136,
+"tbk": 21846,
+"tl": 28377640,
+"mb": 232,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+683,
+684,
+685,
+686
+]
+},
+{
+"tb": 25536,
+"tbk": 277,
+"tl": 273198,
+"mb": 960,
+"mbk": 5,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+687,
+688,
+689,
+690,
+636,
+637
+]
+},
+{
+"tb": 640,
+"tbk": 16,
+"tl": 1670,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+691,
+46,
+85,
+46,
+47
+]
+},
+{
+"tb": 6960,
+"tbk": 412,
+"tl": 5647,
+"mb": 48,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+692,
+693,
+694,
+695,
+696
+]
+},
+{
+"tb": 1680,
+"tbk": 15,
+"tl": 927153,
+"mb": 336,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+697,
+698,
+699,
+700,
+701
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 7994,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+702,
+258,
+259,
+7,
+8
+]
+},
+{
+"tb": 3024,
+"tbk": 32,
+"tl": 1070277,
+"mb": 928,
+"mbk": 8,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+703,
+704,
+705
+]
+},
+{
+"tb": 704,
+"tbk": 4,
+"tl": 1028,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+706,
+707,
+708,
+709,
+710
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5816,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+711,
+440,
+441,
+7,
+159
+]
+},
+{
+"tb": 3288,
+"tbk": 816,
+"tl": 1008657,
+"mb": 33,
+"mbk": 18,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+712,
+713,
+714,
+715,
+716,
+717
+]
+},
+{
+"tb": 820512,
+"tbk": 7326,
+"tl": 388612,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+143,
+144,
+303,
+718,
+719
+]
+},
+{
+"tb": 336,
+"tbk": 3,
+"tl": 216466,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+720,
+721,
+722,
+668,
+669
+]
+},
+{
+"tb": 280,
+"tbk": 7,
+"tl": 693,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+117,
+45,
+118,
+46,
+46
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 830,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+723,
+42,
+40,
+46,
+85,
+46
+]
+},
+{
+"tb": 91104,
+"tbk": 470,
+"tl": 2021,
+"mb": 336,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+724,
+725,
+726,
+727,
+728,
+729
+]
+},
+{
+"tb": 2137860,
+"tbk": 14445,
+"tl": 59863926,
+"mb": 296,
+"mbk": 2,
+"gb": 148,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+730,
+731,
+732,
+733
+]
+},
+{
+"tb": 1760,
+"tbk": 10,
+"tl": 2081,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+341,
+332,
+333,
+334,
+335
+]
+},
+{
+"tb": 1536,
+"tbk": 16,
+"tl": 238,
+"mb": 96,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+734,
+735,
+736,
+737,
+738
+]
+},
+{
+"tb": 640,
+"tbk": 8,
+"tl": 1838,
+"mb": 80,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+739,
+740,
+42,
+40,
+42,
+40
+]
+},
+{
+"tb": 56,
+"tbk": 1,
+"tl": 64598846,
+"mb": 56,
+"mbk": 1,
+"gb": 56,
+"gbk": 1,
+"eb": 56,
+"ebk": 1,
+"fs": [
+1,
+555,
+418,
+741,
+742,
+23,
+24,
+25
+]
+},
+{
+"tb": 64,
+"tbk": 4,
+"tl": 258616869,
+"mb": 64,
+"mbk": 4,
+"gb": 64,
+"gbk": 4,
+"eb": 64,
+"ebk": 4,
+"fs": [
+211,
+212,
+213,
+203,
+743,
+744,
+745,
+746
+]
+},
+{
+"tb": 565120,
+"tbk": 14128,
+"tl": 27202,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+379,
+380,
+381,
+382,
+383,
+671,
+672,
+747
+]
+},
+{
+"tb": 176,
+"tbk": 1,
+"tl": 285,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+252,
+453,
+748,
+455,
+749
+]
+},
+{
+"tb": 40,
+"tbk": 1,
+"tl": 64598549,
+"mb": 40,
+"mbk": 1,
+"gb": 40,
+"gbk": 1,
+"eb": 40,
+"ebk": 1,
+"fs": [
+1,
+26,
+27,
+28,
+750,
+751,
+752,
+753,
+754
+]
+},
+{
+"tb": 5456,
+"tbk": 31,
+"tl": 6390,
+"mb": 528,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+706,
+755,
+708,
+709,
+756
+]
+},
+{
+"tb": 256,
+"tbk": 8,
+"tl": 6663,
+"mb": 32,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+757,
+758,
+759,
+760,
+761,
+762,
+763
+]
+},
+{
+"tb": 448,
+"tbk": 8,
+"tl": 1180,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+658,
+659,
+660,
+660,
+660,
+661,
+764
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 772,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+392,
+765,
+766,
+375,
+376,
+377
+]
+},
+{
+"tb": 32,
+"tbk": 3,
+"tl": 3446,
+"mb": 16,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+518,
+519,
+767,
+768,
+769,
+770
+]
+},
+{
+"tb": 10488532,
+"tbk": 192625,
+"tl": 1196533251,
+"mb": 4160,
+"mbk": 80,
+"gb": 1092,
+"gbk": 21,
+"eb": 0,
+"ebk": 0,
+"fs": [
+48,
+49,
+50,
+51,
+771,
+772,
+773,
+774,
+775,
+776
+]
+},
+{
+"tb": 11080,
+"tbk": 277,
+"tl": 641,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+777,
+778,
+779,
+780,
+781,
+782,
+783
+]
+},
+{
+"tb": 6912,
+"tbk": 18,
+"tl": 293,
+"mb": 384,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+784,
+785,
+786,
+787,
+788
+]
+},
+{
+"tb": 38656,
+"tbk": 1208,
+"tl": 654777,
+"mb": 32,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+789,
+790,
+791,
+792,
+793,
+794,
+795,
+796,
+797,
+798
+]
+},
+{
+"tb": 596160,
+"tbk": 8280,
+"tl": 8378245,
+"mb": 432,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+799,
+800,
+126,
+801,
+802
+]
+},
+{
+"tb": 1408,
+"tbk": 8,
+"tl": 1648,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+457,
+803,
+459,
+460,
+461
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 12430,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+156,
+157,
+158,
+7,
+89
+]
+},
+{
+"tb": 4704,
+"tbk": 7,
+"tl": 181,
+"mb": 672,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+260,
+261,
+262,
+804,
+805
+]
+},
+{
+"tb": 133936,
+"tbk": 761,
+"tl": 198313,
+"mb": 528,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+423,
+806,
+102,
+103,
+426
+]
+},
+{
+"tb": 687232,
+"tbk": 6136,
+"tl": 914837,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+143,
+144,
+807,
+304,
+445
+]
+},
+{
+"tb": 816256,
+"tbk": 7288,
+"tl": 583107,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+808,
+144,
+444,
+304,
+445
+]
+},
+{
+"tb": 57408,
+"tbk": 1794,
+"tl": 257060,
+"mb": 160,
+"mbk": 5,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+809,
+810,
+811,
+812,
+813,
+814,
+815
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5804,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+156,
+157,
+158,
+7,
+442
+]
+},
+{
+"tb": 34560,
+"tbk": 144,
+"tl": 69176,
+"mb": 720,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+816,
+817,
+818,
+819,
+193,
+194
+]
+},
+{
+"tb": 116808,
+"tbk": 471,
+"tl": 111532,
+"mb": 248,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+537,
+538,
+94,
+95,
+820,
+229,
+605
+]
+},
+{
+"tb": 425152,
+"tbk": 584,
+"tl": 345770,
+"mb": 2184,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+821,
+822,
+823,
+824,
+825,
+826,
+193
+]
+},
+{
+"tb": 53144,
+"tbk": 73,
+"tl": 73100,
+"mb": 2184,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+821,
+822,
+823,
+824,
+827,
+828,
+636
+]
+},
+{
+"tb": 176,
+"tbk": 1,
+"tl": 89,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+252,
+332,
+829,
+334,
+335
+]
+},
+{
+"tb": 112,
+"tbk": 1,
+"tl": 56215,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+830,
+831,
+832,
+833,
+669
+]
+},
+{
+"tb": 1840,
+"tbk": 46,
+"tl": 9274,
+"mb": 120,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+326,
+327,
+834,
+835,
+836,
+837,
+838
+]
+},
+{
+"tb": 640,
+"tbk": 16,
+"tl": 1669,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+573,
+574,
+46,
+85,
+46,
+47
+]
+},
+{
+"tb": 56,
+"tbk": 1,
+"tl": 55,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+658,
+659,
+660,
+660,
+660,
+661,
+662
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 12335,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+839,
+840,
+841,
+7,
+331
+]
+},
+{
+"tb": 11520,
+"tbk": 24,
+"tl": 8280,
+"mb": 960,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+842,
+843,
+844,
+845,
+846,
+847,
+848,
+849,
+850
+]
+},
+{
+"tb": 112,
+"tbk": 1,
+"tl": 64598002,
+"mb": 112,
+"mbk": 1,
+"gb": 112,
+"gbk": 1,
+"eb": 112,
+"ebk": 1,
+"fs": [
+1,
+388,
+851,
+390,
+391,
+23,
+24,
+25
+]
+},
+{
+"tb": 18816,
+"tbk": 196,
+"tl": 269139,
+"mb": 96,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+852,
+853,
+854,
+855,
+856,
+857
+]
+},
+{
+"tb": 27776,
+"tbk": 124,
+"tl": 5552,
+"mb": 672,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+858,
+859,
+860,
+861,
+862,
+863,
+864
+]
+},
+{
+"tb": 2912,
+"tbk": 40,
+"tl": 2587516240,
+"mb": 2912,
+"mbk": 40,
+"gb": 2912,
+"gbk": 40,
+"eb": 2912,
+"ebk": 40,
+"fs": [
+9,
+239,
+240,
+241,
+242,
+865,
+866,
+867,
+868,
+869,
+870
+]
+},
+{
+"tb": 1232640,
+"tbk": 12840,
+"tl": 1821255,
+"mb": 96,
+"mbk": 1,
+"gb": 96,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+871,
+872,
+873,
+193,
+194,
+874
+]
+},
+{
+"tb": 97440,
+"tbk": 435,
+"tl": 11846,
+"mb": 224,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+875,
+876,
+877,
+878,
+879
+]
+},
+{
+"tb": 9680,
+"tbk": 55,
+"tl": 1609,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+100,
+424,
+102,
+103,
+426
+]
+},
+{
+"tb": 640,
+"tbk": 16,
+"tl": 435,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+539,
+540,
+880,
+881,
+46,
+46,
+47
+]
+},
+{
+"tb": 29952,
+"tbk": 416,
+"tl": 474548,
+"mb": 216,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+882,
+883,
+124,
+125,
+126
+]
+},
+{
+"tb": 280,
+"tbk": 7,
+"tl": 730,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+44,
+45,
+118,
+46,
+46
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 13707,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+884,
+885,
+886,
+7,
+887
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 1726,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+697,
+888,
+889,
+7,
+890
+]
+},
+{
+"tb": 96,
+"tbk": 1,
+"tl": 524,
+"mb": 96,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+891,
+892,
+893,
+894,
+895
+]
+},
+{
+"tb": 448,
+"tbk": 8,
+"tl": 25,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+83,
+896,
+45,
+45,
+46,
+46
+]
+},
+{
+"tb": 40,
+"tbk": 1,
+"tl": 1,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+897,
+898,
+899,
+900,
+900,
+900,
+901
+]
+},
+{
+"tb": 11812800,
+"tbk": 25680,
+"tl": 7578052,
+"mb": 736,
+"mbk": 1,
+"gb": 736,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+902,
+903,
+904,
+905,
+193,
+194
+]
+},
+{
+"tb": 672,
+"tbk": 1,
+"tl": 60,
+"mb": 672,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+260,
+261,
+262,
+906,
+907
+]
+},
+{
+"tb": 6048,
+"tbk": 54,
+"tl": 5354,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+808,
+144,
+303,
+304,
+908
+]
+},
+{
+"tb": 352,
+"tbk": 2,
+"tl": 282,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+909,
+836,
+910,
+838,
+461
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 11497,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+490,
+491,
+492,
+7,
+911
+]
+},
+{
+"tb": 5456,
+"tbk": 31,
+"tl": 6109,
+"mb": 528,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+912,
+755,
+708,
+709,
+756
+]
+},
+{
+"tb": 600,
+"tbk": 15,
+"tl": 1546,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+44,
+46,
+85,
+46,
+47
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5901,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+257,
+258,
+259,
+7,
+913
+]
+},
+{
+"tb": 70596176,
+"tbk": 192625,
+"tl": 1193124664,
+"mb": 26880,
+"mbk": 80,
+"gb": 7056,
+"gbk": 21,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+518,
+914,
+915,
+916,
+917,
+918
+]
+},
+{
+"tb": 176,
+"tbk": 1,
+"tl": 243,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+919,
+920,
+921,
+922,
+923
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 568384,
+"mb": 336,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+924,
+925,
+926,
+701,
+927
+]
+},
+{
+"tb": 27776,
+"tbk": 124,
+"tl": 5473,
+"mb": 672,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+858,
+859,
+860,
+861,
+862,
+863,
+928
+]
+},
+{
+"tb": 9600,
+"tbk": 200,
+"tl": 223319,
+"mb": 96,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+929,
+930,
+931,
+237,
+238,
+932,
+933
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6977,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+86,
+87,
+88,
+7,
+167
+]
+},
+{
+"tb": 176,
+"tbk": 1,
+"tl": 78,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+934,
+935,
+936,
+937,
+938
+]
+},
+{
+"tb": 3456,
+"tbk": 48,
+"tl": 53,
+"mb": 72,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+232,
+233,
+939,
+940,
+941,
+942,
+943
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6609,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+944,
+945,
+946,
+7,
+913
+]
+},
+{
+"tb": 31944,
+"tbk": 2183,
+"tl": 1728320,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+947,
+948,
+949,
+950,
+951,
+952
+]
+},
+{
+"tb": 192,
+"tbk": 3,
+"tl": 1831,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+953,
+954,
+955,
+956,
+957,
+958
+]
+},
+{
+"tb": 168,
+"tbk": 18,
+"tl": 314,
+"mb": 16,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+959,
+960,
+961,
+962,
+963,
+964,
+965,
+966,
+967
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5703,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+143,
+144,
+145,
+7,
+968
+]
+},
+{
+"tb": 661920,
+"tbk": 2955,
+"tl": 24741,
+"mb": 224,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+427,
+969,
+970,
+971,
+972,
+973,
+974,
+975,
+976,
+977
+]
+},
+{
+"tb": 11618048,
+"tbk": 112765,
+"tl": 67821047,
+"mb": 2432,
+"mbk": 28,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+65,
+66,
+67,
+68,
+978,
+979,
+980,
+981
+]
+},
+{
+"tb": 522368,
+"tbk": 4664,
+"tl": 707429,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+4,
+5,
+982,
+598,
+599
+]
+},
+{
+"tb": 1737720,
+"tbk": 12872,
+"tl": 42080,
+"mb": 180,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+983,
+984,
+985,
+986,
+987,
+988,
+989,
+990,
+991,
+992,
+993,
+994,
+995,
+996,
+997,
+998,
+999,
+1000,
+1001,
+1002,
+1003
+]
+},
+{
+"tb": 5760,
+"tbk": 80,
+"tl": 83339,
+"mb": 144,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+1004,
+1005,
+348,
+349,
+350
+]
+},
+{
+"tb": 1280,
+"tbk": 32,
+"tl": 3276,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+117,
+46,
+85,
+85,
+46
+]
+},
+{
+"tb": 100352,
+"tbk": 196,
+"tl": 12682461937,
+"mb": 100352,
+"mbk": 196,
+"gb": 100352,
+"gbk": 196,
+"eb": 100352,
+"ebk": 196,
+"fs": [
+9,
+196,
+197,
+198,
+199,
+200,
+201,
+202,
+214
+]
+},
+{
+"tb": 26816320,
+"tbk": 4142,
+"tl": 771071,
+"mb": 24064,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1006,
+1007,
+1008,
+1009,
+1010
+]
+},
+{
+"tb": 77040,
+"tbk": 1605,
+"tl": 281023,
+"mb": 48,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1011,
+1012,
+1013,
+1014,
+1015,
+421,
+422
+]
+},
+{
+"tb": 140,
+"tbk": 2,
+"tl": 64409161,
+"mb": 140,
+"mbk": 2,
+"gb": 88,
+"gbk": 1,
+"eb": 88,
+"ebk": 1,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+1016,
+1017,
+1018,
+1019
+]
+},
+{
+"tb": 10304,
+"tbk": 152,
+"tl": 2645,
+"mb": 128,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+351,
+1020,
+1021,
+1022,
+1023,
+1024,
+1025,
+1026,
+1027,
+1028
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 8511,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1029,
+1030,
+1031,
+7,
+89
+]
+},
+{
+"tb": 816,
+"tbk": 1,
+"tl": 641,
+"mb": 816,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1032,
+741,
+742,
+23,
+24,
+25,
+1033
+]
+},
+{
+"tb": 13464,
+"tbk": 187,
+"tl": 2587,
+"mb": 72,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1034,
+1035,
+94,
+95,
+1036,
+1037,
+229
+]
+},
+{
+"tb": 147936,
+"tbk": 292,
+"tl": 6456033,
+"mb": 3000,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+1038,
+1039,
+1040,
+1041
+]
+},
+{
+"tb": 11136,
+"tbk": 23,
+"tl": 1214200,
+"mb": 768,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+288,
+1042,
+1043,
+1044,
+1045,
+1046,
+1047,
+1048,
+1049
+]
+},
+{
+"tb": 16704,
+"tbk": 232,
+"tl": 8566,
+"mb": 144,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+513,
+514,
+515,
+1050,
+1051,
+237,
+238
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 7160,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+129,
+130,
+131,
+7,
+89
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 869,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+723,
+45,
+118,
+46,
+85,
+46
+]
+},
+{
+"tb": 7504,
+"tbk": 67,
+"tl": 5031,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+808,
+144,
+444,
+304,
+908
+]
+},
+{
+"tb": 1920,
+"tbk": 24,
+"tl": 2776,
+"mb": 80,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1052,
+896,
+46,
+85,
+46,
+47
+]
+},
+{
+"tb": 158208,
+"tbk": 2472,
+"tl": 2452866,
+"mb": 1344,
+"mbk": 21,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+65,
+108,
+109,
+110,
+111,
+112,
+113,
+114,
+1053,
+1054,
+1055,
+1056
+]
+},
+{
+"tb": 176,
+"tbk": 1,
+"tl": 276,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+341,
+453,
+748,
+455,
+749
+]
+},
+{
+"tb": 283808,
+"tbk": 196,
+"tl": 12682459750,
+"mb": 283808,
+"mbk": 196,
+"gb": 283808,
+"gbk": 196,
+"eb": 283808,
+"ebk": 196,
+"fs": [
+211,
+1057,
+1058,
+202,
+214,
+215,
+216,
+217
+]
+},
+{
+"tb": 56,
+"tbk": 1,
+"tl": 64598635,
+"mb": 56,
+"mbk": 1,
+"gb": 56,
+"gbk": 1,
+"eb": 56,
+"ebk": 1,
+"fs": [
+1,
+555,
+1059,
+741,
+742,
+23,
+24,
+25
+]
+},
+{
+"tb": 5712,
+"tbk": 51,
+"tl": 7260,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+143,
+144,
+807,
+304,
+908
+]
+},
+{
+"tb": 3696,
+"tbk": 21,
+"tl": 3462,
+"mb": 528,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+1060,
+1061,
+1062,
+922,
+923
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 12583,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+265,
+157,
+158,
+7,
+89
+]
+},
+{
+"tb": 93312,
+"tbk": 480,
+"tl": 12682580697,
+"mb": 56064,
+"mbk": 196,
+"gb": 56064,
+"gbk": 196,
+"eb": 56064,
+"ebk": 196,
+"fs": [
+204,
+205,
+575,
+576,
+577,
+578,
+1063
+]
+},
+{
+"tb": 15552,
+"tbk": 216,
+"tl": 1196361,
+"mb": 1872,
+"mbk": 26,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+513,
+514,
+515,
+1064,
+236,
+237,
+238
+]
+},
+{
+"tb": 77040,
+"tbk": 1605,
+"tl": 343502,
+"mb": 48,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1011,
+1012,
+1065,
+419,
+420,
+421,
+422
+]
+},
+{
+"tb": 10320,
+"tbk": 860,
+"tl": 2057146,
+"mb": 48,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1066,
+1067,
+1068,
+1069,
+1070,
+1071,
+1072,
+1073,
+1074
+]
+},
+{
+"tb": 824080,
+"tbk": 52600,
+"tl": 4304240,
+"mb": 64,
+"mbk": 1,
+"gb": 64,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1075,
+1076,
+1077,
+1078,
+1079,
+1080
+]
+},
+{
+"tb": 672,
+"tbk": 4,
+"tl": 258637111,
+"mb": 672,
+"mbk": 4,
+"gb": 672,
+"gbk": 4,
+"eb": 672,
+"ebk": 4,
+"fs": [
+211,
+1081,
+1082,
+1083,
+302,
+203,
+743,
+744
+]
+},
+{
+"tb": 5760,
+"tbk": 15,
+"tl": 429,
+"mb": 384,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+784,
+785,
+786,
+787,
+1084
+]
+},
+{
+"tb": 6112,
+"tbk": 196,
+"tl": 12682708791,
+"mb": 6112,
+"mbk": 196,
+"gb": 6112,
+"gbk": 196,
+"eb": 6112,
+"ebk": 196,
+"fs": [
+1085,
+1086,
+1087,
+1088,
+1089,
+1090,
+1091,
+1092,
+1093,
+1094
+]
+},
+{
+"tb": 213856768,
+"tbk": 33040,
+"tl": 5400904,
+"mb": 24064,
+"mbk": 1,
+"gb": 24064,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1095,
+1096,
+1097,
+1098,
+1099
+]
+},
+{
+"tb": 42048,
+"tbk": 584,
+"tl": 765199,
+"mb": 216,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+1100,
+1101,
+1102,
+1103,
+1104
+]
+},
+{
+"tb": 87808,
+"tbk": 784,
+"tl": 474762,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+156,
+157,
+158,
+7,
+56
+]
+},
+{
+"tb": 1170504,
+"tbk": 249272,
+"tl": 218267958,
+"mb": 240,
+"mbk": 54,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+638,
+639,
+640,
+641,
+642,
+643,
+644,
+645,
+646,
+1105,
+1106,
+1107,
+1108,
+1109,
+1110,
+1111
+]
+},
+{
+"tb": 36016,
+"tbk": 1313,
+"tl": 57214262035,
+"mb": 26416,
+"mbk": 913,
+"gb": 26416,
+"gbk": 913,
+"eb": 26416,
+"ebk": 913,
+"fs": [
+1085,
+1086,
+1087,
+1088,
+1089,
+1090,
+1112,
+1113
+]
+},
+{
+"tb": 10320,
+"tbk": 258,
+"tl": 7996,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+223,
+224,
+225,
+226,
+603,
+604,
+229
+]
+},
+{
+"tb": 6887,
+"tbk": 344,
+"tl": 1334,
+"mb": 50,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+1114,
+1115,
+1116,
+1117,
+1118,
+1119,
+1120,
+1121
+]
+},
+{
+"tb": 3808,
+"tbk": 34,
+"tl": 1920667,
+"mb": 336,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+439,
+1122,
+1123,
+1124,
+1125
+]
+},
+{
+"tb": 687232,
+"tbk": 6136,
+"tl": 868646,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+808,
+144,
+807,
+304,
+445
+]
+},
+{
+"tb": 76560,
+"tbk": 435,
+"tl": 159767,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+706,
+1126,
+1127,
+1128,
+1129
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 2284,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+143,
+144,
+145,
+7,
+132
+]
+},
+{
+"tb": 1960,
+"tbk": 1,
+"tl": 64791487,
+"mb": 1960,
+"mbk": 1,
+"gb": 1960,
+"gbk": 1,
+"eb": 1960,
+"ebk": 1,
+"fs": [
+64,
+1130,
+1131,
+1132,
+1133,
+1134,
+1135,
+1136,
+1137,
+1138
+]
+},
+{
+"tb": 19260,
+"tbk": 1605,
+"tl": 2778,
+"mb": 12,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1139,
+1140,
+1141,
+1142,
+1143,
+1144,
+1145,
+1146,
+1147,
+1148,
+1149,
+1150,
+1151,
+1152
+]
+},
+{
+"tb": 13464,
+"tbk": 187,
+"tl": 33399,
+"mb": 72,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1034,
+1035,
+94,
+95,
+820,
+229,
+605
+]
+},
+{
+"tb": 418368,
+"tbk": 21368,
+"tl": 37236,
+"mb": 128,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+947,
+948,
+1153,
+1154,
+719,
+1155
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 822,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+723,
+45,
+46,
+46,
+47,
+403
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 828,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+392,
+393,
+42,
+40,
+670,
+46
+]
+},
+{
+"tb": 1950792,
+"tbk": 3242,
+"tl": 213816,
+"mb": 2948,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+1156,
+1157,
+1158,
+1159
+]
+},
+{
+"tb": 1008,
+"tbk": 9,
+"tl": 608525,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1160,
+831,
+832,
+668,
+669
+]
+},
+{
+"tb": 1110660,
+"tbk": 1605,
+"tl": 1335439,
+"mb": 692,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+1161,
+1162,
+1163,
+1164
+]
+},
+{
+"tb": 51968,
+"tbk": 184,
+"tl": 175661,
+"mb": 448,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1165,
+1166,
+1167,
+1168,
+1169,
+1170,
+1171,
+1172,
+1173,
+1174
+]
+},
+{
+"tb": 111104,
+"tbk": 20,
+"tl": 80505,
+"mb": 14336,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1175,
+1176,
+1177,
+1178,
+743
+]
+},
+{
+"tb": 48,
+"tbk": 1,
+"tl": 64598735,
+"mb": 48,
+"mbk": 1,
+"gb": 48,
+"gbk": 1,
+"eb": 48,
+"ebk": 1,
+"fs": [
+1,
+416,
+417,
+1179,
+741,
+742,
+23,
+24,
+25
+]
+},
+{
+"tb": 588672,
+"tbk": 1513,
+"tl": 28738,
+"mb": 672,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+1180,
+1181,
+1182,
+1183,
+1184,
+1185,
+1186,
+1187,
+1188
+]
+},
+{
+"tb": 840,
+"tbk": 168,
+"tl": 642814,
+"mb": 10,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+1189
+]
+},
+{
+"tb": 80,
+"tbk": 80,
+"tl": 265263,
+"mb": 2,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+414,
+1190
+]
+},
+{
+"tb": 157464,
+"tbk": 452,
+"tl": 13325,
+"mb": 1728,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+1191,
+1192,
+1193,
+1194,
+1195,
+1196,
+1197,
+1198,
+1199
+]
+},
+{
+"tb": 65296,
+"tbk": 371,
+"tl": 27538,
+"mb": 880,
+"mbk": 5,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+100,
+1200,
+425,
+103,
+104
+]
+},
+{
+"tb": 640,
+"tbk": 16,
+"tl": 361926,
+"mb": 160,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+1201,
+1202,
+1203,
+1204,
+1205
+]
+},
+{
+"tb": 8800,
+"tbk": 220,
+"tl": 12936310,
+"mb": 120,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+26,
+27,
+1206,
+1207,
+1208,
+1209,
+1210
+]
+},
+{
+"tb": 30336,
+"tbk": 237,
+"tl": 323028,
+"mb": 128,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1211,
+1212,
+1213,
+1214,
+1215,
+1216
+]
+},
+{
+"tb": 77040,
+"tbk": 1605,
+"tl": 413079,
+"mb": 48,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+416,
+417,
+1217,
+1014,
+1015,
+421,
+422
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 4733,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+4,
+5,
+6,
+7,
+913
+]
+},
+{
+"tb": 15152,
+"tbk": 947,
+"tl": 13368,
+"mb": 16,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1218,
+1219,
+94,
+95,
+1036,
+1037,
+229
+]
+},
+{
+"tb": 85904,
+"tbk": 767,
+"tl": 586293,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+808,
+144,
+807,
+304,
+305
+]
+},
+{
+"tb": 896,
+"tbk": 16,
+"tl": 2287,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+658,
+659,
+660,
+660,
+661,
+764,
+1220
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 838,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+1221,
+119,
+46,
+46,
+47
+]
+},
+{
+"tb": 67360,
+"tbk": 1684,
+"tl": 9317407,
+"mb": 80,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+26,
+27,
+1206,
+1207,
+1208,
+1222,
+1223
+]
+},
+{
+"tb": 112,
+"tbk": 1,
+"tl": 36086,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+944,
+666,
+667,
+1224,
+1225
+]
+},
+{
+"tb": 38400,
+"tbk": 400,
+"tl": 25882343231,
+"mb": 38400,
+"mbk": 400,
+"gb": 38400,
+"gbk": 400,
+"eb": 38400,
+"ebk": 400,
+"fs": [
+211,
+1226,
+1227,
+1228,
+1229,
+1230,
+869,
+870
+]
+},
+{
+"tb": 48,
+"tbk": 1,
+"tl": 64598011,
+"mb": 48,
+"mbk": 1,
+"gb": 48,
+"gbk": 1,
+"eb": 48,
+"ebk": 1,
+"fs": [
+1,
+1011,
+1012,
+851,
+390,
+391,
+23,
+24,
+25
+]
+},
+{
+"tb": 1096,
+"tbk": 256,
+"tl": 28608,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+638,
+639,
+640,
+641,
+642,
+643,
+644,
+645,
+646,
+647,
+673,
+674,
+1231,
+1232,
+1233,
+1234
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 13864,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+265,
+157,
+158,
+7,
+159
+]
+},
+{
+"tb": 1130905,
+"tbk": 1605,
+"tl": 59216991,
+"mb": 1636,
+"mbk": 1,
+"gb": 603,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1235,
+1236,
+1237,
+1238,
+1239,
+1240,
+1241,
+1242,
+1243,
+452,
+596
+]
+},
+{
+"tb": 234240,
+"tbk": 1208,
+"tl": 3980048,
+"mb": 240,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+148,
+149,
+150,
+151,
+152,
+1244,
+1245,
+1246
+]
+},
+{
+"tb": 47040,
+"tbk": 392,
+"tl": 3977,
+"mb": 192,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+1247,
+941,
+942,
+943,
+1248,
+1249
+]
+},
+{
+"tb": 1334400,
+"tbk": 14352,
+"tl": 12124638,
+"mb": 880,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+148,
+1250,
+1251,
+1252,
+1253,
+1254,
+1255,
+1256,
+1257,
+1106
+]
+},
+{
+"tb": 232280,
+"tbk": 5807,
+"tl": 35626426,
+"mb": 240,
+"mbk": 6,
+"gb": 120,
+"gbk": 3,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+26,
+27,
+1206,
+1207,
+1208,
+1258,
+1259
+]
+},
+{
+"tb": 960,
+"tbk": 24,
+"tl": 2692,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+117,
+118,
+118,
+46,
+85
+]
+},
+{
+"tb": 1960,
+"tbk": 1,
+"tl": 64893333,
+"mb": 1960,
+"mbk": 1,
+"gb": 1960,
+"gbk": 1,
+"eb": 1960,
+"ebk": 1,
+"fs": [
+64,
+1130,
+1131,
+1132,
+1133,
+1134,
+1135,
+1260,
+1261,
+1262
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 8075,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+830,
+1263,
+1264,
+7,
+89
+]
+},
+{
+"tb": 640,
+"tbk": 16,
+"tl": 17185,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+1265,
+1266,
+1267,
+7,
+89
+]
+},
+{
+"tb": 2352,
+"tbk": 21,
+"tl": 1352359,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1029,
+1268,
+629,
+630,
+631
+]
+},
+{
+"tb": 23392,
+"tbk": 34,
+"tl": 26152,
+"mb": 2064,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+189,
+190,
+1269,
+1270,
+636,
+637
+]
+},
+{
+"tb": 448,
+"tbk": 4,
+"tl": 276774,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+944,
+666,
+667,
+833,
+669
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 817,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+39,
+40,
+306,
+42,
+40
+]
+},
+{
+"tb": 39424,
+"tbk": 224,
+"tl": 58090,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+100,
+1271,
+102,
+103,
+426
+]
+},
+{
+"tb": 48,
+"tbk": 1,
+"tl": 64597780,
+"mb": 48,
+"mbk": 1,
+"gb": 48,
+"gbk": 1,
+"eb": 48,
+"ebk": 1,
+"fs": [
+1,
+1011,
+1012,
+389,
+390,
+391,
+23,
+24,
+25
+]
+},
+{
+"tb": 12960,
+"tbk": 1504,
+"tl": 1468761,
+"mb": 162,
+"mbk": 18,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+638,
+639,
+640,
+641,
+642,
+643,
+644,
+645,
+646,
+647,
+115,
+116,
+111,
+112,
+113,
+114,
+1053,
+1054,
+1055,
+1056
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5058,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1272,
+1030,
+1031,
+7,
+132
+]
+},
+{
+"tb": 112,
+"tbk": 2,
+"tl": 92,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+658,
+659,
+660,
+660,
+661,
+662,
+663
+]
+},
+{
+"tb": 1944,
+"tbk": 27,
+"tl": 15543,
+"mb": 144,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1273,
+1274,
+1275,
+1276,
+1277,
+1278,
+1279,
+1280,
+1281
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5332,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+711,
+440,
+441,
+7,
+8
+]
+},
+{
+"tb": 3584,
+"tbk": 32,
+"tl": 21633,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1282,
+840,
+841,
+7,
+968
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 4659,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+330,
+5,
+6,
+7,
+913
+]
+},
+{
+"tb": 1012,
+"tbk": 209,
+"tl": 255773,
+"mb": 70,
+"mbk": 14,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+703,
+1283,
+1284
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 889,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+573,
+574,
+42,
+40,
+42,
+40
+]
+},
+{
+"tb": 41400,
+"tbk": 8280,
+"tl": 27055156,
+"mb": 30,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+1285
+]
+},
+{
+"tb": 208,
+"tbk": 40,
+"tl": 683557,
+"mb": 120,
+"mbk": 16,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+703,
+1283,
+1286
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 3599,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+1265,
+1266,
+1267,
+7,
+1287
+]
+},
+{
+"tb": 2224,
+"tbk": 95,
+"tl": 5740221212,
+"mb": 2160,
+"mbk": 91,
+"gb": 2160,
+"gbk": 91,
+"eb": 2160,
+"ebk": 91,
+"fs": [
+204,
+205,
+692,
+693,
+694,
+1288,
+1289
+]
+},
+{
+"tb": 1056,
+"tbk": 6,
+"tl": 1622,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+1290,
+1291,
+1292,
+1293,
+461
+]
+},
+{
+"tb": 560,
+"tbk": 7,
+"tl": 885,
+"mb": 80,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1052,
+84,
+118,
+118,
+46,
+46
+]
+},
+{
+"tb": 547840,
+"tbk": 984,
+"tl": 73564,
+"mb": 16384,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1294,
+1295,
+1296,
+1297,
+1298
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5178,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+4,
+5,
+6,
+7,
+1299
+]
+},
+{
+"tb": 1232,
+"tbk": 7,
+"tl": 1554,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+252,
+342,
+343,
+344,
+1300
+]
+},
+{
+"tb": 3808,
+"tbk": 34,
+"tl": 1920341,
+"mb": 336,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+711,
+1122,
+1123,
+1124,
+1125
+]
+},
+{
+"tb": 4480,
+"tbk": 20,
+"tl": 53258,
+"mb": 448,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+1301,
+1302,
+1303,
+862,
+863,
+864,
+215
+]
+},
+{
+"tb": 144,
+"tbk": 6,
+"tl": 1595,
+"mb": 24,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+494,
+495,
+496,
+497,
+1304,
+1305,
+1306
+]
+},
+{
+"tb": 32,
+"tbk": 2,
+"tl": 25,
+"mb": 16,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1307,
+1308,
+1309,
+1310,
+1311,
+1312,
+367
+]
+},
+{
+"tb": 15232,
+"tbk": 136,
+"tl": 67752,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+439,
+440,
+441,
+7,
+56
+]
+},
+{
+"tb": 6272,
+"tbk": 56,
+"tl": 37448,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1029,
+1030,
+1031,
+7,
+56
+]
+},
+{
+"tb": 5501940,
+"tbk": 4815,
+"tl": 4363621,
+"mb": 3428,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+1313,
+1314,
+1315,
+1316
+]
+},
+{
+"tb": 448,
+"tbk": 8,
+"tl": 14,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+83,
+84,
+443,
+45,
+46,
+85
+]
+},
+{
+"tb": 96,
+"tbk": 1,
+"tl": 103,
+"mb": 96,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1317,
+1318,
+1319,
+1320,
+1321,
+1322,
+1323,
+1324,
+1325
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 237,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+26,
+27,
+1326,
+1327,
+669,
+1328,
+1329
+]
+},
+{
+"tb": 71680,
+"tbk": 320,
+"tl": 100938,
+"mb": 224,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1165,
+1330,
+1331,
+1332,
+1333,
+1334,
+1335,
+1336,
+1337,
+1338
+]
+},
+{
+"tb": 880,
+"tbk": 22,
+"tl": 2267,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1339,
+1340,
+46,
+46,
+47,
+403
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6429,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+808,
+144,
+145,
+7,
+89
+]
+},
+{
+"tb": 12096,
+"tbk": 168,
+"tl": 200764,
+"mb": 144,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+1341,
+1342,
+124,
+125,
+126
+]
+},
+{
+"tb": 6272,
+"tbk": 196,
+"tl": 12682595603,
+"mb": 6272,
+"mbk": 196,
+"gb": 6272,
+"gbk": 196,
+"eb": 6272,
+"ebk": 196,
+"fs": [
+204,
+205,
+1343,
+1344,
+1345,
+1346,
+1347
+]
+},
+{
+"tb": 12080,
+"tbk": 200,
+"tl": 25652,
+"mb": 1116,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+239,
+1348,
+1349,
+1350,
+1351,
+1352,
+1353,
+1354
+]
+},
+{
+"tb": 175616,
+"tbk": 196,
+"tl": 239678,
+"mb": 896,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1175,
+1176,
+1177,
+1355,
+215
+]
+},
+{
+"tb": 28800,
+"tbk": 400,
+"tl": 5109,
+"mb": 72,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+297,
+298,
+299,
+1356,
+1357,
+1358
+]
+},
+{
+"tb": 5952,
+"tbk": 93,
+"tl": 2063,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+953,
+954,
+955,
+956,
+957,
+1359
+]
+},
+{
+"tb": 4096,
+"tbk": 128,
+"tl": 400,
+"mb": 32,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1360,
+1361,
+1362,
+1363,
+1364,
+1365,
+1366,
+1367,
+1368
+]
+},
+{
+"tb": 218824,
+"tbk": 1609,
+"tl": 587300,
+"mb": 136,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1369,
+1370,
+1371,
+636,
+1372,
+1373
+]
+},
+{
+"tb": 6272,
+"tbk": 56,
+"tl": 22937,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+330,
+5,
+6,
+7,
+167
+]
+},
+{
+"tb": 8280,
+"tbk": 2472,
+"tl": 2421872,
+"mb": 75,
+"mbk": 21,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+638,
+639,
+640,
+641,
+642,
+643,
+644,
+645,
+646,
+647,
+648,
+116,
+111,
+112,
+113,
+114,
+1053,
+1054,
+1055,
+1056
+]
+},
+{
+"tb": 504,
+"tbk": 168,
+"tl": 594774,
+"mb": 6,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+414,
+1374
+]
+},
+{
+"tb": 2262960,
+"tbk": 56574,
+"tl": 115446,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+379,
+380,
+381,
+382,
+1375,
+1376,
+1377,
+1378
+]
+},
+{
+"tb": 5365440,
+"tbk": 8280,
+"tl": 3020217,
+"mb": 3888,
+"mbk": 6,
+"gb": 1296,
+"gbk": 2,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1379,
+1380,
+1381,
+1382,
+193,
+194
+]
+},
+{
+"tb": 128992,
+"tbk": 292,
+"tl": 262452,
+"mb": 2616,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+1383,
+1384,
+1385,
+1386
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 9055,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+283,
+840,
+841,
+7,
+146
+]
+},
+{
+"tb": 158976,
+"tbk": 316,
+"tl": 11905369170,
+"mb": 88320,
+"mbk": 184,
+"gb": 88320,
+"gbk": 184,
+"eb": 88320,
+"ebk": 184,
+"fs": [
+204,
+205,
+575,
+576,
+577,
+578,
+1387
+]
+},
+{
+"tb": 928,
+"tbk": 1,
+"tl": 327,
+"mb": 928,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1388,
+1389,
+1390,
+1391,
+1292
+]
+},
+{
+"tb": 448,
+"tbk": 4,
+"tl": 276738,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+665,
+666,
+667,
+833,
+669
+]
+},
+{
+"tb": 960,
+"tbk": 24,
+"tl": 2627,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+372,
+1392,
+1393,
+375,
+376,
+377
+]
+},
+{
+"tb": 2160,
+"tbk": 196,
+"tl": 10776159,
+"mb": 540,
+"mbk": 49,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+1394,
+1395,
+1396,
+1397,
+1398
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 6055,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+129,
+130,
+131,
+7,
+1399
+]
+},
+{
+"tb": 896,
+"tbk": 4,
+"tl": 88575,
+"mb": 224,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+1301,
+1302,
+1400,
+862,
+863,
+928,
+743
+]
+},
+{
+"tb": 55436,
+"tbk": 371,
+"tl": 326628,
+"mb": 724,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+1401,
+1402,
+1403,
+1404
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6298,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+4,
+5,
+6,
+7,
+1405
+]
+},
+{
+"tb": 19584,
+"tbk": 272,
+"tl": 286218,
+"mb": 216,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+1406,
+1407,
+802,
+1408,
+1102
+]
+},
+{
+"tb": 2288,
+"tbk": 13,
+"tl": 3426,
+"mb": 528,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+341,
+253,
+254,
+255,
+256
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5751,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+490,
+491,
+492,
+7,
+132
+]
+},
+{
+"tb": 1152,
+"tbk": 24,
+"tl": 353527,
+"mb": 288,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+1409,
+1410,
+1411,
+237,
+238,
+932,
+1412
+]
+},
+{
+"tb": 256,
+"tbk": 32,
+"tl": 24322,
+"mb": 32,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+675,
+1413,
+1414,
+1415,
+1416,
+1417,
+1418,
+1419,
+1420,
+1421
+]
+},
+{
+"tb": 867104,
+"tbk": 3871,
+"tl": 201437,
+"mb": 224,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+427,
+1422,
+1423,
+1424,
+1425,
+1426,
+1427,
+1428,
+1429,
+1430
+]
+},
+{
+"tb": 657116,
+"tbk": 586,
+"tl": 54115,
+"mb": 5624,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+1431,
+1432,
+1433,
+1434
+]
+},
+{
+"tb": 6048,
+"tbk": 54,
+"tl": 5812,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+143,
+144,
+303,
+304,
+908
+]
+},
+{
+"tb": 27,
+"tbk": 2,
+"tl": 3,
+"mb": 18,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+1394,
+1395,
+1396,
+1435,
+1224
+]
+},
+{
+"tb": 22080,
+"tbk": 552,
+"tl": 942,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+379,
+380,
+381,
+382,
+383,
+529,
+530,
+747
+]
+},
+{
+"tb": 561750,
+"tbk": 4815,
+"tl": 45108,
+"mb": 200,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+168,
+169,
+170,
+171,
+585,
+586,
+587,
+588,
+589,
+590,
+591,
+592,
+593,
+594,
+1436,
+452,
+596
+]
+},
+{
+"tb": 704,
+"tbk": 4,
+"tl": 33,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+912,
+1437,
+708,
+709,
+710
+]
+},
+{
+"tb": 8272,
+"tbk": 47,
+"tl": 10112,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+912,
+755,
+1438,
+709,
+710
+]
+},
+{
+"tb": 200,
+"tbk": 40,
+"tl": 142392,
+"mb": 10,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+1439
+]
+},
+{
+"tb": 71760,
+"tbk": 1794,
+"tl": 8238,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1440,
+1441,
+1442,
+1443,
+1444,
+1445,
+1446
+]
+},
+{
+"tb": 3584,
+"tbk": 65,
+"tl": 4496,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1447,
+1448,
+1449,
+1450,
+1451,
+1452,
+1453,
+1454,
+1455
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 831,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+1456,
+46,
+46,
+47,
+403
+]
+},
+{
+"tb": 38400,
+"tbk": 400,
+"tl": 25219,
+"mb": 96,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+211,
+1226,
+1227,
+1457,
+1458,
+1459,
+1460,
+869
+]
+},
+{
+"tb": 4032,
+"tbk": 104,
+"tl": 6728371732,
+"mb": 4032,
+"mbk": 104,
+"gb": 4032,
+"gbk": 104,
+"eb": 4032,
+"ebk": 104,
+"fs": [
+9,
+675,
+1413,
+1414,
+1415,
+1461,
+1462,
+1463,
+1464,
+869,
+870
+]
+},
+{
+"tb": 50304,
+"tbk": 1568,
+"tl": 11038,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+1465,
+1466,
+1467,
+1468,
+1469,
+1470,
+1471,
+1472,
+1473
+]
+},
+{
+"tb": 1168,
+"tbk": 584,
+"tl": 2678945,
+"mb": 6,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+1474
+]
+},
+{
+"tb": 928,
+"tbk": 232,
+"tl": 799925,
+"mb": 12,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+1475,
+1476
+]
+},
+{
+"tb": 2688,
+"tbk": 384,
+"tl": 1386748,
+"mb": 21,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+1475,
+1477
+]
+},
+{
+"tb": 14336,
+"tbk": 128,
+"tl": 108726,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+839,
+840,
+841,
+7,
+89
+]
+},
+{
+"tb": 556324,
+"tbk": 1621,
+"tl": 1478906,
+"mb": 1004,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+1478,
+1479,
+1480,
+1481
+]
+},
+{
+"tb": 128,
+"tbk": 2,
+"tl": 51,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+266,
+267,
+1482,
+1483,
+1484,
+1485,
+1484
+]
+},
+{
+"tb": 234240,
+"tbk": 1208,
+"tl": 1051614,
+"mb": 240,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1486,
+1487,
+1488,
+1489,
+1490,
+1491,
+1492,
+1493,
+1494
+]
+},
+{
+"tb": 37632,
+"tbk": 196,
+"tl": 194125,
+"mb": 192,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1495,
+1496,
+1497,
+1498,
+215
+]
+},
+{
+"tb": 37632,
+"tbk": 196,
+"tl": 12682593421,
+"mb": 37632,
+"mbk": 196,
+"gb": 37632,
+"gbk": 196,
+"eb": 37632,
+"ebk": 196,
+"fs": [
+204,
+205,
+1499,
+1500,
+1501,
+1502,
+1347
+]
+},
+{
+"tb": 116808,
+"tbk": 471,
+"tl": 15705,
+"mb": 248,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+537,
+538,
+94,
+95,
+1036,
+1037,
+229
+]
+},
+{
+"tb": 7936,
+"tbk": 62,
+"tl": 3317,
+"mb": 128,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1503,
+936,
+937,
+1504,
+1505,
+1506
+]
+},
+{
+"tb": 620,
+"tbk": 168,
+"tl": 195996,
+"mb": 49,
+"mbk": 12,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+611,
+1507
+]
+},
+{
+"tb": 5376,
+"tbk": 48,
+"tl": 24544,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+156,
+157,
+158,
+7,
+1405
+]
+},
+{
+"tb": 179760,
+"tbk": 1605,
+"tl": 265559,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+388,
+1013,
+1014,
+1015,
+421,
+422
+]
+},
+{
+"tb": 29320,
+"tbk": 733,
+"tl": 73823,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+437,
+85,
+46,
+47,
+403
+]
+},
+{
+"tb": 89880,
+"tbk": 1605,
+"tl": 463376,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+555,
+1179,
+419,
+420,
+421,
+422
+]
+},
+{
+"tb": 3696,
+"tbk": 21,
+"tl": 3375,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+1508,
+1509,
+1510,
+1511,
+1512
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 11675,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+711,
+440,
+441,
+7,
+89
+]
+},
+{
+"tb": 144,
+"tbk": 144,
+"tl": 533703,
+"mb": 3,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+414,
+1513
+]
+},
+{
+"tb": 110360,
+"tbk": 2759,
+"tl": 3574,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+897,
+898,
+1514,
+1515,
+1516,
+1517,
+1518
+]
+},
+{
+"tb": 137000,
+"tbk": 3425,
+"tl": 5811,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+379,
+380,
+381,
+382,
+383,
+1519,
+1520,
+1521
+]
+},
+{
+"tb": 5760,
+"tbk": 144,
+"tl": 22514,
+"mb": 80,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+539,
+540,
+1522,
+542,
+543,
+1523,
+1524
+]
+},
+{
+"tb": 5936,
+"tbk": 53,
+"tl": 3219002,
+"mb": 336,
+"mbk": 3,
+"gb": 112,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+330,
+1525,
+629,
+630,
+631
+]
+},
+{
+"tb": 513600,
+"tbk": 12840,
+"tl": 44776388,
+"mb": 40,
+"mbk": 1,
+"gb": 40,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+160,
+161,
+162,
+163,
+164,
+1526,
+1527
+]
+},
+{
+"tb": 1440,
+"tbk": 3,
+"tl": 160671,
+"mb": 960,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+842,
+1528,
+1529,
+1530,
+1531,
+1532,
+1533,
+1534,
+1535
+]
+},
+{
+"tb": 39936,
+"tbk": 208,
+"tl": 258,
+"mb": 192,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1495,
+1496,
+1497,
+1536,
+236
+]
+},
+{
+"tb": 4480,
+"tbk": 8,
+"tl": 14366,
+"mb": 896,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+1537,
+1538,
+1539,
+862,
+863,
+864
+]
+},
+{
+"tb": 1116288,
+"tbk": 10686,
+"tl": 46395570,
+"mb": 1728,
+"mbk": 18,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1540,
+1541,
+1542,
+1543,
+1544,
+1545,
+1546,
+1547,
+1548
+]
+},
+{
+"tb": 24640,
+"tbk": 80,
+"tl": 14386,
+"mb": 392,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1165,
+1549,
+1550,
+1551,
+1552,
+1553,
+1554,
+1555,
+1556,
+1557
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6256,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+330,
+5,
+6,
+7,
+195
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5864,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+711,
+440,
+441,
+7,
+230
+]
+},
+{
+"tb": 64,
+"tbk": 1,
+"tl": 38,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+266,
+267,
+1482,
+1483,
+1484,
+1558,
+1484
+]
+},
+{
+"tb": 15792,
+"tbk": 329,
+"tl": 4490,
+"mb": 48,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1559,
+1560,
+227,
+228,
+229,
+605,
+1561
+]
+},
+{
+"tb": 52350592,
+"tbk": 138568,
+"tl": 90926819,
+"mb": 13216,
+"mbk": 38,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+518,
+914,
+915,
+916,
+917,
+1562
+]
+},
+{
+"tb": 89880,
+"tbk": 1605,
+"tl": 362588,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+555,
+1563,
+419,
+420,
+421,
+422
+]
+},
+{
+"tb": 8960,
+"tbk": 80,
+"tl": 47327,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+808,
+144,
+145,
+7,
+56
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 4543,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+1265,
+1266,
+1267,
+7,
+132
+]
+},
+{
+"tb": 44160,
+"tbk": 690,
+"tl": 366302,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1564,
+1565,
+1566,
+1567,
+1568,
+1569
+]
+},
+{
+"tb": 12672,
+"tbk": 132,
+"tl": 4043465,
+"mb": 288,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1570,
+1571,
+1572,
+1573,
+1574
+]
+},
+{
+"tb": 28800,
+"tbk": 400,
+"tl": 2505782,
+"mb": 3600,
+"mbk": 50,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+1575,
+1576,
+1357,
+1358,
+931,
+237,
+238
+]
+},
+{
+"tb": 1120,
+"tbk": 10,
+"tl": 612639,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+944,
+666,
+667,
+668,
+669
+]
+},
+{
+"tb": 37880,
+"tbk": 947,
+"tl": 22395,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+91,
+92,
+93,
+94,
+95,
+1036,
+1037
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 2173,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1577,
+1578,
+1579,
+7,
+56
+]
+},
+{
+"tb": 160,
+"tbk": 4,
+"tl": 4,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1580,
+1581,
+1582,
+1583,
+1584,
+1585,
+1586
+]
+},
+{
+"tb": 79552,
+"tbk": 1243,
+"tl": 1221197,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1587,
+1588,
+1589,
+1590,
+1591,
+1592
+]
+},
+{
+"tb": 1240,
+"tbk": 31,
+"tl": 3200,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+44,
+46,
+46,
+47,
+403
+]
+},
+{
+"tb": 23168,
+"tbk": 362,
+"tl": 387845,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1587,
+1588,
+1589,
+1590,
+1591,
+1593
+]
+},
+{
+"tb": 512,
+"tbk": 8,
+"tl": 26,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1594,
+1595,
+1596,
+881,
+45,
+46,
+46
+]
+},
+{
+"tb": 78760,
+"tbk": 1969,
+"tl": 3465,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+379,
+380,
+381,
+382,
+383,
+1597,
+1598,
+531
+]
+},
+{
+"tb": 376,
+"tbk": 8,
+"tl": 869,
+"mb": 47,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1599,
+1600,
+1601,
+1602,
+1603,
+1604,
+1605,
+1606,
+1607,
+1608,
+1609,
+1610,
+1611
+]
+},
+{
+"tb": 28224,
+"tbk": 392,
+"tl": 8574,
+"mb": 72,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+232,
+233,
+939,
+1612,
+941,
+942,
+943
+]
+},
+{
+"tb": 1309680,
+"tbk": 1605,
+"tl": 213860,
+"mb": 816,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+504,
+1613,
+1614,
+1615,
+1616,
+1617,
+1618,
+1619,
+1620
+]
+},
+{
+"tb": 768,
+"tbk": 8,
+"tl": 710,
+"mb": 96,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1317,
+1621,
+1622,
+1623,
+1624,
+1625,
+1626,
+1627,
+1628
+]
+},
+{
+"tb": 280,
+"tbk": 7,
+"tl": 747,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+723,
+46,
+46,
+47,
+403,
+438
+]
+},
+{
+"tb": 240,
+"tbk": 6,
+"tl": 376064,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+26,
+27,
+1326,
+1629,
+1630,
+833,
+669
+]
+},
+{
+"tb": 288,
+"tbk": 18,
+"tl": 154671,
+"mb": 32,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1631,
+1632,
+1633,
+1634,
+1635
+]
+},
+{
+"tb": 71680,
+"tbk": 320,
+"tl": 6522284,
+"mb": 17920,
+"mbk": 80,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+1636,
+1637,
+1638,
+862,
+863,
+928,
+743
+]
+},
+{
+"tb": 1280,
+"tbk": 32,
+"tl": 24099,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+160,
+161,
+249,
+250,
+251,
+7,
+56
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6912,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1577,
+1578,
+1579,
+7,
+1639
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 8612,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+944,
+945,
+946,
+7,
+1399
+]
+},
+{
+"tb": 334208,
+"tbk": 452,
+"tl": 1076,
+"mb": 2464,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+1640,
+1641,
+1642,
+1643,
+1644,
+1645
+]
+},
+{
+"tb": 424,
+"tbk": 112,
+"tl": 1932759,
+"mb": 88,
+"mbk": 8,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+703,
+704,
+1646
+]
+},
+{
+"tb": 640,
+"tbk": 16,
+"tl": 11863,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+160,
+161,
+249,
+250,
+251,
+7,
+8
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 1928,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1282,
+840,
+841,
+7,
+1647
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 845,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+44,
+443,
+46,
+85,
+85
+]
+},
+{
+"tb": 15680,
+"tbk": 392,
+"tl": 12682588891,
+"mb": 12544,
+"mbk": 196,
+"gb": 12544,
+"gbk": 196,
+"eb": 12544,
+"ebk": 196,
+"fs": [
+211,
+1648,
+1347,
+1229,
+1230,
+869,
+870
+]
+},
+{
+"tb": 80250,
+"tbk": 1605,
+"tl": 41532,
+"mb": 50,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1649,
+1650,
+1651,
+1652,
+1653,
+1654,
+1655,
+1656,
+1657,
+1658,
+1659,
+1660,
+1661,
+1662,
+1436,
+452,
+596
+]
+},
+{
+"tb": 43616,
+"tbk": 45,
+"tl": 12407,
+"mb": 1856,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1388,
+1389,
+1390,
+1663,
+1664
+]
+},
+{
+"tb": 5376,
+"tbk": 48,
+"tl": 15341,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1665,
+1666,
+1667,
+7,
+56
+]
+},
+{
+"tb": 6080,
+"tbk": 152,
+"tl": 424061,
+"mb": 80,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+1201,
+1202,
+1203,
+1668,
+1669
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 7998,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1160,
+1263,
+1264,
+7,
+89
+]
+},
+{
+"tb": 50,
+"tbk": 1,
+"tl": 30,
+"mb": 50,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+638,
+639,
+640,
+641,
+642,
+643,
+644,
+645,
+646,
+1670,
+1671
+]
+},
+{
+"tb": 24,
+"tbk": 3,
+"tl": 5383,
+"mb": 8,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+518,
+519,
+767,
+768,
+1672,
+770
+]
+},
+{
+"tb": 561750,
+"tbk": 4815,
+"tl": 19032,
+"mb": 200,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+168,
+169,
+170,
+171,
+585,
+586,
+587,
+588,
+589,
+590,
+591,
+592,
+593,
+594,
+1673,
+452,
+596
+]
+},
+{
+"tb": 14496,
+"tbk": 151,
+"tl": 4459897,
+"mb": 384,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1570,
+1571,
+1572,
+1573,
+1674
+]
+},
+{
+"tb": 29568,
+"tbk": 264,
+"tl": 190421,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1282,
+840,
+841,
+7,
+56
+]
+},
+{
+"tb": 913988,
+"tbk": 1605,
+"tl": 3294120,
+"mb": 1112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1675,
+1676,
+1677,
+1678,
+1679,
+1680,
+1681
+]
+},
+{
+"tb": 176,
+"tbk": 1,
+"tl": 93,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+1682,
+935,
+936,
+937,
+938
+]
+},
+{
+"tb": 76800,
+"tbk": 400,
+"tl": 2474756,
+"mb": 9600,
+"mbk": 50,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1495,
+1496,
+1497,
+1683,
+236
+]
+},
+{
+"tb": 4288,
+"tbk": 196,
+"tl": 3771,
+"mb": 80,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+239,
+1684,
+1685,
+1686,
+1687,
+1688,
+1689,
+1690,
+1691
+]
+},
+{
+"tb": 154576,
+"tbk": 1605,
+"tl": 59342851,
+"mb": 268,
+"mbk": 1,
+"gb": 213,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1599,
+1600,
+1601,
+1602,
+1603,
+1604,
+1605,
+1606,
+1607,
+1608,
+1609,
+1610,
+1692
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 9512,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+627,
+370,
+371,
+7,
+56
+]
+},
+{
+"tb": 22704,
+"tbk": 258,
+"tl": 5570,
+"mb": 88,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1693,
+1694,
+603,
+604,
+229,
+605,
+1561
+]
+},
+{
+"tb": 12096,
+"tbk": 168,
+"tl": 182753,
+"mb": 144,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+1695,
+1696,
+350,
+1697,
+1698
+]
+},
+{
+"tb": 40,
+"tbk": 1,
+"tl": 110,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1699,
+1700,
+1701,
+1702,
+1703,
+461,
+1704
+]
+},
+{
+"tb": 176,
+"tbk": 1,
+"tl": 85,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+1705,
+935,
+936,
+937,
+938
+]
+},
+{
+"tb": 544,
+"tbk": 1,
+"tl": 50,
+"mb": 544,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+168,
+1706,
+1707,
+1708,
+1709,
+1710,
+1711,
+1712,
+1713,
+1714,
+1715,
+1716
+]
+},
+{
+"tb": 3168,
+"tbk": 18,
+"tl": 3473,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+341,
+1717,
+1718,
+1719,
+1720
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 872,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+573,
+574,
+1721,
+1722,
+1723,
+1724
+]
+},
+{
+"tb": 331776,
+"tbk": 3448,
+"tl": 2167838,
+"mb": 672,
+"mbk": 5,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+891,
+892,
+893,
+1725,
+1726
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 829,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+39,
+40,
+443,
+118,
+46
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 10520,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1029,
+1030,
+1031,
+7,
+968
+]
+},
+{
+"tb": 224,
+"tbk": 2,
+"tl": 102278,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1665,
+1727,
+1728,
+669,
+1328
+]
+},
+{
+"tb": 2352,
+"tbk": 21,
+"tl": 1352163,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1272,
+1268,
+629,
+630,
+631
+]
+},
+{
+"tb": 17792,
+"tbk": 278,
+"tl": 68912,
+"mb": 256,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1594,
+1595,
+1729,
+542,
+543,
+316,
+317
+]
+},
+{
+"tb": 154464,
+"tbk": 1609,
+"tl": 637464,
+"mb": 96,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+871,
+1730,
+1731,
+636,
+637,
+1732
+]
+},
+{
+"tb": 1366016,
+"tbk": 3712,
+"tl": 2552833,
+"mb": 4048,
+"mbk": 11,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+58,
+59,
+60,
+61,
+62,
+1733
+]
+},
+{
+"tb": 122880,
+"tbk": 1512,
+"tl": 833954,
+"mb": 256,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1734,
+1735,
+1736,
+1737,
+1738,
+1739,
+1740,
+981
+]
+},
+{
+"tb": 340360,
+"tbk": 8509,
+"tl": 1759044,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+1741,
+1742,
+1743,
+1744,
+1745
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 11462,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1029,
+1030,
+1031,
+7,
+1639
+]
+},
+{
+"tb": 960,
+"tbk": 24,
+"tl": 659,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+539,
+540,
+880,
+881,
+46,
+85,
+85
+]
+},
+{
+"tb": 89880,
+"tbk": 1605,
+"tl": 397280,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+555,
+1217,
+1014,
+1015,
+421,
+422
+]
+},
+{
+"tb": 14336,
+"tbk": 128,
+"tl": 81414,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+265,
+157,
+158,
+7,
+968
+]
+},
+{
+"tb": 596160,
+"tbk": 8280,
+"tl": 8308183,
+"mb": 432,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+1746,
+800,
+126,
+801,
+802
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 859,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+39,
+40,
+42,
+40,
+46
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 14053,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+4,
+5,
+6,
+7,
+331
+]
+},
+{
+"tb": 240,
+"tbk": 1,
+"tl": 64599125,
+"mb": 240,
+"mbk": 1,
+"gb": 240,
+"gbk": 1,
+"eb": 240,
+"ebk": 1,
+"fs": [
+1,
+1747,
+1748,
+23,
+24,
+25,
+1033,
+1749,
+1750,
+1751
+]
+},
+{
+"tb": 1232,
+"tbk": 7,
+"tl": 1496,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+341,
+342,
+343,
+344,
+1300
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 738,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+1456,
+46,
+85,
+85,
+46
+]
+},
+{
+"tb": 46456,
+"tbk": 3871,
+"tl": 22842961,
+"mb": 48,
+"mbk": 2,
+"gb": 24,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+789,
+1752,
+1753,
+1754,
+1755,
+1756,
+1757,
+1758,
+1759
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 12037,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1282,
+840,
+841,
+7,
+331
+]
+},
+{
+"tb": 70000,
+"tbk": 1750,
+"tl": 2739,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1760,
+1761,
+1762,
+1763,
+1764,
+1765,
+1446
+]
+},
+{
+"tb": 12840,
+"tbk": 321,
+"tl": 942,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1580,
+1581,
+1582,
+1766,
+1767,
+1768,
+1769
+]
+},
+{
+"tb": 3584,
+"tbk": 16,
+"tl": 3260,
+"mb": 224,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1165,
+1549,
+1550,
+1551,
+1552,
+1553,
+1554,
+1555,
+1556,
+1770
+]
+},
+{
+"tb": 729344,
+"tbk": 6512,
+"tl": 747432,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+143,
+144,
+303,
+304,
+445
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 13069,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1282,
+840,
+841,
+7,
+132
+]
+},
+{
+"tb": 17520,
+"tbk": 438,
+"tl": 2309,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1771,
+1772,
+1773,
+1774,
+1775,
+1776,
+1777
+]
+},
+{
+"tb": 3136,
+"tbk": 400,
+"tl": 25882357127,
+"mb": 3136,
+"mbk": 400,
+"gb": 3136,
+"gbk": 400,
+"eb": 3136,
+"ebk": 400,
+"fs": [
+9,
+239,
+240,
+241,
+242,
+865,
+866,
+867,
+1778,
+1779,
+869
+]
+},
+{
+"tb": 10368,
+"tbk": 144,
+"tl": 160746,
+"mb": 216,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+1780,
+1781,
+1698,
+1782,
+1783
+]
+},
+{
+"tb": 6688,
+"tbk": 38,
+"tl": 4444,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+1784,
+1785,
+1786,
+1787,
+1512
+]
+},
+{
+"tb": 18816,
+"tbk": 44,
+"tl": 776811408,
+"mb": 9984,
+"mbk": 12,
+"gb": 9984,
+"gbk": 12,
+"eb": 9984,
+"ebk": 12,
+"fs": [
+204,
+205,
+575,
+576,
+577,
+578,
+1788
+]
+},
+{
+"tb": 16560,
+"tbk": 8280,
+"tl": 28773373,
+"mb": 12,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+414,
+1789
+]
+},
+{
+"tb": 760,
+"tbk": 19,
+"tl": 1329473,
+"mb": 80,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+129,
+1790,
+1791,
+1792,
+669
+]
+},
+{
+"tb": 1942848,
+"tbk": 26984,
+"tl": 26347462,
+"mb": 1152,
+"mbk": 16,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1793,
+1794,
+1795,
+1796,
+1797,
+1798,
+1799,
+1800
+]
+},
+{
+"tb": 440,
+"tbk": 88,
+"tl": 353466,
+"mb": 10,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+1801
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 780,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+39,
+40,
+1802,
+306,
+46
+]
+},
+{
+"tb": 336,
+"tbk": 3,
+"tl": 216438,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+501,
+721,
+722,
+668,
+669
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 8514,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+369,
+370,
+371,
+7,
+442
+]
+},
+{
+"tb": 47040,
+"tbk": 392,
+"tl": 3603,
+"mb": 192,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+1247,
+941,
+942,
+943,
+1248,
+1803
+]
+},
+{
+"tb": 12800,
+"tbk": 200,
+"tl": 67756,
+"mb": 512,
+"mbk": 8,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+953,
+954,
+955,
+956,
+957,
+1804
+]
+},
+{
+"tb": 112,
+"tbk": 1,
+"tl": 36078,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+665,
+666,
+667,
+1224,
+1225
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 7863,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+257,
+258,
+259,
+7,
+8
+]
+},
+{
+"tb": 48,
+"tbk": 1,
+"tl": 64598432,
+"mb": 48,
+"mbk": 1,
+"gb": 48,
+"gbk": 1,
+"eb": 48,
+"ebk": 1,
+"fs": [
+1,
+416,
+417,
+1563,
+741,
+742,
+23,
+24,
+25
+]
+},
+{
+"tb": 76560,
+"tbk": 435,
+"tl": 156609,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+912,
+1126,
+1127,
+1128,
+1129
+]
+},
+{
+"tb": 5376,
+"tbk": 48,
+"tl": 25007,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+265,
+157,
+158,
+7,
+1405
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 16694,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+86,
+87,
+88,
+7,
+331
+]
+},
+{
+"tb": 960,
+"tbk": 24,
+"tl": 2616,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+392,
+393,
+45,
+46,
+85,
+85
+]
+},
+{
+"tb": 64,
+"tbk": 1,
+"tl": 289,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+266,
+267,
+1805,
+1664,
+1806,
+1807,
+1808
+]
+},
+{
+"tb": 234240,
+"tbk": 1208,
+"tl": 602223,
+"mb": 240,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1486,
+1809,
+1810,
+1811,
+1812,
+1813,
+1814,
+1815,
+1816,
+1817
+]
+},
+{
+"tb": 25088,
+"tbk": 224,
+"tl": 119620,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+330,
+5,
+6,
+7,
+56
+]
+},
+{
+"tb": 4608,
+"tbk": 64,
+"tl": 83877,
+"mb": 216,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+1818,
+1819,
+1783,
+1820,
+124
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 829,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+392,
+393,
+42,
+40,
+46,
+85
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6221,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+330,
+5,
+6,
+7,
+1405
+]
+},
+{
+"tb": 176,
+"tbk": 1,
+"tl": 277,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+912,
+1821,
+1822,
+1823,
+1824
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 878,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+573,
+574,
+670,
+46,
+85,
+46
+]
+},
+{
+"tb": 17520,
+"tbk": 438,
+"tl": 203747,
+"mb": 80,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1699,
+1700,
+1825,
+1826,
+1664,
+1806,
+461
+]
+},
+{
+"tb": 2688,
+"tbk": 7,
+"tl": 454462,
+"mb": 384,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+784,
+1827,
+1828,
+1829,
+1830,
+1831
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 10365,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1272,
+1030,
+1031,
+7,
+968
+]
+},
+{
+"tb": 16192,
+"tbk": 112,
+"tl": 62118,
+"mb": 512,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1832,
+1833,
+1834,
+636,
+637,
+1732
+]
+},
+{
+"tb": 1202304,
+"tbk": 3099,
+"tl": 48496,
+"mb": 768,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1835,
+1836,
+1837,
+1838,
+1839,
+1840,
+1841,
+1842,
+1843,
+1844
+]
+},
+{
+"tb": 4320,
+"tbk": 18,
+"tl": 17163,
+"mb": 720,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+816,
+817,
+1845,
+1846,
+636,
+637
+]
+},
+{
+"tb": 727320,
+"tbk": 6270,
+"tl": 33920383,
+"mb": 232,
+"mbk": 2,
+"gb": 232,
+"gbk": 2,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+1847,
+1848,
+1849,
+1850
+]
+},
+{
+"tb": 560,
+"tbk": 14,
+"tl": 200,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+313,
+314,
+402,
+46,
+85,
+46,
+47
+]
+},
+{
+"tb": 3640,
+"tbk": 13,
+"tl": 12554,
+"mb": 840,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1851,
+1852,
+1853,
+1854,
+636,
+637
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 889,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+723,
+45,
+46,
+85,
+85,
+46
+]
+},
+{
+"tb": 960,
+"tbk": 24,
+"tl": 8012,
+"mb": 80,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+160,
+161,
+249,
+250,
+251,
+7,
+1855
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 205,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+539,
+540,
+880,
+881,
+45,
+45,
+46
+]
+},
+{
+"tb": 320,
+"tbk": 5,
+"tl": 110587,
+"mb": 128,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+266,
+267,
+268,
+1856,
+1857,
+1304,
+1304
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 796,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+691,
+119,
+119,
+46,
+46
+]
+},
+{
+"tb": 493248,
+"tbk": 4404,
+"tl": 919702,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+4,
+5,
+982,
+1858,
+1859
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6756,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+830,
+1263,
+1264,
+7,
+167
+]
+},
+{
+"tb": 387,
+"tbk": 100,
+"tl": 116743,
+"mb": 28,
+"mbk": 7,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+703,
+704,
+1860
+]
+},
+{
+"tb": 195936,
+"tbk": 1985,
+"tl": 33039,
+"mb": 192,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+734,
+735,
+736,
+737,
+1861
+]
+},
+{
+"tb": 352,
+"tbk": 2,
+"tl": 228,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+423,
+1200,
+102,
+103,
+104
+]
+},
+{
+"tb": 400,
+"tbk": 10,
+"tl": 662393,
+"mb": 40,
+"mbk": 1,
+"gb": 40,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+26,
+27,
+1326,
+1629,
+1630,
+668,
+669
+]
+},
+{
+"tb": 640,
+"tbk": 16,
+"tl": 327,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+539,
+540,
+1862,
+881,
+46,
+46,
+47
+]
+},
+{
+"tb": 25088,
+"tbk": 392,
+"tl": 70380,
+"mb": 384,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1594,
+1595,
+1729,
+542,
+543,
+1863,
+1864
+]
+},
+{
+"tb": 1664,
+"tbk": 416,
+"tl": 1598518,
+"mb": 12,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+1865
+]
+},
+{
+"tb": 448,
+"tbk": 8,
+"tl": 14,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+83,
+896,
+118,
+45,
+46,
+46
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 886,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+691,
+118,
+46,
+85,
+46
+]
+},
+{
+"tb": 31944,
+"tbk": 2183,
+"tl": 1684627,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+947,
+948,
+949,
+950,
+1866,
+1867
+]
+},
+{
+"tb": 1280,
+"tbk": 32,
+"tl": 3476,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+39,
+40,
+42,
+40,
+42
+]
+},
+{
+"tb": 576840,
+"tbk": 3135,
+"tl": 204167,
+"mb": 184,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1868,
+1869,
+1870,
+1871,
+1872,
+1873,
+1874,
+1875,
+1876
+]
+},
+{
+"tb": 203813056,
+"tbk": 67757,
+"tl": 1068281,
+"mb": 3008,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1877,
+1878,
+1879,
+1880,
+1881
+]
+},
+{
+"tb": 4480,
+"tbk": 8,
+"tl": 89921,
+"mb": 896,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+1537,
+1538,
+1539,
+862,
+863,
+928
+]
+},
+{
+"tb": 85120,
+"tbk": 760,
+"tl": 463177,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+490,
+491,
+492,
+7,
+56
+]
+},
+{
+"tb": 11904,
+"tbk": 20,
+"tl": 179037,
+"mb": 1536,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+852,
+853,
+854,
+855,
+1882,
+1883
+]
+},
+{
+"tb": 272,
+"tbk": 22,
+"tl": 4305,
+"mb": 28,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1884,
+1885,
+1886,
+1887,
+1888,
+1889,
+1890,
+1891,
+1892
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 11512,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+830,
+1263,
+1264,
+7,
+230
+]
+},
+{
+"tb": 352,
+"tbk": 2,
+"tl": 753,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+457,
+803,
+459,
+460,
+1485
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5629,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+808,
+144,
+145,
+7,
+968
+]
+},
+{
+"tb": 19308,
+"tbk": 1609,
+"tl": 3900,
+"mb": 12,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1139,
+1140,
+1141,
+1142,
+1143,
+1144,
+1145,
+1146,
+1147,
+1148,
+1149,
+1893,
+1894,
+1895
+]
+},
+{
+"tb": 960,
+"tbk": 240,
+"tl": 1416661,
+"mb": 118,
+"mbk": 29,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+712,
+713,
+714,
+1896,
+236,
+237
+]
+},
+{
+"tb": 844712,
+"tbk": 7282,
+"tl": 163361,
+"mb": 116,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+1897,
+1898,
+1899,
+1900
+]
+},
+{
+"tb": 102032,
+"tbk": 911,
+"tl": 602436,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+808,
+144,
+444,
+304,
+305
+]
+},
+{
+"tb": 729344,
+"tbk": 6512,
+"tl": 691891,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+808,
+144,
+303,
+304,
+445
+]
+},
+{
+"tb": 2336,
+"tbk": 584,
+"tl": 2583796,
+"mb": 12,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+1901
+]
+},
+{
+"tb": 5560,
+"tbk": 139,
+"tl": 232,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+379,
+380,
+381,
+382,
+383,
+1902,
+1903,
+1904
+]
+},
+{
+"tb": 85904,
+"tbk": 767,
+"tl": 591956,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+143,
+144,
+807,
+304,
+305
+]
+},
+{
+"tb": 264,
+"tbk": 24,
+"tl": 109903,
+"mb": 11,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+414,
+1905
+]
+},
+{
+"tb": 120,
+"tbk": 24,
+"tl": 105331,
+"mb": 5,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+1906
+]
+},
+{
+"tb": 640,
+"tbk": 16,
+"tl": 1689,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+392,
+393,
+41,
+118,
+46,
+85
+]
+},
+{
+"tb": 33440,
+"tbk": 10708,
+"tl": 748847,
+"mb": 40,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1599,
+1600,
+1601,
+1602,
+1603,
+1604,
+1605,
+1606,
+1607,
+1608,
+1609,
+1610,
+1907
+]
+},
+{
+"tb": 1600,
+"tbk": 40,
+"tl": 63,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+379,
+380,
+381,
+382,
+383,
+1908,
+1909,
+386
+]
+},
+{
+"tb": 416,
+"tbk": 8,
+"tl": 801,
+"mb": 52,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1599,
+1600,
+1601,
+1602,
+1603,
+1604,
+1605,
+1606,
+1607,
+1608,
+1609,
+1610,
+1910
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 1041,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+26,
+27,
+28,
+1911,
+740,
+42,
+40
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5101,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+330,
+5,
+6,
+7,
+1299
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 959,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1912,
+1913,
+1914,
+476,
+477,
+377
+]
+},
+{
+"tb": 10795712,
+"tbk": 3589,
+"tl": 20409,
+"mb": 3008,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1915,
+1916,
+1917,
+1918,
+1919
+]
+},
+{
+"tb": 2296,
+"tbk": 41,
+"tl": 112,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+83,
+896,
+46,
+85,
+47,
+403
+]
+},
+{
+"tb": 233024,
+"tbk": 7282,
+"tl": 99659,
+"mb": 32,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1920,
+1921,
+1922,
+1923,
+438
+]
+},
+{
+"tb": 176,
+"tbk": 1,
+"tl": 267,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+457,
+1924,
+1925,
+460,
+461
+]
+},
+{
+"tb": 640,
+"tbk": 16,
+"tl": 1627,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+1456,
+46,
+85,
+46,
+47
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 3555,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+711,
+440,
+441,
+7,
+913
+]
+},
+{
+"tb": 172416,
+"tbk": 2768,
+"tl": 1340393,
+"mb": 288,
+"mbk": 2,
+"gb": 96,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+632,
+633,
+1926,
+1927,
+193,
+194
+]
+},
+{
+"tb": 352,
+"tbk": 2,
+"tl": 708,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+341,
+453,
+454,
+455,
+456
+]
+},
+{
+"tb": 336,
+"tbk": 3,
+"tl": 162684,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+697,
+1928,
+1929,
+700,
+701
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 5940,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+129,
+130,
+131,
+7,
+1930
+]
+},
+{
+"tb": 159408,
+"tbk": 1945,
+"tl": 38471,
+"mb": 336,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1931,
+1932,
+1933,
+1934,
+1935,
+1936,
+1937,
+1938,
+1939
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 773,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+573,
+574,
+443,
+46,
+46,
+47
+]
+},
+{
+"tb": 116688,
+"tbk": 1296,
+"tl": 20368097,
+"mb": 1920,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1540,
+1940,
+1941,
+1942,
+1943,
+1944,
+1945,
+1946,
+1947,
+1948
+]
+},
+{
+"tb": 48,
+"tbk": 1,
+"tl": 64598855,
+"mb": 48,
+"mbk": 1,
+"gb": 48,
+"gbk": 1,
+"eb": 48,
+"ebk": 1,
+"fs": [
+1,
+416,
+417,
+418,
+741,
+742,
+23,
+24,
+25
+]
+},
+{
+"tb": 519360,
+"tbk": 3486,
+"tl": 6957693,
+"mb": 2072,
+"mbk": 14,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1675,
+1676,
+1677,
+1949,
+1950,
+1951,
+1952
+]
+},
+{
+"tb": 1800,
+"tbk": 45,
+"tl": 81,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+897,
+898,
+899,
+900,
+900,
+901,
+1953
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 114,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+539,
+540,
+880,
+881,
+45,
+46,
+46
+]
+},
+{
+"tb": 168192,
+"tbk": 712,
+"tl": 217056,
+"mb": 408,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+1954,
+1955,
+1956
+]
+},
+{
+"tb": 26174340,
+"tbk": 14445,
+"tl": 59584866,
+"mb": 3624,
+"mbk": 2,
+"gb": 1812,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+1957,
+1958,
+1959,
+1960
+]
+},
+{
+"tb": 3584,
+"tbk": 32,
+"tl": 21938,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+283,
+840,
+841,
+7,
+968
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 793,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+573,
+574,
+46,
+46,
+47,
+403
+]
+},
+{
+"tb": 4465224,
+"tbk": 3242,
+"tl": 547745,
+"mb": 6788,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+1961,
+1962,
+1963,
+1964
+]
+},
+{
+"tb": 208576,
+"tbk": 6518,
+"tl": 176565,
+"mb": 32,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1920,
+1921,
+1922,
+1965,
+1966
+]
+},
+{
+"tb": 821760,
+"tbk": 12840,
+"tl": 10910173,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1967,
+1968,
+1969,
+1970,
+1971,
+1972,
+1973,
+1974
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 918,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+392,
+393,
+41,
+46,
+85,
+85
+]
+},
+{
+"tb": 61440,
+"tbk": 1536,
+"tl": 3437,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+379,
+380,
+381,
+382,
+1375,
+1975,
+1976,
+1977
+]
+},
+{
+"tb": 28224,
+"tbk": 392,
+"tl": 2475378,
+"mb": 3528,
+"mbk": 49,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+1978,
+1979,
+1980,
+1981,
+1982,
+717,
+238
+]
+},
+{
+"tb": 90440,
+"tbk": 1615,
+"tl": 4184,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+83,
+84,
+46,
+85,
+47,
+403
+]
+},
+{
+"tb": 15232,
+"tbk": 136,
+"tl": 66477,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+711,
+440,
+441,
+7,
+56
+]
+},
+{
+"tb": 5712,
+"tbk": 51,
+"tl": 6861,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+808,
+144,
+807,
+304,
+908
+]
+},
+{
+"tb": 676512,
+"tbk": 1044,
+"tl": 744245,
+"mb": 3888,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1379,
+1380,
+1983,
+1984,
+636,
+637
+]
+},
+{
+"tb": 38400,
+"tbk": 600,
+"tl": 93269,
+"mb": 384,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1594,
+1595,
+1729,
+542,
+543,
+1523,
+1524
+]
+},
+{
+"tb": 176,
+"tbk": 1,
+"tl": 234,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+1060,
+920,
+921,
+922,
+923
+]
+},
+{
+"tb": 128,
+"tbk": 2,
+"tl": 82,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+266,
+267,
+1482,
+1483,
+1484,
+461,
+1985
+]
+},
+{
+"tb": 5376,
+"tbk": 48,
+"tl": 38157,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+330,
+5,
+6,
+7,
+8
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 2098,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+924,
+1578,
+1579,
+7,
+56
+]
+},
+{
+"tb": 5120,
+"tbk": 216,
+"tl": 12682544683,
+"mb": 3392,
+"mbk": 197,
+"gb": 3136,
+"gbk": 196,
+"eb": 3136,
+"ebk": 196,
+"fs": [
+204,
+205,
+692,
+693,
+694,
+1986,
+1987
+]
+},
+{
+"tb": 672,
+"tbk": 168,
+"tl": 660408,
+"mb": 8,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+1988
+]
+},
+{
+"tb": 320,
+"tbk": 80,
+"tl": 255093,
+"mb": 8,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+1475,
+1989
+]
+},
+{
+"tb": 552,
+"tbk": 3,
+"tl": 894,
+"mb": 368,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+1990,
+1991,
+1992,
+1993,
+1994,
+1995,
+1996,
+1997,
+1998
+]
+},
+{
+"tb": 3584,
+"tbk": 32,
+"tl": 22237,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+839,
+840,
+841,
+7,
+968
+]
+},
+{
+"tb": 512,
+"tbk": 8,
+"tl": 139,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1594,
+1595,
+1596,
+881,
+306,
+41,
+46
+]
+},
+{
+"tb": 163008,
+"tbk": 2264,
+"tl": 624974,
+"mb": 72,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+446,
+447,
+1999,
+2000,
+2001,
+2002,
+2003
+]
+},
+{
+"tb": 448,
+"tbk": 8,
+"tl": 1187,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1165,
+1549,
+1550,
+1551,
+1552,
+1553,
+1554,
+1555,
+1556,
+2004
+]
+},
+{
+"tb": 137456,
+"tbk": 781,
+"tl": 120148,
+"mb": 704,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+423,
+101,
+102,
+103,
+426
+]
+},
+{
+"tb": 95040,
+"tbk": 297,
+"tl": 281653,
+"mb": 1600,
+"mbk": 5,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2005,
+2006,
+2007,
+2008,
+636,
+637
+]
+},
+{
+"tb": 768,
+"tbk": 24,
+"tl": 17095,
+"mb": 128,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+2009,
+2010,
+2011,
+2012,
+2013,
+2014,
+2015
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 811,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+2016,
+443,
+46,
+85,
+46
+]
+},
+{
+"tb": 103242,
+"tbk": 6591,
+"tl": 621689,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2017,
+2018,
+2019,
+2020,
+2021,
+2022
+]
+},
+{
+"tb": 1309680,
+"tbk": 1605,
+"tl": 242792,
+"mb": 816,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1032,
+419,
+420,
+421,
+422,
+2023
+]
+},
+{
+"tb": 64,
+"tbk": 1,
+"tl": 38,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+266,
+267,
+1482,
+1483,
+1484,
+2024,
+2025
+]
+},
+{
+"tb": 1536,
+"tbk": 384,
+"tl": 1453724,
+"mb": 12,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+414,
+2026
+]
+},
+{
+"tb": 32928,
+"tbk": 196,
+"tl": 12682631886,
+"mb": 32928,
+"mbk": 196,
+"gb": 32928,
+"gbk": 196,
+"eb": 32928,
+"ebk": 196,
+"fs": [
+211,
+1081,
+1082,
+1083,
+302,
+214,
+215,
+216
+]
+},
+{
+"tb": 51744,
+"tbk": 294,
+"tl": 31442,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+423,
+1200,
+425,
+103,
+426
+]
+},
+{
+"tb": 448,
+"tbk": 8,
+"tl": 26,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+83,
+84,
+45,
+45,
+46,
+46
+]
+},
+{
+"tb": 80,
+"tbk": 80,
+"tl": 303543,
+"mb": 2,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+414,
+2027
+]
+},
+{
+"tb": 4640,
+"tbk": 4,
+"tl": 1039,
+"mb": 1856,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1388,
+1389,
+1390,
+2028,
+1703
+]
+},
+{
+"tb": 3287040,
+"tbk": 12840,
+"tl": 1167756,
+"mb": 256,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2029,
+2030,
+2031,
+2032,
+2033,
+2034,
+2035
+]
+},
+{
+"tb": 6282784,
+"tbk": 13624,
+"tl": 2239342,
+"mb": 2552,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+2036,
+2037,
+2038,
+2039
+]
+},
+{
+"tb": 896,
+"tbk": 4,
+"tl": 4755,
+"mb": 224,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+1301,
+1302,
+1400,
+862,
+863,
+864,
+215
+]
+},
+{
+"tb": 234240,
+"tbk": 1208,
+"tl": 2174209,
+"mb": 240,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1486,
+2040,
+2041,
+2042,
+2043,
+2044,
+2045,
+2046
+]
+},
+{
+"tb": 9216,
+"tbk": 168,
+"tl": 68639,
+"mb": 128,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1734,
+2047,
+2048,
+2049,
+1054,
+1055,
+1056,
+2050,
+673,
+674
+]
+},
+{
+"tb": 73504,
+"tbk": 2297,
+"tl": 574866,
+"mb": 32,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+2051,
+2052,
+2053,
+2054,
+2055,
+2056,
+2057
+]
+},
+{
+"tb": 6272,
+"tbk": 56,
+"tl": 33514,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+697,
+888,
+889,
+7,
+56
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 3228,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+265,
+157,
+158,
+7,
+1930
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 10549,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1272,
+1030,
+1031,
+7,
+887
+]
+},
+{
+"tb": 75520,
+"tbk": 424,
+"tl": 68837,
+"mb": 640,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+2058,
+2059,
+2060,
+2061,
+238
+]
+},
+{
+"tb": 1584,
+"tbk": 1584,
+"tl": 5412852,
+"mb": 4,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+414,
+2062
+]
+},
+{
+"tb": 333063,
+"tbk": 6436,
+"tl": 83776,
+"mb": 54,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+2063,
+2064,
+2065,
+2066,
+2067,
+2068,
+2069,
+2070,
+2071,
+2072,
+2073,
+1001,
+1002,
+1003,
+2074
+]
+},
+{
+"tb": 8064,
+"tbk": 72,
+"tl": 31827,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+439,
+440,
+441,
+7,
+132
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 4760,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+665,
+945,
+946,
+7,
+8
+]
+},
+{
+"tb": 820512,
+"tbk": 7326,
+"tl": 324809,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+808,
+144,
+303,
+718,
+719
+]
+},
+{
+"tb": 58240,
+"tbk": 1456,
+"tl": 2280,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+379,
+380,
+381,
+382,
+383,
+2075,
+2076,
+386
+]
+},
+{
+"tb": 1098752,
+"tbk": 12840,
+"tl": 481303,
+"mb": 128,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+65,
+66,
+67,
+68,
+2077,
+2078,
+2079,
+2080
+]
+},
+{
+"tb": 2336,
+"tbk": 584,
+"tl": 2553220,
+"mb": 12,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+2081
+]
+},
+{
+"tb": 51744,
+"tbk": 294,
+"tl": 34009,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+100,
+1200,
+425,
+103,
+426
+]
+},
+{
+"tb": 129520,
+"tbk": 3238,
+"tl": 100243,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+539,
+540,
+880,
+881,
+443,
+46,
+85
+]
+},
+{
+"tb": 2240,
+"tbk": 56,
+"tl": 5922,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+392,
+393,
+46,
+46,
+47,
+403
+]
+},
+{
+"tb": 448,
+"tbk": 8,
+"tl": 25,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+83,
+84,
+42,
+40,
+46,
+46
+]
+},
+{
+"tb": 448,
+"tbk": 8,
+"tl": 13,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+83,
+84,
+46,
+85,
+85,
+46
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 862,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1339,
+1340,
+45,
+46,
+85,
+46
+]
+},
+{
+"tb": 640,
+"tbk": 16,
+"tl": 1711,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+1221,
+46,
+85,
+46,
+47
+]
+},
+{
+"tb": 3696,
+"tbk": 21,
+"tl": 3669,
+"mb": 528,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+919,
+1061,
+1062,
+922,
+923
+]
+},
+{
+"tb": 640,
+"tbk": 16,
+"tl": 1516,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+39,
+40,
+46,
+46,
+47
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5003,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1665,
+1666,
+1667,
+7,
+8
+]
+},
+{
+"tb": 40,
+"tbk": 1,
+"tl": 351,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+2082,
+2083,
+2084,
+2085,
+2086,
+584,
+1485
+]
+},
+{
+"tb": 117504,
+"tbk": 455,
+"tl": 3395,
+"mb": 512,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+351,
+2087,
+2088,
+2089,
+2090,
+2091,
+2092,
+2093,
+2094,
+2095
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 7834,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+156,
+157,
+158,
+7,
+167
+]
+},
+{
+"tb": 1909760,
+"tbk": 1688,
+"tl": 52537,
+"mb": 8192,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+2096,
+2097,
+2098,
+2099,
+2100
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 865,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+117,
+1721,
+1722,
+1723,
+1724
+]
+},
+{
+"tb": 198648,
+"tbk": 2759,
+"tl": 5969,
+"mb": 72,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+2101,
+2102,
+2103,
+2104,
+2105,
+2106,
+2107
+]
+},
+{
+"tb": 56,
+"tbk": 1,
+"tl": 64598423,
+"mb": 56,
+"mbk": 1,
+"gb": 56,
+"gbk": 1,
+"eb": 56,
+"ebk": 1,
+"fs": [
+1,
+555,
+1563,
+741,
+742,
+23,
+24,
+25
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5869,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+265,
+157,
+158,
+7,
+442
+]
+},
+{
+"tb": 14112,
+"tbk": 196,
+"tl": 12682633907,
+"mb": 14112,
+"mbk": 196,
+"gb": 14112,
+"gbk": 196,
+"eb": 14112,
+"ebk": 196,
+"fs": [
+211,
+2108,
+2109,
+2110,
+302,
+214,
+215,
+216
+]
+},
+{
+"tb": 16,
+"tbk": 2,
+"tl": 3609,
+"mb": 8,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+518,
+519,
+767,
+768,
+2111,
+770
+]
+},
+{
+"tb": 96,
+"tbk": 1,
+"tl": 25,
+"mb": 96,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1540,
+2112,
+2113,
+2114,
+2115,
+2116,
+2117,
+2118,
+2119
+]
+},
+{
+"tb": 4640,
+"tbk": 5,
+"tl": 920,
+"mb": 928,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1388,
+1389,
+1390,
+2120,
+2121
+]
+},
+{
+"tb": 465856,
+"tbk": 464,
+"tl": 98062,
+"mb": 3712,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1388,
+1389,
+1390,
+2122,
+2123
+]
+},
+{
+"tb": 11264,
+"tbk": 64,
+"tl": 17828,
+"mb": 528,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+1705,
+935,
+936,
+937,
+1504
+]
+},
+{
+"tb": 378560,
+"tbk": 3380,
+"tl": 446428,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+156,
+157,
+2124,
+1745,
+2125
+]
+},
+{
+"tb": 107712,
+"tbk": 1496,
+"tl": 224364,
+"mb": 72,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+446,
+447,
+2126,
+2127,
+2128,
+2129,
+2130
+]
+},
+{
+"tb": 435744,
+"tbk": 801,
+"tl": 2920842,
+"mb": 1088,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+2131,
+2132,
+2133,
+2134,
+2135,
+2136
+]
+},
+{
+"tb": 80250,
+"tbk": 1605,
+"tl": 20877,
+"mb": 50,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+638,
+639,
+640,
+641,
+642,
+643,
+644,
+645,
+646,
+2137,
+1673,
+452,
+596
+]
+},
+{
+"tb": 722088,
+"tbk": 10029,
+"tl": 58018587,
+"mb": 288,
+"mbk": 4,
+"gb": 144,
+"gbk": 2,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+446,
+447,
+2138,
+2139,
+2140,
+2141,
+2142
+]
+},
+{
+"tb": 41280,
+"tbk": 1032,
+"tl": 24608,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+600,
+601,
+602,
+227,
+228,
+229,
+605
+]
+},
+{
+"tb": 24000,
+"tbk": 600,
+"tl": 103709,
+"mb": 240,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+539,
+540,
+541,
+542,
+543,
+1523,
+1524
+]
+},
+{
+"tb": 1008,
+"tbk": 9,
+"tl": 608607,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+830,
+831,
+832,
+668,
+669
+]
+},
+{
+"tb": 560,
+"tbk": 5,
+"tl": 302025,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+702,
+2143,
+926,
+701,
+927
+]
+},
+{
+"tb": 1920,
+"tbk": 48,
+"tl": 2938326,
+"mb": 120,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+326,
+327,
+328,
+329,
+2144,
+2145,
+927
+]
+},
+{
+"tb": 9520,
+"tbk": 170,
+"tl": 23160,
+"mb": 112,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+658,
+659,
+661,
+764,
+1220,
+2146,
+2147
+]
+},
+{
+"tb": 6512,
+"tbk": 37,
+"tl": 2275,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+100,
+806,
+425,
+103,
+104
+]
+},
+{
+"tb": 1536,
+"tbk": 8,
+"tl": 348,
+"mb": 192,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1495,
+1496,
+1497,
+2148,
+237
+]
+},
+{
+"tb": 1392,
+"tbk": 58,
+"tl": 15194,
+"mb": 72,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+494,
+495,
+496,
+497,
+1305,
+1306,
+2149
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 900,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+117,
+45,
+46,
+46,
+47
+]
+},
+{
+"tb": 5760,
+"tbk": 232,
+"tl": 14848,
+"mb": 256,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+692,
+693,
+694,
+2150,
+2151
+]
+},
+{
+"tb": 4752,
+"tbk": 27,
+"tl": 6007,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+252,
+453,
+454,
+455,
+749
+]
+},
+{
+"tb": 70000,
+"tbk": 1750,
+"tl": 2624,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1760,
+1761,
+2152,
+2153,
+1765,
+1446,
+2154
+]
+},
+{
+"tb": 436560,
+"tbk": 1605,
+"tl": 325160,
+"mb": 272,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2155,
+2156,
+2157,
+421,
+422,
+2023
+]
+},
+{
+"tb": 4768,
+"tbk": 4,
+"tl": 258701558,
+"mb": 4768,
+"mbk": 4,
+"gb": 4768,
+"gbk": 4,
+"eb": 4768,
+"ebk": 4,
+"fs": [
+2158,
+2159,
+2160,
+2161,
+2162,
+2163,
+2164,
+2165
+]
+},
+{
+"tb": 2053356,
+"tbk": 131589,
+"tl": 5764154836,
+"mb": 1448,
+"mbk": 93,
+"gb": 1416,
+"gbk": 92,
+"eb": 1256,
+"ebk": 91,
+"fs": [
+204,
+205,
+2166,
+2167,
+2168,
+2169,
+2170,
+2171
+]
+},
+{
+"tb": 4608,
+"tbk": 24,
+"tl": 216453,
+"mb": 576,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1495,
+1496,
+1497,
+2172,
+236
+]
+},
+{
+"tb": 8480,
+"tbk": 1696,
+"tl": 7231689,
+"mb": 25,
+"mbk": 5,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+2173
+]
+},
+{
+"tb": 8160,
+"tbk": 24,
+"tl": 21373,
+"mb": 680,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+2174,
+2175,
+2176
+]
+},
+{
+"tb": 64,
+"tbk": 64,
+"tl": 317086,
+"mb": 3,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+414,
+2177
+]
+},
+{
+"tb": 512,
+"tbk": 8,
+"tl": 183,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1594,
+1595,
+1596,
+881,
+41,
+45,
+46
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 807,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+691,
+119,
+443,
+46,
+46
+]
+},
+{
+"tb": 5376,
+"tbk": 48,
+"tl": 28751,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+105,
+106,
+107,
+7,
+230
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 834,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+44,
+443,
+118,
+46,
+46
+]
+},
+{
+"tb": 32,
+"tbk": 1,
+"tl": 397,
+"mb": 32,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+809,
+810,
+811,
+812,
+1304,
+1304,
+1304
+]
+},
+{
+"tb": 48,
+"tbk": 1,
+"tl": 64597907,
+"mb": 48,
+"mbk": 1,
+"gb": 48,
+"gbk": 1,
+"eb": 48,
+"ebk": 1,
+"fs": [
+1,
+1011,
+1012,
+2178,
+390,
+391,
+23,
+24,
+25
+]
+},
+{
+"tb": 768,
+"tbk": 16,
+"tl": 11372,
+"mb": 96,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+2179,
+2180,
+2181,
+2182,
+2183,
+2184,
+2185,
+2186,
+2187,
+2188
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 2002,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+283,
+840,
+841,
+7,
+1647
+]
+},
+{
+"tb": 864,
+"tbk": 16,
+"tl": 72,
+"mb": 54,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1139,
+1140,
+1141,
+1142,
+1143,
+1144,
+1145,
+1146,
+1147,
+1148,
+2189,
+1120,
+2190,
+2191
+]
+},
+{
+"tb": 1217864,
+"tbk": 5569,
+"tl": 52402098,
+"mb": 4096,
+"mbk": 1,
+"gb": 2048,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+168,
+2192,
+2193,
+2194,
+2195,
+2196,
+2197,
+2198,
+2199,
+2200,
+2201,
+2202,
+2203,
+2204,
+2205,
+2206,
+2207,
+2190,
+2208,
+2209
+]
+},
+{
+"tb": 504,
+"tbk": 168,
+"tl": 593228,
+"mb": 6,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+2210
+]
+},
+{
+"tb": 6144,
+"tbk": 32,
+"tl": 9440,
+"mb": 192,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+606,
+607,
+608,
+2211,
+2212
+]
+},
+{
+"tb": 12160,
+"tbk": 304,
+"tl": 1127,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+897,
+898,
+899,
+900,
+901,
+1953,
+1516
+]
+},
+{
+"tb": 288,
+"tbk": 3,
+"tl": 233,
+"mb": 96,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1317,
+2213,
+2214,
+2215,
+2216,
+2217,
+2218,
+2219,
+2220
+]
+},
+{
+"tb": 154248,
+"tbk": 1605,
+"tl": 2955024,
+"mb": 168,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+273,
+2221,
+2222,
+2223,
+2224,
+2225,
+2226,
+2227,
+2228
+]
+},
+{
+"tb": 48,
+"tbk": 1,
+"tl": 64598644,
+"mb": 48,
+"mbk": 1,
+"gb": 48,
+"gbk": 1,
+"eb": 48,
+"ebk": 1,
+"fs": [
+1,
+416,
+417,
+1059,
+741,
+742,
+23,
+24,
+25
+]
+},
+{
+"tb": 1511104,
+"tbk": 26984,
+"tl": 298927,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+2229,
+2230,
+2231,
+2232,
+2233,
+2234,
+2235,
+2236
+]
+},
+{
+"tb": 351072,
+"tbk": 590,
+"tl": 58789,
+"mb": 1152,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+2237,
+2238,
+2239,
+2240,
+2241,
+2242,
+2243,
+2244,
+2245
+]
+},
+{
+"tb": 704,
+"tbk": 4,
+"tl": 1073,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+1290,
+2246,
+2247,
+1293,
+461
+]
+},
+{
+"tb": 17856,
+"tbk": 2232,
+"tl": 1121498,
+"mb": 8,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2248,
+2249,
+2250,
+2251,
+2252,
+2253
+]
+},
+{
+"tb": 1091400,
+"tbk": 1605,
+"tl": 170348,
+"mb": 680,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+504,
+2254,
+2255,
+2256,
+2257,
+2258,
+2259,
+2260,
+2261
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 158,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1165,
+1549,
+1550,
+1551,
+1552,
+1553,
+1554,
+1555,
+1556,
+2262
+]
+},
+{
+"tb": 2784,
+"tbk": 3,
+"tl": 969,
+"mb": 928,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1388,
+1389,
+1390,
+2263,
+1292
+]
+},
+{
+"tb": 1728,
+"tbk": 24,
+"tl": 217265,
+"mb": 216,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+513,
+514,
+515,
+2264,
+236,
+237,
+238
+]
+},
+{
+"tb": 677570,
+"tbk": 135514,
+"tl": 1821598,
+"mb": 8,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2265,
+2266,
+2267,
+2268,
+2269,
+2270
+]
+},
+{
+"tb": 2992,
+"tbk": 17,
+"tl": 552,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+423,
+424,
+102,
+103,
+104
+]
+},
+{
+"tb": 384,
+"tbk": 16,
+"tl": 7403,
+"mb": 24,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+675,
+676,
+677,
+678,
+679,
+680,
+2271,
+2272
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 8745,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+4,
+5,
+6,
+7,
+230
+]
+},
+{
+"tb": 22080,
+"tbk": 552,
+"tl": 875,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+379,
+380,
+381,
+382,
+383,
+1902,
+1903,
+386
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 857,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+1456,
+85,
+42,
+40,
+46
+]
+},
+{
+"tb": 58560,
+"tbk": 915,
+"tl": 521599,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+2273,
+1565,
+1566,
+1567,
+1568,
+1569
+]
+},
+{
+"tb": 57,
+"tbk": 6,
+"tl": 10,
+"mb": 10,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+1394,
+1395,
+1396,
+1435,
+833
+]
+},
+{
+"tb": 11136,
+"tbk": 590,
+"tl": 21825,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+2274,
+2275,
+2276,
+2277,
+2278,
+2279,
+2280,
+2281,
+2282,
+2283
+]
+},
+{
+"tb": 1960,
+"tbk": 1,
+"tl": 64697109,
+"mb": 1960,
+"mbk": 1,
+"gb": 1960,
+"gbk": 1,
+"eb": 1960,
+"ebk": 1,
+"fs": [
+64,
+1130,
+1131,
+1132,
+1133,
+1134,
+1135,
+2284,
+2285,
+2286
+]
+},
+{
+"tb": 151164,
+"tbk": 4199,
+"tl": 25554,
+"mb": 36,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+2287,
+2288,
+2289,
+2290
+]
+},
+{
+"tb": 773136,
+"tbk": 6903,
+"tl": 579115,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+143,
+144,
+807,
+718,
+719
+]
+},
+{
+"tb": 447140,
+"tbk": 1605,
+"tl": 1356616,
+"mb": 536,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+2291,
+2292,
+2293,
+2294
+]
+},
+{
+"tb": 29952,
+"tbk": 416,
+"tl": 478515,
+"mb": 216,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+2295,
+883,
+124,
+125,
+126
+]
+},
+{
+"tb": 22176,
+"tbk": 198,
+"tl": 11484134,
+"mb": 448,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+490,
+2296,
+2297,
+2298,
+2299
+]
+},
+{
+"tb": 334208,
+"tbk": 452,
+"tl": 1301,
+"mb": 2464,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+1640,
+1641,
+1642,
+1643,
+1644,
+2300
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5741,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+105,
+106,
+107,
+7,
+132
+]
+},
+{
+"tb": 156702,
+"tbk": 1609,
+"tl": 61566443,
+"mb": 269,
+"mbk": 1,
+"gb": 214,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1235,
+1236,
+1237,
+1238,
+1239,
+1240,
+1241,
+1242,
+2301,
+452,
+596
+]
+},
+{
+"tb": 1320,
+"tbk": 120,
+"tl": 450173,
+"mb": 22,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+414,
+2302
+]
+},
+{
+"tb": 9600,
+"tbk": 200,
+"tl": 2290559,
+"mb": 2400,
+"mbk": 50,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+929,
+930,
+931,
+237,
+238,
+932,
+1412
+]
+},
+{
+"tb": 48,
+"tbk": 1,
+"tl": 64895745,
+"mb": 48,
+"mbk": 1,
+"gb": 48,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+2303,
+2304,
+2305,
+2306,
+2307,
+625,
+626
+]
+},
+{
+"tb": 144384,
+"tbk": 564,
+"tl": 25640,
+"mb": 256,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+2308,
+2309,
+2310,
+2311,
+2312
+]
+},
+{
+"tb": 87808,
+"tbk": 784,
+"tl": 481850,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+265,
+157,
+158,
+7,
+56
+]
+},
+{
+"tb": 8272,
+"tbk": 47,
+"tl": 10525,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+706,
+755,
+1438,
+709,
+710
+]
+},
+{
+"tb": 4048,
+"tbk": 23,
+"tl": 3202,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+423,
+806,
+102,
+103,
+104
+]
+},
+{
+"tb": 6720,
+"tbk": 168,
+"tl": 350,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+379,
+380,
+381,
+382,
+2313,
+2314,
+2315,
+2316
+]
+},
+{
+"tb": 9856,
+"tbk": 88,
+"tl": 52785,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+156,
+157,
+158,
+7,
+8
+]
+},
+{
+"tb": 40,
+"tbk": 1,
+"tl": 64598190,
+"mb": 40,
+"mbk": 1,
+"gb": 40,
+"gbk": 1,
+"eb": 40,
+"ebk": 1,
+"fs": [
+1,
+26,
+27,
+28,
+2317,
+2318,
+2319,
+2320,
+2321
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 13393,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+265,
+157,
+158,
+7,
+464
+]
+},
+{
+"tb": 112,
+"tbk": 1,
+"tl": 56199,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1160,
+831,
+832,
+833,
+669
+]
+},
+{
+"tb": 410880,
+"tbk": 1605,
+"tl": 59507165,
+"mb": 256,
+"mbk": 1,
+"gb": 256,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2029,
+2030,
+2031,
+2322,
+2323,
+2324,
+2325
+]
+},
+{
+"tb": 77040,
+"tbk": 1605,
+"tl": 316639,
+"mb": 48,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+18,
+19,
+463,
+2156,
+2157,
+421,
+422
+]
+},
+{
+"tb": 19584,
+"tbk": 272,
+"tl": 288773,
+"mb": 216,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+2326,
+1407,
+802,
+1408,
+1102
+]
+},
+{
+"tb": 43056,
+"tbk": 1794,
+"tl": 266807,
+"mb": 120,
+"mbk": 5,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+494,
+495,
+496,
+497,
+813,
+814,
+815
+]
+},
+{
+"tb": 1115136,
+"tbk": 12840,
+"tl": 594006,
+"mb": 128,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+65,
+66,
+67,
+68,
+2327,
+2328,
+2329,
+2330
+]
+},
+{
+"tb": 13536,
+"tbk": 188,
+"tl": 9050874,
+"mb": 72,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+446,
+447,
+2126,
+2127,
+2128,
+2331,
+2332
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 784,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+39,
+40,
+45,
+46,
+85
+]
+},
+{
+"tb": 77040,
+"tbk": 1605,
+"tl": 377626,
+"mb": 48,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+416,
+417,
+1563,
+419,
+420,
+421,
+422
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6527,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+501,
+502,
+503,
+7,
+89
+]
+},
+{
+"tb": 166920,
+"tbk": 4173,
+"tl": 7100,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+379,
+380,
+381,
+382,
+383,
+1519,
+2333,
+2334
+]
+},
+{
+"tb": 240,
+"tbk": 6,
+"tl": 376009,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+1265,
+2335,
+1630,
+833,
+669
+]
+},
+{
+"tb": 1508256,
+"tbk": 13122,
+"tl": 645806,
+"mb": 768,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+687,
+688,
+2336,
+2337,
+2338,
+2339
+]
+},
+{
+"tb": 14336,
+"tbk": 128,
+"tl": 80254,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+156,
+157,
+158,
+7,
+968
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 12184,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+283,
+840,
+841,
+7,
+331
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5821,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1272,
+1030,
+1031,
+7,
+1930
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5864,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+265,
+157,
+158,
+7,
+146
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 14538,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+944,
+945,
+946,
+7,
+230
+]
+},
+{
+"tb": 77040,
+"tbk": 1605,
+"tl": 445173,
+"mb": 48,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+416,
+417,
+1059,
+419,
+420,
+421,
+422
+]
+},
+{
+"tb": 207232,
+"tbk": 3238,
+"tl": 83597,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1594,
+1595,
+1596,
+881,
+443,
+46,
+85
+]
+},
+{
+"tb": 665616,
+"tbk": 5943,
+"tl": 1184843,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+265,
+157,
+597,
+1858,
+1859
+]
+},
+{
+"tb": 8176,
+"tbk": 73,
+"tl": 5300498,
+"mb": 336,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+839,
+284,
+285,
+286,
+287
+]
+},
+{
+"tb": 3136,
+"tbk": 8,
+"tl": 2046,
+"mb": 392,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1165,
+1549,
+1550,
+1551,
+1552,
+1553,
+1554,
+1555,
+1556,
+2340
+]
+},
+{
+"tb": 1536,
+"tbk": 384,
+"tl": 1450265,
+"mb": 12,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+2341
+]
+},
+{
+"tb": 52296,
+"tbk": 2671,
+"tl": 3318,
+"mb": 128,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+947,
+948,
+1153,
+1154,
+719,
+2342
+]
+},
+{
+"tb": 56,
+"tbk": 1,
+"tl": 64597171,
+"mb": 56,
+"mbk": 1,
+"gb": 56,
+"gbk": 1,
+"eb": 56,
+"ebk": 1,
+"fs": [
+1,
+462,
+20,
+21,
+22,
+23,
+24,
+25
+]
+},
+{
+"tb": 80450,
+"tbk": 1609,
+"tl": 20644,
+"mb": 50,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+638,
+639,
+640,
+641,
+642,
+643,
+644,
+645,
+646,
+2137,
+595,
+452,
+596
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 3152,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+156,
+157,
+158,
+7,
+1930
+]
+},
+{
+"tb": 179760,
+"tbk": 1605,
+"tl": 330968,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+388,
+2178,
+1014,
+1015,
+421,
+422
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 14906,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+156,
+157,
+158,
+7,
+1639
+]
+},
+{
+"tb": 1480280,
+"tbk": 3218,
+"tl": 1343531,
+"mb": 736,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+902,
+903,
+2343,
+2344,
+636,
+637
+]
+},
+{
+"tb": 15840,
+"tbk": 220,
+"tl": 12932125,
+"mb": 216,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+446,
+447,
+2345,
+2346,
+2347,
+2348,
+2349
+]
+},
+{
+"tb": 160704,
+"tbk": 2232,
+"tl": 830141,
+"mb": 72,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+446,
+447,
+2350,
+2249,
+2250,
+2251,
+2252
+]
+},
+{
+"tb": 42048,
+"tbk": 584,
+"tl": 759545,
+"mb": 216,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+2351,
+1101,
+1102,
+1103,
+1104
+]
+},
+{
+"tb": 44800,
+"tbk": 200,
+"tl": 13887,
+"mb": 448,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+2352,
+2353,
+860,
+861,
+862,
+863,
+928
+]
+},
+{
+"tb": 40,
+"tbk": 1,
+"tl": 64598950,
+"mb": 40,
+"mbk": 1,
+"gb": 40,
+"gbk": 1,
+"eb": 40,
+"ebk": 1,
+"fs": [
+1,
+26,
+27,
+28,
+2354,
+2355,
+2356,
+2357,
+2358
+]
+},
+{
+"tb": 97440,
+"tbk": 435,
+"tl": 7136,
+"mb": 224,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+427,
+2359,
+2360,
+2361,
+2362,
+2363,
+2364,
+2365,
+2366,
+2367
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 8405,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+369,
+370,
+371,
+7,
+1287
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5888,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+439,
+440,
+441,
+7,
+159
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 831,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+44,
+42,
+40,
+41,
+46
+]
+},
+{
+"tb": 8,
+"tbk": 1,
+"tl": 1596,
+"mb": 8,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+518,
+519,
+767,
+768,
+2368,
+770
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 198,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+539,
+540,
+880,
+881,
+45,
+46,
+85
+]
+},
+{
+"tb": 665616,
+"tbk": 5943,
+"tl": 1128829,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+156,
+157,
+597,
+1858,
+1859
+]
+},
+{
+"tb": 6272,
+"tbk": 56,
+"tl": 34009,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+665,
+945,
+946,
+7,
+56
+]
+},
+{
+"tb": 19008,
+"tbk": 94,
+"tl": 2480,
+"mb": 384,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+2369,
+2370,
+2371,
+2372,
+2373,
+2374,
+2375,
+2376,
+2377
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 854,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+117,
+118,
+45,
+46,
+46
+]
+},
+{
+"tb": 960,
+"tbk": 24,
+"tl": 2581,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+44,
+45,
+45,
+46,
+85
+]
+},
+{
+"tb": 414848,
+"tbk": 3704,
+"tl": 2058969,
+"mb": 448,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+808,
+144,
+145,
+7,
+146
+]
+},
+{
+"tb": 10912,
+"tbk": 62,
+"tl": 12424,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+341,
+342,
+2378,
+344,
+1300
+]
+},
+{
+"tb": 83648,
+"tbk": 1307,
+"tl": 1683684,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+2379,
+1212,
+1213,
+1214,
+1215,
+2380
+]
+},
+{
+"tb": 179760,
+"tbk": 1605,
+"tl": 298435,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+388,
+389,
+1014,
+1015,
+421,
+422
+]
+},
+{
+"tb": 31944,
+"tbk": 2183,
+"tl": 3814,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+947,
+948,
+1153,
+2381,
+2332,
+2382
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 858,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1339,
+1340,
+46,
+85,
+85,
+46
+]
+},
+{
+"tb": 3584,
+"tbk": 32,
+"tl": 15912,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+830,
+1263,
+1264,
+7,
+56
+]
+},
+{
+"tb": 256,
+"tbk": 64,
+"tl": 316517,
+"mb": 12,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+2383
+]
+},
+{
+"tb": 960,
+"tbk": 24,
+"tl": 20864,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+1265,
+1266,
+1267,
+7,
+230
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 200,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+539,
+540,
+880,
+881,
+42,
+40,
+46
+]
+},
+{
+"tb": 2432,
+"tbk": 32,
+"tl": 23980,
+"mb": 304,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+675,
+1413,
+1414,
+1415,
+1416,
+1417,
+1418,
+1419,
+2384,
+2385
+]
+},
+{
+"tb": 294000,
+"tbk": 1750,
+"tl": 1405572,
+"mb": 1176,
+"mbk": 7,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2386,
+2387,
+2388,
+2389,
+2390,
+2391,
+2392
+]
+},
+{
+"tb": 50304,
+"tbk": 1568,
+"tl": 14838,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+1465,
+1466,
+1467,
+1468,
+1469,
+1470,
+1471,
+1472,
+2393
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 2452,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+86,
+87,
+88,
+7,
+2394
+]
+},
+{
+"tb": 29568,
+"tbk": 264,
+"tl": 192876,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+283,
+840,
+841,
+7,
+56
+]
+},
+{
+"tb": 89088,
+"tbk": 184,
+"tl": 87536,
+"mb": 768,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+288,
+2395,
+2396,
+2397,
+2398,
+2399,
+2400,
+2401,
+2402,
+2403
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 1611,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+1265,
+1266,
+1267,
+7,
+1855
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 10168,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1577,
+1578,
+1579,
+7,
+2404
+]
+},
+{
+"tb": 1600,
+"tbk": 40,
+"tl": 67,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+379,
+380,
+381,
+382,
+383,
+2405,
+2406,
+747
+]
+},
+{
+"tb": 10720,
+"tbk": 268,
+"tl": 8720488,
+"mb": 120,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+26,
+27,
+2407,
+2408,
+1574,
+2409,
+499
+]
+},
+{
+"tb": 175104,
+"tbk": 1368,
+"tl": 1759280,
+"mb": 128,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1211,
+1212,
+1213,
+1214,
+1215,
+2380
+]
+},
+{
+"tb": 896,
+"tbk": 16,
+"tl": 30,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+83,
+896,
+118,
+118,
+46,
+85
+]
+},
+{
+"tb": 512,
+"tbk": 8,
+"tl": 122,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1594,
+1595,
+1596,
+881,
+45,
+46,
+85
+]
+},
+{
+"tb": 3584,
+"tbk": 32,
+"tl": 24636,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+490,
+491,
+492,
+7,
+167
+]
+},
+{
+"tb": 48,
+"tbk": 1,
+"tl": 64598539,
+"mb": 48,
+"mbk": 1,
+"gb": 48,
+"gbk": 1,
+"eb": 48,
+"ebk": 1,
+"fs": [
+1,
+416,
+417,
+2410,
+741,
+742,
+23,
+24,
+25
+]
+},
+{
+"tb": 755328,
+"tbk": 1945,
+"tl": 30114,
+"mb": 672,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+2411,
+2412,
+2413,
+2414,
+2415,
+2416
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 3630,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+439,
+440,
+441,
+7,
+913
+]
+},
+{
+"tb": 110360,
+"tbk": 2759,
+"tl": 11736,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+897,
+898,
+899,
+901,
+1953,
+1516,
+1517
+]
+},
+{
+"tb": 2080,
+"tbk": 416,
+"tl": 1529930,
+"mb": 15,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+2417
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 928,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+44,
+119,
+2418,
+2419,
+2420
+]
+},
+{
+"tb": 52224,
+"tbk": 136,
+"tl": 2074,
+"mb": 384,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1835,
+2421,
+2422,
+2423,
+2424,
+2425,
+2426,
+2427,
+2428,
+2429
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 11703,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+490,
+491,
+492,
+7,
+442
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 828,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+117,
+41,
+46,
+85,
+85
+]
+},
+{
+"tb": 27840,
+"tbk": 435,
+"tl": 208241,
+"mb": 128,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+266,
+267,
+1805,
+1664,
+1806,
+461,
+2430
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5117,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+924,
+1578,
+1579,
+7,
+968
+]
+},
+{
+"tb": 5792,
+"tbk": 4,
+"tl": 258616777,
+"mb": 5792,
+"mbk": 4,
+"gb": 5792,
+"gbk": 4,
+"eb": 5792,
+"ebk": 4,
+"fs": [
+211,
+1057,
+1058,
+202,
+203,
+743,
+744,
+745
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5969,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+697,
+888,
+889,
+7,
+132
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 876,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+372,
+1913,
+1914,
+476,
+477,
+377
+]
+},
+{
+"tb": 672,
+"tbk": 21,
+"tl": 339,
+"mb": 32,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+2431,
+2432,
+2433,
+2434,
+2435,
+2436,
+2437,
+2438,
+2439
+]
+},
+{
+"tb": 320,
+"tbk": 80,
+"tl": 302821,
+"mb": 8,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+2440
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 802,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1339,
+1340,
+45,
+45,
+46,
+85
+]
+},
+{
+"tb": 69760,
+"tbk": 1744,
+"tl": 27328,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+26,
+27,
+1206,
+1207,
+2441,
+1104,
+348
+]
+},
+{
+"tb": 176,
+"tbk": 1,
+"tl": 286,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+706,
+1821,
+1822,
+1823,
+1824
+]
+},
+{
+"tb": 27072,
+"tbk": 376,
+"tl": 287195,
+"mb": 144,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+1004,
+2442,
+348,
+349,
+350
+]
+},
+{
+"tb": 5120,
+"tbk": 13,
+"tl": 119527,
+"mb": 960,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+518,
+2443,
+2444,
+2445,
+2446,
+2447
+]
+},
+{
+"tb": 10240,
+"tbk": 256,
+"tl": 501134,
+"mb": 120,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+160,
+161,
+162,
+163,
+164,
+1526,
+1669
+]
+},
+{
+"tb": 6320,
+"tbk": 158,
+"tl": 20978,
+"mb": 280,
+"mbk": 7,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+313,
+314,
+315,
+1863,
+1864,
+2448,
+2449
+]
+},
+{
+"tb": 45072,
+"tbk": 626,
+"tl": 35990,
+"mb": 72,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+446,
+447,
+2345,
+2346,
+2347,
+2450,
+2451
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6037,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1160,
+1263,
+1264,
+7,
+1930
+]
+},
+{
+"tb": 342400,
+"tbk": 5350,
+"tl": 6904361,
+"mb": 256,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+2452,
+1212,
+1213,
+1214,
+1215,
+2380
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6535,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+665,
+945,
+946,
+7,
+913
+]
+},
+{
+"tb": 168192,
+"tbk": 712,
+"tl": 25929,
+"mb": 408,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+2453,
+2454,
+2455,
+2456
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 13296,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+283,
+840,
+841,
+7,
+132
+]
+},
+{
+"tb": 14336,
+"tbk": 128,
+"tl": 107522,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+283,
+840,
+841,
+7,
+89
+]
+},
+{
+"tb": 9680,
+"tbk": 55,
+"tl": 1138,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+423,
+424,
+102,
+103,
+426
+]
+},
+{
+"tb": 640,
+"tbk": 16,
+"tl": 1354,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+539,
+540,
+880,
+881,
+2418,
+2419,
+2420
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 10694,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1029,
+1030,
+1031,
+7,
+887
+]
+},
+{
+"tb": 137456,
+"tbk": 781,
+"tl": 128154,
+"mb": 704,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+100,
+101,
+102,
+103,
+426
+]
+},
+{
+"tb": 1592,
+"tbk": 168,
+"tl": 69454,
+"mb": 18,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+2457,
+2458,
+2459,
+2460,
+2461
+]
+},
+{
+"tb": 56672,
+"tbk": 322,
+"tl": 29564,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+100,
+1271,
+425,
+103,
+426
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 7315,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+702,
+258,
+259,
+7,
+56
+]
+},
+{
+"tb": 15104,
+"tbk": 472,
+"tl": 209215,
+"mb": 800,
+"mbk": 25,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+556,
+557,
+558,
+559,
+2462
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6427,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+884,
+885,
+886,
+7,
+968
+]
+},
+{
+"tb": 640,
+"tbk": 16,
+"tl": 1581,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+117,
+118,
+443,
+46,
+46
+]
+},
+{
+"tb": 2992,
+"tbk": 17,
+"tl": 722,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+100,
+424,
+102,
+103,
+104
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5080,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+697,
+888,
+889,
+7,
+89
+]
+},
+{
+"tb": 68480,
+"tbk": 1070,
+"tl": 1461468,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+2452,
+1212,
+1213,
+1214,
+1215,
+1216
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 8419,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+697,
+888,
+889,
+7,
+282
+]
+},
+{
+"tb": 272,
+"tbk": 1,
+"tl": 313,
+"mb": 272,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2155,
+21,
+22,
+23,
+24,
+25,
+1033
+]
+},
+{
+"tb": 1736,
+"tbk": 28,
+"tl": 853,
+"mb": 136,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1307,
+1308,
+1309,
+1310,
+1311,
+1312,
+2463
+]
+},
+{
+"tb": 59280,
+"tbk": 1482,
+"tl": 52706159,
+"mb": 280,
+"mbk": 7,
+"gb": 40,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+26,
+27,
+1326,
+2464,
+2409,
+499,
+500
+]
+},
+{
+"tb": 352,
+"tbk": 88,
+"tl": 366710,
+"mb": 8,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+2465
+]
+},
+{
+"tb": 199440,
+"tbk": 4986,
+"tl": 197464608,
+"mb": 240,
+"mbk": 6,
+"gb": 120,
+"gbk": 3,
+"eb": 120,
+"ebk": 3,
+"fs": [
+1,
+26,
+27,
+1206,
+1207,
+2466,
+2467,
+2468
+]
+},
+{
+"tb": 960,
+"tbk": 24,
+"tl": 2629,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+573,
+574,
+45,
+46,
+46,
+47
+]
+},
+{
+"tb": 30779056,
+"tbk": 628144,
+"tl": 5245696,
+"mb": 49,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+2469,
+2470,
+2471,
+2472,
+2473,
+2474,
+2475
+]
+},
+{
+"tb": 39424,
+"tbk": 224,
+"tl": 56716,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+423,
+1271,
+102,
+103,
+426
+]
+},
+{
+"tb": 64,
+"tbk": 1,
+"tl": 399,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+2476,
+2477,
+2478,
+1857,
+1304,
+1305,
+1306
+]
+},
+{
+"tb": 112,
+"tbk": 1,
+"tl": 73504,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1160,
+831,
+832,
+1224,
+1225
+]
+},
+{
+"tb": 384,
+"tbk": 4,
+"tl": 258942985,
+"mb": 384,
+"mbk": 4,
+"gb": 384,
+"gbk": 4,
+"eb": 384,
+"ebk": 4,
+"fs": [
+204,
+205,
+575,
+576,
+577,
+578,
+2479
+]
+},
+{
+"tb": 859048,
+"tbk": 67533,
+"tl": 1586539784,
+"mb": 1459,
+"mbk": 43,
+"gb": 997,
+"gbk": 40,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+703,
+704,
+2480
+]
+},
+{
+"tb": 2314532,
+"tbk": 1605,
+"tl": 3276312,
+"mb": 2840,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1675,
+1676,
+1677,
+2481,
+2482,
+2483,
+2484
+]
+},
+{
+"tb": 56672,
+"tbk": 322,
+"tl": 27607,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+423,
+1271,
+425,
+103,
+426
+]
+},
+{
+"tb": 224,
+"tbk": 1,
+"tl": 27,
+"mb": 224,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+875,
+876,
+877,
+878,
+2485
+]
+},
+{
+"tb": 7840,
+"tbk": 196,
+"tl": 12682457764,
+"mb": 7840,
+"mbk": 196,
+"gb": 7840,
+"gbk": 196,
+"eb": 7840,
+"ebk": 196,
+"fs": [
+211,
+2486,
+2487,
+2488,
+214,
+215,
+216,
+217
+]
+},
+{
+"tb": 1960,
+"tbk": 49,
+"tl": 1128486,
+"mb": 240,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+1201,
+1202,
+1203,
+1204,
+166
+]
+},
+{
+"tb": 112,
+"tbk": 1,
+"tl": 64598321,
+"mb": 112,
+"mbk": 1,
+"gb": 112,
+"gbk": 1,
+"eb": 112,
+"ebk": 1,
+"fs": [
+1,
+388,
+1065,
+741,
+742,
+23,
+24,
+25
+]
+},
+{
+"tb": 40,
+"tbk": 40,
+"tl": 147291,
+"mb": 2,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+414,
+2489
+]
+},
+{
+"tb": 3840,
+"tbk": 6,
+"tl": 1372,
+"mb": 640,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+2490,
+2491,
+2492,
+2493,
+2494,
+2495,
+2496,
+2497,
+2498,
+2499
+]
+},
+{
+"tb": 755200,
+"tbk": 2360,
+"tl": 1291886,
+"mb": 1600,
+"mbk": 5,
+"gb": 640,
+"gbk": 2,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2005,
+2006,
+2500,
+2501,
+193,
+194
+]
+},
+{
+"tb": 960,
+"tbk": 24,
+"tl": 2393,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+26,
+27,
+2407,
+2502,
+1104,
+348,
+349
+]
+},
+{
+"tb": 7040,
+"tbk": 40,
+"tl": 8306,
+"mb": 528,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+909,
+836,
+837,
+838,
+461
+]
+},
+{
+"tb": 1728,
+"tbk": 24,
+"tl": 32105,
+"mb": 72,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+2503,
+2504,
+348,
+349,
+350
+]
+},
+{
+"tb": 107712,
+"tbk": 1496,
+"tl": 470346,
+"mb": 72,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+446,
+447,
+2505,
+2249,
+2250,
+2251,
+2252
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 4912,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+944,
+945,
+946,
+7,
+8
+]
+},
+{
+"tb": 82,
+"tbk": 1,
+"tl": 18,
+"mb": 82,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1139,
+1140,
+1141,
+1142,
+1143,
+1144,
+1145,
+2506,
+2507,
+2508,
+2509,
+2510,
+2511,
+2512,
+2513,
+1713,
+1714,
+1715,
+1716
+]
+},
+{
+"tb": 6512,
+"tbk": 37,
+"tl": 2023,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+423,
+806,
+425,
+103,
+104
+]
+},
+{
+"tb": 3456,
+"tbk": 48,
+"tl": 404321,
+"mb": 432,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+2514,
+2515,
+2516,
+2517,
+1411,
+237,
+238
+]
+},
+{
+"tb": 80250,
+"tbk": 1605,
+"tl": 20282,
+"mb": 50,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+638,
+639,
+640,
+641,
+642,
+643,
+644,
+645,
+646,
+2137,
+1436,
+452,
+596
+]
+},
+{
+"tb": 15152,
+"tbk": 947,
+"tl": 17956,
+"mb": 16,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1218,
+1219,
+94,
+95,
+96,
+97,
+229
+]
+},
+{
+"tb": 288,
+"tbk": 4,
+"tl": 258637153,
+"mb": 288,
+"mbk": 4,
+"gb": 288,
+"gbk": 4,
+"eb": 288,
+"ebk": 4,
+"fs": [
+211,
+2108,
+2109,
+2110,
+302,
+203,
+743,
+744
+]
+},
+{
+"tb": 69344,
+"tbk": 269,
+"tl": 16962144332,
+"mb": 69344,
+"mbk": 269,
+"gb": 69344,
+"gbk": 269,
+"eb": 69344,
+"ebk": 269,
+"fs": [
+204,
+205,
+2518,
+2519,
+2520,
+2521,
+2522,
+2523
+]
+},
+{
+"tb": 917504,
+"tbk": 872,
+"tl": 6696176,
+"mb": 84224,
+"mbk": 78,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1175,
+1176,
+1177,
+2524,
+862
+]
+},
+{
+"tb": 600,
+"tbk": 15,
+"tl": 3448,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1699,
+1700,
+1701,
+2525,
+2526,
+2527,
+1703
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 11588,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+830,
+1263,
+1264,
+7,
+8
+]
+},
+{
+"tb": 440,
+"tbk": 11,
+"tl": 1684,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1699,
+1700,
+1825,
+2528,
+1664,
+1806,
+461
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 831,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+2529,
+45,
+45,
+46,
+85
+]
+},
+{
+"tb": 400,
+"tbk": 10,
+"tl": 662320,
+"mb": 40,
+"mbk": 1,
+"gb": 40,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+1265,
+2335,
+1630,
+668,
+669
+]
+},
+{
+"tb": 1091400,
+"tbk": 1605,
+"tl": 194729,
+"mb": 680,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2530,
+1014,
+1015,
+421,
+422,
+2023
+]
+},
+{
+"tb": 4752,
+"tbk": 1584,
+"tl": 5398457,
+"mb": 12,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+2531
+]
+},
+{
+"tb": 1003104,
+"tbk": 10449,
+"tl": 221101871,
+"mb": 768,
+"mbk": 8,
+"gb": 672,
+"gbk": 7,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+852,
+2532,
+2533,
+2534,
+2535
+]
+},
+{
+"tb": 32503744,
+"tbk": 44648,
+"tl": 27301059,
+"mb": 13104,
+"mbk": 18,
+"gb": 8736,
+"gbk": 12,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2536,
+2537,
+2538,
+2539,
+2540,
+2541,
+193
+]
+},
+{
+"tb": 926008,
+"tbk": 112097,
+"tl": 183611,
+"mb": 18,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+168,
+2192,
+2193,
+2194,
+2195,
+2196,
+2197,
+2198,
+2199,
+2200,
+2201,
+2202,
+2542,
+2543,
+2190,
+2191,
+2544
+]
+},
+{
+"tb": 18816,
+"tbk": 196,
+"tl": 56414,
+"mb": 96,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+2545,
+2546,
+2547,
+2548,
+2549
+]
+},
+{
+"tb": 704,
+"tbk": 4,
+"tl": 54,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+706,
+1437,
+708,
+709,
+710
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 5074,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+369,
+370,
+371,
+7,
+230
+]
+},
+{
+"tb": 672,
+"tbk": 12,
+"tl": 333,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+2229,
+2550,
+2551,
+2552,
+2553,
+2554,
+2555,
+2556
+]
+},
+{
+"tb": 56,
+"tbk": 1,
+"tl": 64598726,
+"mb": 56,
+"mbk": 1,
+"gb": 56,
+"gbk": 1,
+"eb": 56,
+"ebk": 1,
+"fs": [
+1,
+555,
+1179,
+741,
+742,
+23,
+24,
+25
+]
+},
+{
+"tb": 4242384,
+"tbk": 58922,
+"tl": 3575247,
+"mb": 576,
+"mbk": 8,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+446,
+447,
+2345,
+2346,
+2347,
+2450,
+2557
+]
+},
+{
+"tb": 12496,
+"tbk": 71,
+"tl": 11143,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+1784,
+2558,
+2559,
+1787,
+1512
+]
+},
+{
+"tb": 40,
+"tbk": 1,
+"tl": 179,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1699,
+1700,
+1825,
+2528,
+1664,
+1806,
+1807
+]
+},
+{
+"tb": 88704,
+"tbk": 504,
+"tl": 176835,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+912,
+1821,
+2560,
+2561,
+708
+]
+},
+{
+"tb": 7008,
+"tbk": 584,
+"tl": 2684225,
+"mb": 36,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+414,
+2562
+]
+},
+{
+"tb": 1024480,
+"tbk": 1645,
+"tl": 824587,
+"mb": 1216,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+2563,
+2564,
+2565,
+2566,
+2567
+]
+},
+{
+"tb": 240,
+"tbk": 6,
+"tl": 22806,
+"mb": 160,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+160,
+161,
+162,
+163,
+164,
+1526,
+2568
+]
+},
+{
+"tb": 821760,
+"tbk": 12840,
+"tl": 658478,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1967,
+2569,
+2570,
+2571,
+2572,
+2573,
+2574,
+2575,
+2576,
+2253
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 10001,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1577,
+1578,
+1579,
+7,
+167
+]
+},
+{
+"tb": 40,
+"tbk": 1,
+"tl": 64598655,
+"mb": 40,
+"mbk": 1,
+"gb": 40,
+"gbk": 1,
+"eb": 40,
+"ebk": 1,
+"fs": [
+1,
+26,
+27,
+28,
+2577,
+2578,
+2579,
+2580,
+2581
+]
+},
+{
+"tb": 64512,
+"tbk": 168,
+"tl": 104686,
+"mb": 384,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+288,
+2582,
+2583,
+2584,
+2585,
+2586,
+2587,
+2588,
+2589,
+2590
+]
+},
+{
+"tb": 80,
+"tbk": 2,
+"tl": 792,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+539,
+540,
+1522,
+542,
+543,
+316,
+317
+]
+},
+{
+"tb": 555424,
+"tbk": 3727,
+"tl": 122085565,
+"mb": 2072,
+"mbk": 14,
+"gb": 296,
+"gbk": 2,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+2591,
+2592,
+2593,
+2594
+]
+},
+{
+"tb": 10032,
+"tbk": 57,
+"tl": 1347,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+423,
+101,
+102,
+103,
+104
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 852,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+44,
+118,
+46,
+85,
+85
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 209,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+539,
+540,
+880,
+881,
+306,
+41,
+46
+]
+},
+{
+"tb": 365568,
+"tbk": 400,
+"tl": 28211,
+"mb": 1792,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+2595,
+2596,
+2597,
+2598,
+861
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 15156,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+265,
+157,
+158,
+7,
+1639
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 9992,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1272,
+1030,
+1031,
+7,
+230
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 1648,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+4,
+5,
+6,
+7,
+968
+]
+},
+{
+"tb": 5408,
+"tbk": 13,
+"tl": 316,
+"mb": 416,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+2599,
+2600,
+2601,
+2602,
+2603,
+2604,
+2605,
+2606,
+2607
+]
+},
+{
+"tb": 303680,
+"tbk": 470,
+"tl": 237664,
+"mb": 1760,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+2608,
+2609,
+2610,
+2611,
+2612,
+2613
+]
+},
+{
+"tb": 728816,
+"tbk": 859,
+"tl": 22893021597,
+"mb": 381104,
+"mbk": 364,
+"gb": 381104,
+"gbk": 364,
+"eb": 381104,
+"ebk": 364,
+"fs": [
+204,
+205,
+2614,
+2615,
+2616,
+2617,
+2618,
+2619
+]
+},
+{
+"tb": 73920,
+"tbk": 420,
+"tl": 14040,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+423,
+806,
+425,
+103,
+426
+]
+},
+{
+"tb": 154080,
+"tbk": 12840,
+"tl": 27220,
+"mb": 12,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1139,
+1140,
+1141,
+1142,
+1143,
+1144,
+1145,
+1146,
+1147,
+2620,
+2621,
+2622,
+2623,
+2624
+]
+},
+{
+"tb": 18576,
+"tbk": 172,
+"tl": 322,
+"mb": 144,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1139,
+1140,
+1141,
+1142,
+1143,
+1144,
+1145,
+1146,
+1147,
+1148,
+2625,
+1120,
+1121,
+2626
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 4725,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+720,
+502,
+503,
+7,
+56
+]
+},
+{
+"tb": 896,
+"tbk": 16,
+"tl": 39,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+83,
+84,
+46,
+85,
+46,
+47
+]
+},
+{
+"tb": 159104,
+"tbk": 1243,
+"tl": 1302929,
+"mb": 128,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+2627,
+1588,
+1589,
+1590,
+1591,
+1593
+]
+},
+{
+"tb": 512,
+"tbk": 8,
+"tl": 133,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1594,
+1595,
+1596,
+881,
+42,
+40,
+46
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 18857,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+105,
+106,
+107,
+7,
+89
+]
+},
+{
+"tb": 880,
+"tbk": 5,
+"tl": 974,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+919,
+1061,
+1062,
+922,
+2628
+]
+},
+{
+"tb": 28800,
+"tbk": 400,
+"tl": 494,
+"mb": 72,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+232,
+233,
+939,
+2629,
+941,
+942,
+943
+]
+},
+{
+"tb": 953008,
+"tbk": 8509,
+"tl": 1590011,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+330,
+5,
+2630,
+1745,
+2125
+]
+},
+{
+"tb": 696,
+"tbk": 232,
+"tl": 831287,
+"mb": 9,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+414,
+2631
+]
+},
+{
+"tb": 20480,
+"tbk": 216,
+"tl": 8460,
+"mb": 1024,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+2632,
+2633,
+2634,
+2635,
+2636
+]
+},
+{
+"tb": 3584,
+"tbk": 32,
+"tl": 14766,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+265,
+157,
+158,
+7,
+132
+]
+},
+{
+"tb": 923012,
+"tbk": 1621,
+"tl": 57418811,
+"mb": 1676,
+"mbk": 2,
+"gb": 564,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+2637,
+2638,
+2639,
+2640
+]
+},
+{
+"tb": 832,
+"tbk": 416,
+"tl": 1602327,
+"mb": 6,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+414,
+2641
+]
+},
+{
+"tb": 524,
+"tbk": 3,
+"tl": 64409151,
+"mb": 440,
+"mbk": 2,
+"gb": 288,
+"gbk": 1,
+"eb": 288,
+"ebk": 1,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+2642,
+2643,
+2644,
+2645
+]
+},
+{
+"tb": 58240,
+"tbk": 1456,
+"tl": 2423,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+379,
+380,
+381,
+382,
+383,
+1597,
+1598,
+747
+]
+},
+{
+"tb": 3584,
+"tbk": 32,
+"tl": 24753,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+490,
+491,
+492,
+7,
+887
+]
+},
+{
+"tb": 144,
+"tbk": 14,
+"tl": 13844,
+"mb": 16,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+518,
+519,
+767,
+768,
+2646,
+770
+]
+},
+{
+"tb": 40,
+"tbk": 1,
+"tl": 63972784,
+"mb": 40,
+"mbk": 1,
+"gb": 40,
+"gbk": 1,
+"eb": 40,
+"ebk": 1,
+"fs": [
+1,
+26,
+27,
+28,
+2647,
+2648,
+2649,
+2650,
+2651
+]
+},
+{
+"tb": 80,
+"tbk": 2,
+"tl": 114272,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+26,
+27,
+1326,
+1629,
+1630,
+1224,
+1225
+]
+},
+{
+"tb": 572992,
+"tbk": 5116,
+"tl": 695554,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+156,
+157,
+597,
+598,
+599
+]
+},
+{
+"tb": 56,
+"tbk": 1,
+"tl": 64598160,
+"mb": 56,
+"mbk": 1,
+"gb": 56,
+"gbk": 1,
+"eb": 56,
+"ebk": 1,
+"fs": [
+1,
+555,
+1217,
+390,
+391,
+23,
+24,
+25
+]
+},
+{
+"tb": 27904,
+"tbk": 436,
+"tl": 42435,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+953,
+954,
+955,
+956,
+957,
+2652
+]
+},
+{
+"tb": 89880,
+"tbk": 1605,
+"tl": 395506,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+555,
+2410,
+419,
+420,
+421,
+422
+]
+},
+{
+"tb": 3248,
+"tbk": 29,
+"tl": 1781496,
+"mb": 336,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+86,
+2653,
+2654,
+927,
+2655
+]
+},
+{
+"tb": 880,
+"tbk": 5,
+"tl": 1439,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+1784,
+2656,
+1786,
+1787,
+1512
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5135,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1029,
+1030,
+1031,
+7,
+132
+]
+},
+{
+"tb": 21448,
+"tbk": 2040,
+"tl": 476596,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+2166,
+2657,
+2658,
+2659,
+2660
+]
+},
+{
+"tb": 7504,
+"tbk": 67,
+"tl": 5680,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+143,
+144,
+444,
+304,
+908
+]
+},
+{
+"tb": 1056,
+"tbk": 6,
+"tl": 1200,
+"mb": 528,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+1508,
+1509,
+2661,
+1511,
+1512
+]
+},
+{
+"tb": 869760,
+"tbk": 1208,
+"tl": 516015,
+"mb": 8640,
+"mbk": 12,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+2662,
+2663,
+2664,
+2665,
+2666,
+2667
+]
+},
+{
+"tb": 160,
+"tbk": 4,
+"tl": 180643,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+1265,
+2668,
+2669,
+264,
+669
+]
+},
+{
+"tb": 230640,
+"tbk": 68896,
+"tl": 166668692,
+"mb": 108,
+"mbk": 9,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+2670,
+2671,
+2672
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 847,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+117,
+2418,
+2419,
+2420,
+2673
+]
+},
+{
+"tb": 35890,
+"tbk": 7178,
+"tl": 62234,
+"mb": 8,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2674,
+2675,
+2676,
+2677,
+2678,
+2679
+]
+},
+{
+"tb": 189504,
+"tbk": 2632,
+"tl": 1253701,
+"mb": 72,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+446,
+447,
+2680,
+2681,
+2682,
+2683,
+2684
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 7476,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+490,
+491,
+492,
+7,
+2685
+]
+},
+{
+"tb": 208488,
+"tbk": 60804,
+"tl": 9201244,
+"mb": 45,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+638,
+639,
+640,
+641,
+642,
+643,
+644,
+645,
+646,
+647,
+648,
+116,
+111,
+112,
+113,
+114,
+673,
+674
+]
+},
+{
+"tb": 640,
+"tbk": 8,
+"tl": 1039,
+"mb": 80,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2686,
+45,
+45,
+46,
+85,
+46
+]
+},
+{
+"tb": 640,
+"tbk": 16,
+"tl": 8535,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+129,
+130,
+131,
+7,
+282
+]
+},
+{
+"tb": 24024,
+"tbk": 8008,
+"tl": 29827923,
+"mb": 30,
+"mbk": 10,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+2687,
+2688
+]
+},
+{
+"tb": 384,
+"tbk": 4,
+"tl": 1764,
+"mb": 192,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+891,
+892,
+893,
+894,
+2689
+]
+},
+{
+"tb": 218824,
+"tbk": 1609,
+"tl": 64698299,
+"mb": 136,
+"mbk": 1,
+"gb": 136,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+2690,
+2691,
+2692,
+2693,
+2694,
+2695,
+2696,
+2697,
+2698,
+2699,
+2700,
+2701,
+2702,
+2703,
+452,
+596
+]
+},
+{
+"tb": 48,
+"tbk": 1,
+"tl": 64598330,
+"mb": 48,
+"mbk": 1,
+"gb": 48,
+"gbk": 1,
+"eb": 48,
+"ebk": 1,
+"fs": [
+1,
+1011,
+1012,
+1065,
+741,
+742,
+23,
+24,
+25
+]
+},
+{
+"tb": 202368,
+"tbk": 2200,
+"tl": 1675993,
+"mb": 960,
+"mbk": 5,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+687,
+688,
+2704,
+2705,
+193,
+194
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 468417,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1665,
+1727,
+2706,
+669,
+1328
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 12718,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1029,
+1030,
+1031,
+7,
+167
+]
+},
+{
+"tb": 6272,
+"tbk": 56,
+"tl": 23476,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+4,
+5,
+6,
+7,
+167
+]
+},
+{
+"tb": 65792,
+"tbk": 1028,
+"tl": 67287,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+266,
+267,
+1482,
+1483,
+1484,
+461,
+2707
+]
+},
+{
+"tb": 10912,
+"tbk": 62,
+"tl": 12992,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+252,
+342,
+2378,
+344,
+1300
+]
+},
+{
+"tb": 121344,
+"tbk": 632,
+"tl": 22120,
+"mb": 192,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1495,
+1496,
+1497,
+2708,
+237
+]
+},
+{
+"tb": 16512,
+"tbk": 129,
+"tl": 2161,
+"mb": 128,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+351,
+2709,
+2710,
+2711,
+2712,
+2713,
+2714,
+2715,
+2716
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 775,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+1221,
+306,
+306,
+46,
+46
+]
+},
+{
+"tb": 192,
+"tbk": 6,
+"tl": 1541,
+"mb": 32,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+809,
+810,
+811,
+812,
+1304,
+1305,
+1306
+]
+},
+{
+"tb": 1584,
+"tbk": 9,
+"tl": 1334,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+912,
+755,
+1438,
+709,
+756
+]
+},
+{
+"tb": 160,
+"tbk": 4,
+"tl": 637,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1699,
+1700,
+1701,
+1702,
+1703,
+461,
+2707
+]
+},
+{
+"tb": 48,
+"tbk": 1,
+"tl": 64597684,
+"mb": 48,
+"mbk": 1,
+"gb": 48,
+"gbk": 1,
+"eb": 48,
+"ebk": 1,
+"fs": [
+1,
+1011,
+1012,
+1013,
+390,
+391,
+23,
+24,
+25
+]
+},
+{
+"tb": 528,
+"tbk": 88,
+"tl": 267864,
+"mb": 12,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+2717,
+2718
+]
+},
+{
+"tb": 163856,
+"tbk": 931,
+"tl": 295416,
+"mb": 1056,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+252,
+342,
+2378,
+344,
+345
+]
+},
+{
+"tb": 32,
+"tbk": 2,
+"tl": 118,
+"mb": 16,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+2719,
+2720,
+2721,
+2722,
+2723,
+2724,
+2725,
+2726,
+2727
+]
+},
+{
+"tb": 8080,
+"tbk": 202,
+"tl": 904,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1440,
+1441,
+1442,
+2728,
+1443,
+1444,
+1445
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 750,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1339,
+1340,
+118,
+46,
+46,
+47
+]
+},
+{
+"tb": 960,
+"tbk": 24,
+"tl": 2540,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+117,
+118,
+46,
+85,
+46
+]
+},
+{
+"tb": 1764,
+"tbk": 54,
+"tl": 1664,
+"mb": 80,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+2729,
+2730,
+2731,
+2732,
+2733,
+2734,
+2735,
+2736,
+2737
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5200,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1577,
+1578,
+1579,
+7,
+968
+]
+},
+{
+"tb": 40,
+"tbk": 1,
+"tl": 64598745,
+"mb": 40,
+"mbk": 1,
+"gb": 40,
+"gbk": 1,
+"eb": 40,
+"ebk": 1,
+"fs": [
+1,
+26,
+27,
+28,
+2738,
+2739,
+2740,
+2741,
+2742
+]
+},
+{
+"tb": 58560,
+"tbk": 915,
+"tl": 553022,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1564,
+1565,
+1566,
+1567,
+1568,
+2743
+]
+},
+{
+"tb": 368640,
+"tbk": 773,
+"tl": 12947,
+"mb": 1152,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1835,
+2744,
+2745,
+2746,
+2747,
+2748,
+2749,
+2750,
+2751,
+2752
+]
+},
+{
+"tb": 856520,
+"tbk": 3059,
+"tl": 206641,
+"mb": 560,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+2753,
+2754,
+2755,
+2756,
+2757,
+2758
+]
+},
+{
+"tb": 40,
+"tbk": 1,
+"tl": 64598442,
+"mb": 40,
+"mbk": 1,
+"gb": 40,
+"gbk": 1,
+"eb": 40,
+"ebk": 1,
+"fs": [
+1,
+26,
+27,
+28,
+2759,
+2760,
+2761,
+2762,
+2763
+]
+},
+{
+"tb": 6408,
+"tbk": 400,
+"tl": 23721,
+"mb": 366,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+2469,
+2470,
+2471,
+2472,
+2473,
+2764,
+869
+]
+},
+{
+"tb": 150,
+"tbk": 2,
+"tl": 64895778,
+"mb": 100,
+"mbk": 1,
+"gb": 100,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+168,
+169,
+170,
+171,
+585,
+586,
+587,
+588,
+589,
+590,
+591,
+592,
+593,
+2765,
+1671
+]
+},
+{
+"tb": 6784,
+"tbk": 1696,
+"tl": 7497581,
+"mb": 20,
+"mbk": 5,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+2766
+]
+},
+{
+"tb": 616320,
+"tbk": 1605,
+"tl": 161945,
+"mb": 384,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+288,
+2767,
+2768,
+2769,
+2770,
+2771,
+2772,
+2773,
+2774
+]
+},
+{
+"tb": 11264,
+"tbk": 64,
+"tl": 17234,
+"mb": 528,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+934,
+935,
+936,
+937,
+1504
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 869,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+39,
+40,
+85,
+85,
+46
+]
+},
+{
+"tb": 640,
+"tbk": 8,
+"tl": 1062,
+"mb": 80,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2686,
+45,
+118,
+46,
+46,
+47
+]
+},
+{
+"tb": 4480,
+"tbk": 20,
+"tl": 443498,
+"mb": 1120,
+"mbk": 5,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+1301,
+1302,
+1303,
+862,
+863,
+928,
+743
+]
+},
+{
+"tb": 47360,
+"tbk": 313,
+"tl": 11412549007,
+"mb": 29504,
+"mbk": 182,
+"gb": 29504,
+"gbk": 182,
+"eb": 29504,
+"ebk": 182,
+"fs": [
+204,
+205,
+2775,
+2776,
+2777,
+2778,
+2779
+]
+},
+{
+"tb": 1360,
+"tbk": 272,
+"tl": 890071,
+"mb": 15,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+2780
+]
+},
+{
+"tb": 118784,
+"tbk": 3712,
+"tl": 55925,
+"mb": 32,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+2781,
+2782,
+2783,
+2784,
+2785,
+2786,
+2787,
+2788,
+2789
+]
+},
+{
+"tb": 15680,
+"tbk": 392,
+"tl": 77146,
+"mb": 240,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+539,
+540,
+541,
+542,
+543,
+1863,
+1864
+]
+},
+{
+"tb": 163856,
+"tbk": 931,
+"tl": 287115,
+"mb": 1056,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+341,
+342,
+2378,
+344,
+345
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 11305,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1272,
+1030,
+1031,
+7,
+1639
+]
+},
+{
+"tb": 89880,
+"tbk": 1605,
+"tl": 301243,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+462,
+463,
+2156,
+2157,
+421,
+422
+]
+},
+{
+"tb": 37760,
+"tbk": 95,
+"tl": 70524,
+"mb": 2560,
+"mbk": 5,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+518,
+2443,
+2444,
+2445,
+2790,
+2791
+]
+},
+{
+"tb": 77040,
+"tbk": 1605,
+"tl": 346672,
+"mb": 48,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1011,
+1012,
+2178,
+1014,
+1015,
+421,
+422
+]
+},
+{
+"tb": 156344,
+"tbk": 24728,
+"tl": 14521408,
+"mb": 270,
+"mbk": 30,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+638,
+639,
+640,
+641,
+642,
+643,
+644,
+645,
+646,
+647,
+115,
+116,
+111,
+112,
+113,
+114,
+115,
+116
+]
+},
+{
+"tb": 75520,
+"tbk": 424,
+"tl": 1223,
+"mb": 640,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+2058,
+2059,
+2060,
+2792,
+2793
+]
+},
+{
+"tb": 924480,
+"tbk": 12840,
+"tl": 44317308,
+"mb": 72,
+"mbk": 1,
+"gb": 72,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+446,
+447,
+448,
+2794,
+450,
+451,
+452
+]
+},
+{
+"tb": 680,
+"tbk": 17,
+"tl": 30,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+379,
+380,
+381,
+382,
+383,
+2405,
+2406,
+531
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 11904,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+439,
+440,
+441,
+7,
+89
+]
+},
+{
+"tb": 40,
+"tbk": 1,
+"tl": 276,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1699,
+1700,
+1825,
+1826,
+1664,
+1806,
+1807
+]
+},
+{
+"tb": 1024,
+"tbk": 16,
+"tl": 1217,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1594,
+1595,
+1596,
+881,
+2418,
+2419,
+2420
+]
+},
+{
+"tb": 5120000,
+"tbk": 16,
+"tl": 28469,
+"mb": 320000,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+2795,
+2796,
+2797,
+2798,
+2799,
+2800,
+2801,
+2802
+]
+},
+{
+"tb": 160,
+"tbk": 40,
+"tl": 146932,
+"mb": 8,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+2803
+]
+},
+{
+"tb": 3584,
+"tbk": 32,
+"tl": 14453,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+156,
+157,
+158,
+7,
+132
+]
+},
+{
+"tb": 9504,
+"tbk": 54,
+"tl": 7944,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+1784,
+2656,
+2559,
+1787,
+1512
+]
+},
+{
+"tb": 640,
+"tbk": 16,
+"tl": 1644,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+44,
+45,
+46,
+85,
+85
+]
+},
+{
+"tb": 880,
+"tbk": 5,
+"tl": 747,
+"mb": 528,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+2804,
+2805,
+2806,
+2807,
+2808
+]
+},
+{
+"tb": 2880,
+"tbk": 40,
+"tl": 45372,
+"mb": 144,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+2809,
+2810,
+1783,
+1820,
+124
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 21808,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+839,
+840,
+841,
+7,
+230
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 14424,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+105,
+106,
+107,
+7,
+8
+]
+},
+{
+"tb": 1792,
+"tbk": 192,
+"tl": 176989,
+"mb": 224,
+"mbk": 24,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+675,
+1413,
+1414,
+1415,
+1416,
+1417,
+1418,
+1419,
+1420,
+2811
+]
+},
+{
+"tb": 13464,
+"tbk": 187,
+"tl": 3594,
+"mb": 72,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1034,
+1035,
+94,
+95,
+96,
+97,
+229
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6506,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+884,
+885,
+886,
+7,
+230
+]
+},
+{
+"tb": 400,
+"tbk": 80,
+"tl": 293990,
+"mb": 10,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+2812
+]
+},
+{
+"tb": 493248,
+"tbk": 4404,
+"tl": 877924,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+330,
+5,
+982,
+1858,
+1859
+]
+},
+{
+"tb": 1152,
+"tbk": 24,
+"tl": 51276,
+"mb": 96,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+1409,
+1410,
+1411,
+237,
+238,
+932,
+933
+]
+},
+{
+"tb": 1184932,
+"tbk": 1621,
+"tl": 1050527,
+"mb": 2156,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+2813,
+2814,
+2815,
+2816
+]
+},
+{
+"tb": 89880,
+"tbk": 1605,
+"tl": 154904,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+462,
+20,
+2156,
+2157,
+421,
+422
+]
+},
+{
+"tb": 126976,
+"tbk": 856,
+"tl": 263779,
+"mb": 512,
+"mbk": 2,
+"gb": 256,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1832,
+2817,
+2818,
+193,
+194,
+874
+]
+},
+{
+"tb": 31200,
+"tbk": 325,
+"tl": 8852287,
+"mb": 1248,
+"mbk": 13,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1570,
+1571,
+1572,
+1573,
+2819
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 10977,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+283,
+840,
+841,
+7,
+913
+]
+},
+{
+"tb": 40,
+"tbk": 1,
+"tl": 104,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+2016,
+118,
+46,
+46,
+47
+]
+},
+{
+"tb": 75264,
+"tbk": 80,
+"tl": 697952,
+"mb": 6720,
+"mbk": 7,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+2820,
+2821,
+2822,
+2823,
+2824
+]
+},
+{
+"tb": 1840,
+"tbk": 46,
+"tl": 4869,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+117,
+46,
+46,
+47,
+403
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 9249,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+884,
+885,
+886,
+7,
+167
+]
+},
+{
+"tb": 78760,
+"tbk": 1969,
+"tl": 3173,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+379,
+380,
+381,
+382,
+383,
+2075,
+2076,
+1904
+]
+},
+{
+"tb": 225342,
+"tbk": 3571,
+"tl": 11883,
+"mb": 108,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1139,
+1140,
+1141,
+1142,
+1143,
+1144,
+1145,
+1146,
+1147,
+1148,
+2189,
+1120,
+1121,
+2626
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 11590,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+490,
+491,
+492,
+7,
+1405
+]
+},
+{
+"tb": 3892736,
+"tbk": 45248,
+"tl": 9218346,
+"mb": 448,
+"mbk": 7,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+65,
+108,
+109,
+110,
+111,
+112,
+113,
+114,
+673,
+674
+]
+},
+{
+"tb": 640,
+"tbk": 16,
+"tl": 226,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+313,
+314,
+402,
+2825,
+740,
+46,
+85
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 8594,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+627,
+370,
+371,
+7,
+442
+]
+},
+{
+"tb": 401160,
+"tbk": 10029,
+"tl": 58208766,
+"mb": 160,
+"mbk": 4,
+"gb": 80,
+"gbk": 2,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+26,
+27,
+1206,
+1207,
+1208,
+2826,
+2141
+]
+},
+{
+"tb": 179760,
+"tbk": 1605,
+"tl": 328162,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+388,
+1065,
+419,
+420,
+421,
+422
+]
+},
+{
+"tb": 3840,
+"tbk": 96,
+"tl": 46501,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+1265,
+1266,
+1267,
+7,
+56
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 846,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1339,
+1340,
+42,
+40,
+46,
+85
+]
+},
+{
+"tb": 96,
+"tbk": 24,
+"tl": 109706,
+"mb": 4,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+2827
+]
+},
+{
+"tb": 160,
+"tbk": 4,
+"tl": 258616737,
+"mb": 160,
+"mbk": 4,
+"gb": 160,
+"gbk": 4,
+"eb": 160,
+"ebk": 4,
+"fs": [
+211,
+2486,
+2487,
+2488,
+203,
+743,
+744,
+745
+]
+},
+{
+"tb": 91168,
+"tbk": 814,
+"tl": 585359,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+808,
+144,
+303,
+304,
+305
+]
+},
+{
+"tb": 5208,
+"tbk": 93,
+"tl": 18935,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+658,
+659,
+661,
+662,
+663,
+664,
+2828
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 3137,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+86,
+87,
+88,
+7,
+159
+]
+},
+{
+"tb": 704,
+"tbk": 88,
+"tl": 367517,
+"mb": 16,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+414,
+2829
+]
+},
+{
+"tb": 1856,
+"tbk": 58,
+"tl": 15697,
+"mb": 96,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+809,
+810,
+811,
+812,
+1305,
+1306,
+2149
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 796,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+372,
+2830,
+2831,
+375,
+376,
+377
+]
+},
+{
+"tb": 77040,
+"tbk": 1605,
+"tl": 313260,
+"mb": 48,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1011,
+1012,
+389,
+1014,
+1015,
+421,
+422
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 14307,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+665,
+945,
+946,
+7,
+230
+]
+},
+{
+"tb": 2288,
+"tbk": 13,
+"tl": 1111,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+457,
+458,
+1925,
+460,
+461
+]
+},
+{
+"tb": 69144,
+"tbk": 2881,
+"tl": 2734503,
+"mb": 72,
+"mbk": 3,
+"gb": 24,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+2832,
+2833,
+2834,
+2835,
+2836,
+2837,
+2838,
+2839,
+2840
+]
+},
+{
+"tb": 320,
+"tbk": 64,
+"tl": 305803,
+"mb": 15,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+2841
+]
+},
+{
+"tb": 40,
+"tbk": 1,
+"tl": 348,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1699,
+1700,
+1701,
+1702,
+1703,
+1485,
+1484
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 16198,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+283,
+840,
+841,
+7,
+159
+]
+},
+{
+"tb": 12480,
+"tbk": 312,
+"tl": 9726552,
+"mb": 160,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+26,
+27,
+2407,
+2408,
+1674,
+2842,
+814
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 896,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+372,
+2843,
+2844,
+375,
+376,
+377
+]
+},
+{
+"tb": 1152,
+"tbk": 16,
+"tl": 44,
+"mb": 72,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+232,
+233,
+234,
+2845,
+312,
+237,
+238
+]
+},
+{
+"tb": 429800,
+"tbk": 102584,
+"tl": 69566289,
+"mb": 139,
+"mbk": 23,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+638,
+639,
+640,
+641,
+642,
+643,
+644,
+645,
+646,
+2846,
+1257,
+1106,
+1107,
+1108,
+1109,
+1110
+]
+},
+{
+"tb": 5505368,
+"tbk": 4818,
+"tl": 194496630,
+"mb": 4796,
+"mbk": 4,
+"gb": 3428,
+"gbk": 3,
+"eb": 3428,
+"ebk": 3,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+2847,
+2848,
+2849,
+2850
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 6297,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+1265,
+1266,
+1267,
+7,
+159
+]
+},
+{
+"tb": 23808,
+"tbk": 20,
+"tl": 43291,
+"mb": 3072,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1495,
+1496,
+1497,
+2851,
+743
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5915,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+265,
+157,
+158,
+7,
+2394
+]
+},
+{
+"tb": 576,
+"tbk": 144,
+"tl": 532403,
+"mb": 12,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+2852
+]
+},
+{
+"tb": 560,
+"tbk": 5,
+"tl": 301981,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+257,
+2143,
+926,
+701,
+927
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 242,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+539,
+540,
+880,
+881,
+41,
+45,
+46
+]
+},
+{
+"tb": 374752,
+"tbk": 196,
+"tl": 12682466272,
+"mb": 374752,
+"mbk": 196,
+"gb": 374752,
+"gbk": 196,
+"eb": 374752,
+"ebk": 196,
+"fs": [
+211,
+2853,
+2854,
+2855,
+2856,
+214,
+215,
+216
+]
+},
+{
+"tb": 102032,
+"tbk": 911,
+"tl": 611140,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+143,
+144,
+444,
+304,
+305
+]
+},
+{
+"tb": 59520,
+"tbk": 915,
+"tl": 20715,
+"mb": 128,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+351,
+1020,
+1021,
+1022,
+1023,
+1024,
+1025,
+1026,
+2123,
+1028
+]
+},
+{
+"tb": 1498824,
+"tbk": 3324,
+"tl": 90679,
+"mb": 2552,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+2857,
+2858,
+2859,
+2860
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 9856,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+924,
+1578,
+1579,
+7,
+167
+]
+},
+{
+"tb": 640,
+"tbk": 16,
+"tl": 1631,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+573,
+574,
+45,
+46,
+85,
+46
+]
+},
+{
+"tb": 78400,
+"tbk": 200,
+"tl": 12941110164,
+"mb": 78400,
+"mbk": 200,
+"gb": 78400,
+"gbk": 200,
+"eb": 78400,
+"ebk": 200,
+"fs": [
+211,
+2861,
+2862,
+2863,
+696,
+869,
+870,
+2864
+]
+},
+{
+"tb": 918288,
+"tbk": 8199,
+"tl": 274242,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+143,
+144,
+444,
+718,
+719
+]
+},
+{
+"tb": 122112,
+"tbk": 1696,
+"tl": 2127095,
+"mb": 360,
+"mbk": 5,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+2865,
+2866,
+124,
+125,
+126
+]
+},
+{
+"tb": 448,
+"tbk": 28,
+"tl": 1268,
+"mb": 16,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+2729,
+2730,
+2731,
+2732,
+2733,
+2734,
+2735,
+2736,
+2867
+]
+},
+{
+"tb": 5376,
+"tbk": 48,
+"tl": 30451,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+490,
+491,
+492,
+7,
+968
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5889,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1029,
+1030,
+1031,
+7,
+1930
+]
+},
+{
+"tb": 1280,
+"tbk": 32,
+"tl": 3389,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+39,
+40,
+46,
+85,
+46
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 4436,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+283,
+840,
+841,
+7,
+8
+]
+},
+{
+"tb": 979680,
+"tbk": 1985,
+"tl": 58260,
+"mb": 960,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+133,
+2868,
+2869,
+2870,
+2871,
+2872,
+2873,
+2874,
+2875,
+2876
+]
+},
+{
+"tb": 2968,
+"tbk": 53,
+"tl": 203,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+83,
+896,
+85,
+85,
+85,
+47
+]
+},
+{
+"tb": 80,
+"tbk": 2,
+"tl": 260,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+326,
+327,
+834,
+835,
+836,
+910,
+838
+]
+},
+{
+"tb": 1200,
+"tbk": 30,
+"tl": 3129,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+117,
+118,
+118,
+46,
+46
+]
+},
+{
+"tb": 139008,
+"tbk": 712,
+"tl": 13291,
+"mb": 288,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+2369,
+2877,
+2878,
+2879,
+2880,
+2881,
+2882,
+2883,
+2884
+]
+},
+{
+"tb": 44160,
+"tbk": 690,
+"tl": 390741,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+2273,
+1565,
+1566,
+1567,
+1568,
+2743
+]
+},
+{
+"tb": 123200,
+"tbk": 440,
+"tl": 94126,
+"mb": 1120,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+2753,
+2754,
+2755,
+2756,
+2757,
+2885
+]
+},
+{
+"tb": 73504,
+"tbk": 2297,
+"tl": 607259,
+"mb": 32,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+2051,
+2052,
+2886,
+2887,
+2888,
+2889,
+2890
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6741,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+697,
+888,
+889,
+7,
+968
+]
+},
+{
+"tb": 896,
+"tbk": 4,
+"tl": 14321,
+"mb": 224,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+2891,
+2892,
+1638,
+862,
+863,
+864,
+215
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 1573,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+330,
+5,
+6,
+7,
+968
+]
+},
+{
+"tb": 3024,
+"tbk": 27,
+"tl": 1548217,
+"mb": 336,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+884,
+2893,
+2894,
+2895,
+2896
+]
+},
+{
+"tb": 2880,
+"tbk": 40,
+"tl": 45738,
+"mb": 144,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+2897,
+2810,
+1783,
+1820,
+124
+]
+},
+{
+"tb": 80,
+"tbk": 2,
+"tl": 114255,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+1265,
+2335,
+1630,
+1224,
+1225
+]
+},
+{
+"tb": 40,
+"tbk": 1,
+"tl": 64598340,
+"mb": 40,
+"mbk": 1,
+"gb": 40,
+"gbk": 1,
+"eb": 40,
+"ebk": 1,
+"fs": [
+1,
+26,
+27,
+28,
+2898,
+2899,
+2900,
+2901,
+2902
+]
+},
+{
+"tb": 1119360,
+"tbk": 7770,
+"tl": 1737609,
+"mb": 288,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+288,
+2903,
+2904,
+2905,
+2906,
+2907,
+2908,
+2909,
+2910
+]
+},
+{
+"tb": 73920,
+"tbk": 420,
+"tl": 16201,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+100,
+806,
+425,
+103,
+426
+]
+},
+{
+"tb": 4048,
+"tbk": 23,
+"tl": 3366,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+100,
+806,
+102,
+103,
+104
+]
+},
+{
+"tb": 928,
+"tbk": 232,
+"tl": 829159,
+"mb": 12,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+2911
+]
+},
+{
+"tb": 44800,
+"tbk": 200,
+"tl": 14112,
+"mb": 448,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+2352,
+2353,
+860,
+861,
+862,
+863,
+864
+]
+},
+{
+"tb": 10240,
+"tbk": 216,
+"tl": 12941274088,
+"mb": 8320,
+"mbk": 200,
+"gb": 8320,
+"gbk": 200,
+"eb": 8320,
+"ebk": 200,
+"fs": [
+204,
+205,
+2912,
+2913,
+2914,
+2915,
+302
+]
+},
+{
+"tb": 2336,
+"tbk": 73,
+"tl": 53524,
+"mb": 64,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+757,
+758,
+759,
+760,
+761,
+762,
+2916
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 848,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+117,
+443,
+443,
+46,
+85
+]
+},
+{
+"tb": 11264,
+"tbk": 64,
+"tl": 18424,
+"mb": 528,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+1682,
+935,
+936,
+937,
+1504
+]
+},
+{
+"tb": 24320,
+"tbk": 608,
+"tl": 19235010,
+"mb": 320,
+"mbk": 8,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+26,
+27,
+2407,
+2408,
+2819,
+2917,
+2918
+]
+},
+{
+"tb": 1800,
+"tbk": 45,
+"tl": 108,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1440,
+1441,
+1442,
+2728,
+2728,
+1443,
+1444
+]
+},
+{
+"tb": 186848,
+"tbk": 800,
+"tl": 366227,
+"mb": 620,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+2919,
+2920,
+2921,
+2922
+]
+},
+{
+"tb": 96,
+"tbk": 4,
+"tl": 83,
+"mb": 24,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+273,
+2923,
+2924,
+2925,
+2926,
+2927,
+2928,
+2929,
+2930
+]
+},
+{
+"tb": 418104,
+"tbk": 5807,
+"tl": 35230507,
+"mb": 432,
+"mbk": 6,
+"gb": 216,
+"gbk": 3,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+446,
+447,
+2931,
+2932,
+2933,
+2934,
+2935
+]
+},
+{
+"tb": 158112,
+"tbk": 409,
+"tl": 5992,
+"mb": 672,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+1180,
+2936,
+2937,
+2938,
+2939,
+2940,
+2941,
+2942,
+2943
+]
+},
+{
+"tb": 500864,
+"tbk": 4472,
+"tl": 2342764,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+808,
+144,
+145,
+7,
+387
+]
+},
+{
+"tb": 522368,
+"tbk": 4664,
+"tl": 662251,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+330,
+5,
+982,
+598,
+599
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 105,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+313,
+314,
+402,
+118,
+46,
+85,
+85
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 766,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+1221,
+42,
+40,
+42,
+40
+]
+},
+{
+"tb": 204288,
+"tbk": 608,
+"tl": 524186,
+"mb": 1008,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+518,
+914,
+915,
+2944,
+2945,
+2946
+]
+},
+{
+"tb": 3520,
+"tbk": 20,
+"tl": 4073,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+252,
+342,
+343,
+344,
+345
+]
+},
+{
+"tb": 11648,
+"tbk": 104,
+"tl": 71546,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+884,
+885,
+886,
+7,
+56
+]
+},
+{
+"tb": 640,
+"tbk": 16,
+"tl": 1570,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+392,
+393,
+46,
+85,
+85,
+46
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5408,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+439,
+440,
+441,
+7,
+8
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 4509,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+839,
+840,
+841,
+7,
+8
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 8908,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1282,
+840,
+841,
+7,
+146
+]
+},
+{
+"tb": 26544,
+"tbk": 121,
+"tl": 84461,
+"mb": 896,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2947,
+2948,
+2949,
+636,
+637,
+1732
+]
+},
+{
+"tb": 29568,
+"tbk": 264,
+"tl": 195351,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+839,
+840,
+841,
+7,
+56
+]
+},
+{
+"tb": 47360,
+"tbk": 40,
+"tl": 5004,
+"mb": 1184,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+2950,
+2951,
+2952,
+2953,
+2954
+]
+},
+{
+"tb": 386048,
+"tbk": 458,
+"tl": 13868,
+"mb": 1664,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+580,
+581,
+582,
+2955,
+1806
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6600,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+720,
+502,
+503,
+7,
+89
+]
+},
+{
+"tb": 40,
+"tbk": 1,
+"tl": 64598866,
+"mb": 40,
+"mbk": 1,
+"gb": 40,
+"gbk": 1,
+"eb": 40,
+"ebk": 1,
+"fs": [
+1,
+26,
+27,
+28,
+2956,
+2957,
+2958,
+2959,
+2960
+]
+},
+{
+"tb": 128,
+"tbk": 16,
+"tl": 7427,
+"mb": 8,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+675,
+676,
+677,
+678,
+679,
+680,
+2961,
+682
+]
+},
+{
+"tb": 12480,
+"tbk": 15,
+"tl": 1003,
+"mb": 832,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+580,
+581,
+582,
+2962,
+2527
+]
+},
+{
+"tb": 99,
+"tbk": 10,
+"tl": 16,
+"mb": 15,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+1394,
+1395,
+1396,
+1435,
+668
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 12499,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1282,
+840,
+841,
+7,
+167
+]
+},
+{
+"tb": 13584,
+"tbk": 283,
+"tl": 4948,
+"mb": 48,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1559,
+1560,
+603,
+604,
+229,
+605,
+1561
+]
+},
+{
+"tb": 3584,
+"tbk": 32,
+"tl": 15618,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1160,
+1263,
+1264,
+7,
+56
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 827,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+392,
+2963,
+2964,
+375,
+376,
+377
+]
+},
+{
+"tb": 378560,
+"tbk": 3380,
+"tl": 478663,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+265,
+157,
+2124,
+1745,
+2125
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 4667,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+156,
+157,
+158,
+7,
+887
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 797,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+392,
+393,
+45,
+45,
+46,
+85
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 8588,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+330,
+5,
+6,
+7,
+230
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 11445,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1160,
+1263,
+1264,
+7,
+8
+]
+},
+{
+"tb": 14336,
+"tbk": 128,
+"tl": 106269,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1282,
+840,
+841,
+7,
+89
+]
+},
+{
+"tb": 72960,
+"tbk": 304,
+"tl": 1289615,
+"mb": 640,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+148,
+149,
+150,
+151,
+152,
+2965,
+2966,
+2967
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5784,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+156,
+157,
+158,
+7,
+146
+]
+},
+{
+"tb": 512,
+"tbk": 8,
+"tl": 140,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1594,
+1595,
+1596,
+881,
+45,
+45,
+46
+]
+},
+{
+"tb": 960,
+"tbk": 24,
+"tl": 2530,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+39,
+40,
+443,
+46,
+85
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 802,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+392,
+393,
+45,
+118,
+46,
+85
+]
+},
+{
+"tb": 112,
+"tbk": 1,
+"tl": 73512,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+830,
+831,
+832,
+1224,
+1225
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6106,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+830,
+1263,
+1264,
+7,
+1930
+]
+},
+{
+"tb": 24448,
+"tbk": 764,
+"tl": 19252,
+"mb": 32,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1920,
+1921,
+1922,
+1965,
+2968
+]
+},
+{
+"tb": 49280,
+"tbk": 440,
+"tl": 309630,
+"mb": 336,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+265,
+157,
+158,
+7,
+230
+]
+},
+{
+"tb": 12288,
+"tbk": 128,
+"tl": 4505,
+"mb": 96,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+734,
+735,
+736,
+737,
+2969
+]
+},
+{
+"tb": 4480,
+"tbk": 40,
+"tl": 29296,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+156,
+157,
+158,
+7,
+282
+]
+},
+{
+"tb": 12544,
+"tbk": 196,
+"tl": 54100,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+2970,
+2971,
+2972,
+2973,
+2549
+]
+},
+{
+"tb": 23856,
+"tbk": 213,
+"tl": 14365707,
+"mb": 560,
+"mbk": 5,
+"gb": 112,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+156,
+2974,
+629,
+630,
+631
+]
+},
+{
+"tb": 48,
+"tbk": 1,
+"tl": 64598169,
+"mb": 48,
+"mbk": 1,
+"gb": 48,
+"gbk": 1,
+"eb": 48,
+"ebk": 1,
+"fs": [
+1,
+416,
+417,
+1217,
+390,
+391,
+23,
+24,
+25
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 21368,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1282,
+840,
+841,
+7,
+230
+]
+},
+{
+"tb": 773136,
+"tbk": 6903,
+"tl": 527092,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+808,
+144,
+807,
+718,
+719
+]
+},
+{
+"tb": 8960,
+"tbk": 80,
+"tl": 43589,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+490,
+491,
+492,
+7,
+230
+]
+},
+{
+"tb": 1960,
+"tbk": 1,
+"tl": 64593668,
+"mb": 1960,
+"mbk": 1,
+"gb": 1960,
+"gbk": 1,
+"eb": 1960,
+"ebk": 1,
+"fs": [
+64,
+1130,
+1131,
+1132,
+1133,
+1134,
+1135,
+2975,
+2976,
+2977
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 1583,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+490,
+491,
+492,
+7,
+2394
+]
+},
+{
+"tb": 4608,
+"tbk": 64,
+"tl": 84470,
+"mb": 216,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+2978,
+1819,
+1783,
+1820,
+124
+]
+},
+{
+"tb": 528,
+"tbk": 3,
+"tl": 958,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+457,
+458,
+1925,
+460,
+1485
+]
+},
+{
+"tb": 77040,
+"tbk": 1605,
+"tl": 379252,
+"mb": 48,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1011,
+1012,
+851,
+1014,
+1015,
+421,
+422
+]
+},
+{
+"tb": 2497760,
+"tbk": 2330,
+"tl": 10756907,
+"mb": 5360,
+"mbk": 5,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+2979,
+2980,
+2981,
+2982,
+2983,
+2984
+]
+},
+{
+"tb": 2720,
+"tbk": 68,
+"tl": 27997,
+"mb": 200,
+"mbk": 5,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+26,
+27,
+2407,
+2408,
+2819,
+2985,
+2986
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 15977,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1282,
+840,
+841,
+7,
+159
+]
+},
+{
+"tb": 24,
+"tbk": 1,
+"tl": 405,
+"mb": 24,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+494,
+495,
+496,
+497,
+1304,
+1304,
+1304
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 861,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+2987,
+118,
+45,
+46,
+85
+]
+},
+{
+"tb": 6272,
+"tbk": 56,
+"tl": 36922,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1272,
+1030,
+1031,
+7,
+56
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6467,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+720,
+502,
+503,
+7,
+230
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 10130,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1029,
+1030,
+1031,
+7,
+230
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 7025,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+697,
+888,
+889,
+7,
+887
+]
+},
+{
+"tb": 2207040,
+"tbk": 3135,
+"tl": 64522,
+"mb": 704,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+2988,
+2989,
+2990,
+2991,
+438
+]
+},
+{
+"tb": 65296,
+"tbk": 371,
+"tl": 23880,
+"mb": 880,
+"mbk": 5,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+423,
+1200,
+425,
+103,
+104
+]
+},
+{
+"tb": 50,
+"tbk": 1,
+"tl": 52,
+"mb": 50,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1649,
+1650,
+1651,
+1652,
+1653,
+1654,
+1655,
+1656,
+1657,
+1658,
+1659,
+1660,
+1661,
+2992,
+1671
+]
+},
+{
+"tb": 56,
+"tbk": 1,
+"tl": 64598530,
+"mb": 56,
+"mbk": 1,
+"gb": 56,
+"gbk": 1,
+"eb": 56,
+"ebk": 1,
+"fs": [
+1,
+555,
+2410,
+741,
+742,
+23,
+24,
+25
+]
+},
+{
+"tb": 179712,
+"tbk": 648,
+"tl": 67586,
+"mb": 768,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+2993,
+2994,
+2995,
+2996,
+2997
+]
+},
+{
+"tb": 64480,
+"tbk": 1262,
+"tl": 1281035,
+"mb": 208,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+2998,
+2999,
+3000,
+3001,
+3002,
+3003,
+3004,
+3005,
+3006,
+3007
+]
+},
+{
+"tb": 179760,
+"tbk": 1605,
+"tl": 364353,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+388,
+851,
+1014,
+1015,
+421,
+422
+]
+},
+{
+"tb": 513600,
+"tbk": 12840,
+"tl": 1685288,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+313,
+314,
+315,
+3008,
+3009,
+3010,
+3011
+]
+},
+{
+"tb": 924480,
+"tbk": 12840,
+"tl": 44537120,
+"mb": 72,
+"mbk": 1,
+"gb": 72,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+446,
+447,
+448,
+3012,
+450,
+451,
+452
+]
+},
+{
+"tb": 3287040,
+"tbk": 12840,
+"tl": 7689024,
+"mb": 256,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1967,
+3013,
+3014,
+3015,
+3016,
+3017,
+3018,
+3019,
+3020,
+3021
+]
+},
+{
+"tb": 1058080,
+"tbk": 1945,
+"tl": 189173,
+"mb": 2176,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+3022,
+3023,
+3024,
+3025,
+3026,
+3027
+]
+},
+{
+"tb": 1129920,
+"tbk": 1605,
+"tl": 69412,
+"mb": 704,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+3028,
+3029,
+3030,
+3031,
+3032,
+3033,
+3034,
+3035,
+3036,
+3037
+]
+},
+{
+"tb": 21472,
+"tbk": 244,
+"tl": 4007,
+"mb": 88,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1693,
+1694,
+227,
+228,
+229,
+605,
+1561
+]
+},
+{
+"tb": 1640,
+"tbk": 41,
+"tl": 4228,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+117,
+46,
+85,
+46,
+47
+]
+},
+{
+"tb": 544,
+"tbk": 272,
+"tl": 942696,
+"mb": 6,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+414,
+3038
+]
+},
+{
+"tb": 576,
+"tbk": 8,
+"tl": 73939,
+"mb": 72,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+3039,
+3040,
+3041,
+3042,
+312,
+237,
+238
+]
+},
+{
+"tb": 899864,
+"tbk": 181000,
+"tl": 400720130,
+"mb": 131,
+"mbk": 29,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+2670,
+3043,
+3044
+]
+},
+{
+"tb": 7168,
+"tbk": 64,
+"tl": 45177,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+105,
+106,
+107,
+7,
+159
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5619,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+86,
+87,
+88,
+7,
+1639
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 9940,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+627,
+370,
+371,
+7,
+132
+]
+},
+{
+"tb": 2576,
+"tbk": 46,
+"tl": 96,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+2229,
+2550,
+2551,
+3045,
+664,
+2828,
+3046,
+3047
+]
+},
+{
+"tb": 918288,
+"tbk": 8199,
+"tl": 195426,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+808,
+144,
+444,
+718,
+719
+]
+},
+{
+"tb": 385200,
+"tbk": 1605,
+"tl": 1685842,
+"mb": 240,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+3048,
+421,
+422,
+2023,
+605,
+1561
+]
+},
+{
+"tb": 27648,
+"tbk": 384,
+"tl": 430107,
+"mb": 216,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+3049,
+3050,
+124,
+125,
+126
+]
+},
+{
+"tb": 112,
+"tbk": 1,
+"tl": 64597676,
+"mb": 112,
+"mbk": 1,
+"gb": 112,
+"gbk": 1,
+"eb": 112,
+"ebk": 1,
+"fs": [
+1,
+388,
+1013,
+390,
+391,
+23,
+24,
+25
+]
+},
+{
+"tb": 1451060,
+"tbk": 1605,
+"tl": 55845664,
+"mb": 3360,
+"mbk": 1,
+"gb": 852,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+3051,
+3052,
+3053,
+3054
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 10829,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1282,
+840,
+841,
+7,
+913
+]
+},
+{
+"tb": 3720,
+"tbk": 93,
+"tl": 2143904,
+"mb": 240,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+1201,
+1202,
+1203,
+1204,
+378
+]
+},
+{
+"tb": 1088,
+"tbk": 17,
+"tl": 432166,
+"mb": 128,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+266,
+267,
+268,
+1856,
+1857,
+1304,
+1305
+]
+},
+{
+"tb": 88704,
+"tbk": 504,
+"tl": 181556,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+706,
+1821,
+2560,
+2561,
+708
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 846,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+117,
+443,
+46,
+85,
+46
+]
+},
+{
+"tb": 15152,
+"tbk": 947,
+"tl": 182306,
+"mb": 16,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1218,
+1219,
+94,
+95,
+820,
+229,
+605
+]
+},
+{
+"tb": 256,
+"tbk": 2,
+"tl": 110,
+"mb": 128,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1503,
+936,
+937,
+1504,
+1505,
+3055
+]
+},
+{
+"tb": 1344,
+"tbk": 8,
+"tl": 156,
+"mb": 168,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1165,
+1549,
+1550,
+1551,
+1552,
+1553,
+1554,
+1555,
+1556,
+3056
+]
+},
+{
+"tb": 176576,
+"tbk": 2759,
+"tl": 173363,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+3057,
+3058,
+3059,
+3060,
+3061,
+2104,
+2105
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 8559,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+627,
+370,
+371,
+7,
+1287
+]
+},
+{
+"tb": 352,
+"tbk": 2,
+"tl": 247,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+100,
+1200,
+102,
+103,
+104
+]
+},
+{
+"tb": 17024,
+"tbk": 1064,
+"tl": 19267,
+"mb": 16,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+3062,
+3063,
+603,
+604,
+229,
+605,
+1561
+]
+},
+{
+"tb": 9216,
+"tbk": 288,
+"tl": 9356,
+"mb": 32,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+3064,
+3065,
+3066,
+3067,
+3068
+]
+},
+{
+"tb": 4048,
+"tbk": 23,
+"tl": 3107,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+1784,
+3069,
+1786,
+1787,
+1512
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 5222,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+627,
+370,
+371,
+7,
+230
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 891,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+3070,
+3071,
+3072,
+476,
+477,
+377
+]
+},
+{
+"tb": 405884,
+"tbk": 3499,
+"tl": 236814,
+"mb": 464,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+3073,
+3074,
+3075,
+3076
+]
+},
+{
+"tb": 8960,
+"tbk": 80,
+"tl": 48097,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+143,
+144,
+145,
+7,
+56
+]
+},
+{
+"tb": 448,
+"tbk": 8,
+"tl": 16,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+83,
+896,
+443,
+118,
+46,
+85
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 518,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1165,
+1549,
+1550,
+1551,
+1552,
+1553,
+1554,
+1555,
+1556,
+3077
+]
+},
+{
+"tb": 80250,
+"tbk": 1605,
+"tl": 42751,
+"mb": 50,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1649,
+1650,
+1651,
+1652,
+1653,
+1654,
+1655,
+1656,
+1657,
+1658,
+1659,
+1660,
+1661,
+1662,
+1673,
+452,
+596
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6364,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+86,
+87,
+88,
+7,
+8
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 2076,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+839,
+840,
+841,
+7,
+1647
+]
+},
+{
+"tb": 30528,
+"tbk": 424,
+"tl": 2681066,
+"mb": 3816,
+"mbk": 53,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+3078,
+3079,
+3080,
+236,
+237,
+238,
+932
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 9952,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+924,
+1578,
+1579,
+7,
+2404
+]
+},
+{
+"tb": 299808,
+"tbk": 3091,
+"tl": 61104,
+"mb": 192,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+734,
+735,
+736,
+737,
+3081
+]
+},
+{
+"tb": 876000,
+"tbk": 1769,
+"tl": 3764035,
+"mb": 1920,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+3082,
+3083,
+3084,
+3085,
+3086,
+3087,
+3088,
+3089,
+3090,
+3091
+]
+},
+{
+"tb": 1024,
+"tbk": 16,
+"tl": 316,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1594,
+1595,
+1596,
+881,
+46,
+46,
+47
+]
+},
+{
+"tb": 2877248,
+"tbk": 2684,
+"tl": 919546,
+"mb": 7504,
+"mbk": 7,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+2979,
+2980,
+2981,
+2982,
+2983,
+3092
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 9779,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+369,
+370,
+371,
+7,
+132
+]
+},
+{
+"tb": 291600,
+"tbk": 405,
+"tl": 289684,
+"mb": 2880,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+3093,
+3094,
+3095,
+3096,
+3097,
+3098
+]
+},
+{
+"tb": 115920,
+"tbk": 1035,
+"tl": 58585068,
+"mb": 672,
+"mbk": 6,
+"gb": 224,
+"gbk": 2,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+143,
+3099,
+3100,
+3101,
+3102
+]
+},
+{
+"tb": 210816,
+"tbk": 2928,
+"tl": 1381394,
+"mb": 216,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+446,
+447,
+3103,
+3104,
+3105,
+3106,
+3107
+]
+},
+{
+"tb": 42048,
+"tbk": 584,
+"tl": 753979,
+"mb": 216,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+3108,
+1101,
+1102,
+1103,
+1104
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6690,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1160,
+1263,
+1264,
+7,
+167
+]
+},
+{
+"tb": 77040,
+"tbk": 1605,
+"tl": 410987,
+"mb": 48,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+416,
+417,
+2410,
+419,
+420,
+421,
+422
+]
+},
+{
+"tb": 78400,
+"tbk": 200,
+"tl": 12941193255,
+"mb": 78400,
+"mbk": 200,
+"gb": 78400,
+"gbk": 200,
+"eb": 78400,
+"ebk": 200,
+"fs": [
+211,
+2861,
+2862,
+2863,
+696,
+869,
+870,
+3109
+]
+},
+{
+"tb": 192,
+"tbk": 3,
+"tl": 195,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+266,
+267,
+1805,
+1664,
+1806,
+461,
+2707
+]
+},
+{
+"tb": 40,
+"tbk": 1,
+"tl": 64597917,
+"mb": 40,
+"mbk": 1,
+"gb": 40,
+"gbk": 1,
+"eb": 40,
+"ebk": 1,
+"fs": [
+1,
+26,
+27,
+28,
+3110,
+3111,
+3112,
+3113,
+3114
+]
+},
+{
+"tb": 23856,
+"tbk": 213,
+"tl": 14367710,
+"mb": 560,
+"mbk": 5,
+"gb": 112,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+265,
+2974,
+629,
+630,
+631
+]
+},
+{
+"tb": 29120,
+"tbk": 104,
+"tl": 57301,
+"mb": 840,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1851,
+1852,
+3115,
+3116,
+193,
+194
+]
+},
+{
+"tb": 68800,
+"tbk": 213,
+"tl": 283812,
+"mb": 2240,
+"mbk": 7,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+3117,
+3118,
+3119,
+3120,
+3121
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 823,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+2529,
+118,
+46,
+46,
+47
+]
+},
+{
+"tb": 640,
+"tbk": 8,
+"tl": 1034,
+"mb": 80,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1052,
+896,
+670,
+670,
+46,
+85
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 11360,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1160,
+1263,
+1264,
+7,
+230
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 116,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+313,
+314,
+402,
+45,
+46,
+85,
+46
+]
+},
+{
+"tb": 5568,
+"tbk": 6,
+"tl": 1643,
+"mb": 928,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1388,
+1389,
+1390,
+2122,
+1027
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 856,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+39,
+40,
+46,
+85,
+85
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 918,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+1221,
+41,
+46,
+46,
+47
+]
+},
+{
+"tb": 89880,
+"tbk": 1605,
+"tl": 430024,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+555,
+1059,
+419,
+420,
+421,
+422
+]
+},
+{
+"tb": 1584,
+"tbk": 9,
+"tl": 1411,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+706,
+755,
+1438,
+709,
+756
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 13243,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+156,
+157,
+158,
+7,
+464
+]
+},
+{
+"tb": 115920,
+"tbk": 1035,
+"tl": 58577054,
+"mb": 672,
+"mbk": 6,
+"gb": 224,
+"gbk": 2,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+808,
+3099,
+3100,
+3101,
+3102
+]
+},
+{
+"tb": 440,
+"tbk": 11,
+"tl": 617124,
+"mb": 80,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+160,
+161,
+3122,
+3123,
+3124,
+1792,
+669
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 11616,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1665,
+1666,
+1667,
+7,
+89
+]
+},
+{
+"tb": 480,
+"tbk": 120,
+"tl": 449094,
+"mb": 8,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+3125
+]
+},
+{
+"tb": 1536,
+"tbk": 24,
+"tl": 474,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1594,
+1595,
+1596,
+881,
+46,
+85,
+85
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 4362,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1282,
+840,
+841,
+7,
+8
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 8468,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+665,
+945,
+946,
+7,
+1399
+]
+},
+{
+"tb": 64,
+"tbk": 1,
+"tl": 400,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+2476,
+2477,
+2478,
+1857,
+1304,
+1304,
+1305
+]
+},
+{
+"tb": 8064,
+"tbk": 72,
+"tl": 31153,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+711,
+440,
+441,
+7,
+132
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 22,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+313,
+314,
+402,
+45,
+119,
+46,
+85
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 768,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+723,
+46,
+85,
+46,
+47,
+403
+]
+},
+{
+"tb": 133936,
+"tbk": 761,
+"tl": 203231,
+"mb": 528,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+100,
+806,
+102,
+103,
+426
+]
+},
+{
+"tb": 720,
+"tbk": 144,
+"tl": 510065,
+"mb": 15,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+3126
+]
+},
+{
+"tb": 4082624,
+"tbk": 5608,
+"tl": 5246654,
+"mb": 13104,
+"mbk": 18,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2536,
+2537,
+2538,
+2539,
+3127,
+3128,
+636
+]
+},
+{
+"tb": 5376,
+"tbk": 48,
+"tl": 2938822,
+"mb": 336,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+105,
+2144,
+2145,
+927,
+2655
+]
+},
+{
+"tb": 1183488,
+"tbk": 2336,
+"tl": 291353,
+"mb": 3000,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+3129,
+3130,
+3131,
+3132
+]
+},
+{
+"tb": 448,
+"tbk": 7,
+"tl": 1969,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+2476,
+2477,
+2478,
+1857,
+1305,
+1306,
+2149
+]
+},
+{
+"tb": 2288,
+"tbk": 13,
+"tl": 2380,
+"mb": 528,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+2804,
+2805,
+3133,
+2807,
+2808
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 4650,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+501,
+502,
+503,
+7,
+56
+]
+},
+{
+"tb": 795904,
+"tbk": 3109,
+"tl": 212085,
+"mb": 256,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+3134,
+3135,
+3136,
+3137,
+3138
+]
+},
+{
+"tb": 45312,
+"tbk": 95,
+"tl": 1718401,
+"mb": 3072,
+"mbk": 5,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+3139,
+3140,
+3141,
+3142,
+3143,
+3144,
+3145,
+3146,
+3147,
+3148
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 12954,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+839,
+840,
+841,
+7,
+167
+]
+},
+{
+"tb": 680,
+"tbk": 17,
+"tl": 27,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+379,
+380,
+381,
+382,
+383,
+1908,
+1909,
+1904
+]
+},
+{
+"tb": 2337380,
+"tbk": 1621,
+"tl": 57381509,
+"mb": 4268,
+"mbk": 2,
+"gb": 1428,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+3149,
+3150,
+3151,
+3152
+]
+},
+{
+"tb": 1056,
+"tbk": 6,
+"tl": 1766,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+909,
+836,
+837,
+838,
+1485
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 13524,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+839,
+840,
+841,
+7,
+132
+]
+},
+{
+"tb": 1120,
+"tbk": 10,
+"tl": 599244,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+369,
+628,
+629,
+630,
+631
+]
+},
+{
+"tb": 784,
+"tbk": 14,
+"tl": 17,
+"mb": 56,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+2229,
+2550,
+2551,
+2552,
+3153,
+3154,
+3155,
+3156
+]
+},
+{
+"tb": 5376,
+"tbk": 24,
+"tl": 24693,
+"mb": 224,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1165,
+3157,
+3158,
+3159,
+3160,
+3161,
+3162,
+3163,
+3164,
+3165
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 808,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+2016,
+46,
+85,
+46,
+47
+]
+},
+{
+"tb": 832,
+"tbk": 13,
+"tl": 5608,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+953,
+954,
+955,
+956,
+957,
+3166
+]
+},
+{
+"tb": 192256,
+"tbk": 2692,
+"tl": 68883051967,
+"mb": 95008,
+"mbk": 1092,
+"gb": 95008,
+"gbk": 1092,
+"eb": 95008,
+"ebk": 1092,
+"fs": [
+204,
+205,
+692,
+3167,
+3168,
+3169,
+3170,
+3171
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 182288,
+"mb": 80,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+26,
+27,
+1206,
+1207,
+3172,
+1792,
+669
+]
+},
+{
+"tb": 181,
+"tbk": 10,
+"tl": 13,
+"mb": 32,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+168,
+2192,
+2193,
+2194,
+2195,
+2196,
+2197,
+2198,
+2199,
+2200,
+2201,
+2202,
+179,
+2191,
+3173,
+3174,
+3175
+]
+},
+{
+"tb": 7488,
+"tbk": 18,
+"tl": 473,
+"mb": 416,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+3176,
+3177,
+3178,
+3179,
+3180,
+3181,
+3182,
+3183,
+3184
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 837,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+691,
+42,
+40,
+46,
+85
+]
+},
+{
+"tb": 69888,
+"tbk": 760,
+"tl": 759924,
+"mb": 672,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1734,
+2047,
+2048,
+2049,
+1054,
+1055,
+1056,
+2050,
+115,
+116
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 832,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+2987,
+306,
+42,
+40,
+46
+]
+},
+{
+"tb": 2784,
+"tbk": 3,
+"tl": 1178,
+"mb": 928,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1388,
+1389,
+1390,
+3185,
+1703
+]
+},
+{
+"tb": 5691680,
+"tbk": 1609,
+"tl": 64643050,
+"mb": 5919,
+"mbk": 1,
+"gb": 3832,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1235,
+1236,
+1237,
+1238,
+1239,
+1240,
+1241,
+3186,
+3187,
+452,
+596
+]
+},
+{
+"tb": 14336,
+"tbk": 416,
+"tl": 35812,
+"mb": 128,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+3188,
+3189,
+3190,
+3191,
+869
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 1887,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+265,
+157,
+158,
+7,
+913
+]
+},
+{
+"tb": 4480,
+"tbk": 40,
+"tl": 19596,
+"mb": 224,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+697,
+888,
+889,
+7,
+442
+]
+},
+{
+"tb": 680,
+"tbk": 1,
+"tl": 522,
+"mb": 680,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2530,
+390,
+391,
+23,
+24,
+25,
+1033
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 823,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+117,
+45,
+46,
+85,
+46
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 4733,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+265,
+157,
+158,
+7,
+887
+]
+},
+{
+"tb": 40,
+"tbk": 1,
+"tl": 139,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1699,
+1700,
+1825,
+2528,
+1664,
+1806,
+1485
+]
+},
+{
+"tb": 48,
+"tbk": 1,
+"tl": 64597317,
+"mb": 48,
+"mbk": 1,
+"gb": 48,
+"gbk": 1,
+"eb": 48,
+"ebk": 1,
+"fs": [
+1,
+18,
+19,
+463,
+21,
+22,
+23,
+24,
+25
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 12724,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+283,
+840,
+841,
+7,
+167
+]
+},
+{
+"tb": 74416,
+"tbk": 301,
+"tl": 11480464158,
+"mb": 47228,
+"mbk": 183,
+"gb": 46812,
+"gbk": 182,
+"eb": 46812,
+"ebk": 182,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+3192,
+3193,
+3194,
+3195
+]
+},
+{
+"tb": 37880,
+"tbk": 947,
+"tl": 191618,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+91,
+92,
+93,
+94,
+95,
+820,
+229
+]
+},
+{
+"tb": 188832,
+"tbk": 1945,
+"tl": 79555,
+"mb": 168,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+891,
+3196,
+3197,
+3198,
+3199,
+3200
+]
+},
+{
+"tb": 68800,
+"tbk": 1720,
+"tl": 5585,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1771,
+1772,
+1773,
+3201,
+3202,
+3203,
+3204
+]
+},
+{
+"tb": 199160,
+"tbk": 33688,
+"tl": 78503889,
+"mb": 100,
+"mbk": 12,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+3205,
+3206,
+3207
+]
+},
+{
+"tb": 336,
+"tbk": 168,
+"tl": 661982,
+"mb": 4,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+414,
+3208
+]
+},
+{
+"tb": 43008,
+"tbk": 168,
+"tl": 48996,
+"mb": 256,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+2308,
+2309,
+2310,
+3209,
+3210
+]
+},
+{
+"tb": 35616,
+"tbk": 168,
+"tl": 2819,
+"mb": 212,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+3211,
+3212,
+3213,
+3214
+]
+},
+{
+"tb": 56000,
+"tbk": 1750,
+"tl": 615317,
+"mb": 224,
+"mbk": 7,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+809,
+810,
+811,
+812,
+498,
+499,
+500
+]
+},
+{
+"tb": 400,
+"tbk": 10,
+"tl": 2407,
+"mb": 80,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+2082,
+2083,
+2084,
+2085,
+2086,
+584,
+461
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 4205,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+490,
+491,
+492,
+7,
+282
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 862,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1339,
+1340,
+45,
+46,
+85,
+85
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 909,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+473,
+3215,
+3216,
+476,
+477,
+377
+]
+},
+{
+"tb": 4480,
+"tbk": 40,
+"tl": 21919,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+490,
+491,
+492,
+7,
+159
+]
+},
+{
+"tb": 1792,
+"tbk": 32,
+"tl": 3572,
+"mb": 112,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+658,
+659,
+660,
+661,
+764,
+1220,
+2146
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5977,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+702,
+258,
+259,
+7,
+913
+]
+},
+{
+"tb": 222208,
+"tbk": 248,
+"tl": 102100,
+"mb": 1792,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1175,
+1176,
+1177,
+3217,
+1638
+]
+},
+{
+"tb": 54752,
+"tbk": 54,
+"tl": 14435,
+"mb": 1856,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1388,
+1389,
+1390,
+3218,
+3219
+]
+},
+{
+"tb": 640,
+"tbk": 8,
+"tl": 921,
+"mb": 80,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2686,
+443,
+42,
+40,
+46,
+85
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 838,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+2016,
+45,
+45,
+46,
+85
+]
+},
+{
+"tb": 122112,
+"tbk": 1696,
+"tl": 2143321,
+"mb": 360,
+"mbk": 5,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+3220,
+2866,
+124,
+125,
+126
+]
+},
+{
+"tb": 19072,
+"tbk": 298,
+"tl": 412687,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+2379,
+1212,
+1213,
+1214,
+1215,
+1216
+]
+},
+{
+"tb": 704,
+"tbk": 4,
+"tl": 991,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+912,
+707,
+708,
+709,
+710
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 844,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+39,
+40,
+443,
+443,
+46
+]
+},
+{
+"tb": 92160,
+"tbk": 773,
+"tl": 11223,
+"mb": 192,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+734,
+735,
+736,
+737,
+3221
+]
+},
+{
+"tb": 8176,
+"tbk": 73,
+"tl": 5299072,
+"mb": 336,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1282,
+284,
+285,
+286,
+287
+]
+},
+{
+"tb": 320,
+"tbk": 80,
+"tl": 264560,
+"mb": 8,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+3222
+]
+},
+{
+"tb": 212352,
+"tbk": 968,
+"tl": 503923,
+"mb": 896,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2947,
+3223,
+3224,
+193,
+194,
+874
+]
+},
+{
+"tb": 5760,
+"tbk": 80,
+"tl": 89853,
+"mb": 144,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+3225,
+123,
+124,
+125,
+126
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6836,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+924,
+1578,
+1579,
+7,
+1639
+]
+},
+{
+"tb": 40231,
+"tbk": 7517,
+"tl": 161000494,
+"mb": 464,
+"mbk": 16,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+611,
+3226
+]
+},
+{
+"tb": 140544,
+"tbk": 1952,
+"tl": 951966,
+"mb": 72,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+446,
+447,
+3227,
+2681,
+2682,
+2683,
+2684
+]
+},
+{
+"tb": 600,
+"tbk": 120,
+"tl": 435813,
+"mb": 10,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+3228
+]
+},
+{
+"tb": 161493,
+"tbk": 39970,
+"tl": 845000576,
+"mb": 344,
+"mbk": 80,
+"gb": 84,
+"gbk": 21,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+703,
+1283,
+3229
+]
+},
+{
+"tb": 10240,
+"tbk": 432,
+"tl": 93803,
+"mb": 256,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+692,
+693,
+694,
+3230,
+3231
+]
+},
+{
+"tb": 77040,
+"tbk": 1605,
+"tl": 478707,
+"mb": 48,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+416,
+417,
+1179,
+419,
+420,
+421,
+422
+]
+},
+{
+"tb": 280,
+"tbk": 7,
+"tl": 717,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+117,
+118,
+46,
+46,
+47
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 6013,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+129,
+130,
+131,
+7,
+159
+]
+},
+{
+"tb": 32896,
+"tbk": 514,
+"tl": 212880,
+"mb": 256,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+953,
+954,
+955,
+956,
+957,
+3232
+]
+},
+{
+"tb": 6298020,
+"tbk": 14445,
+"tl": 59709393,
+"mb": 872,
+"mbk": 2,
+"gb": 436,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+3233,
+3234,
+3235,
+3236
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 819,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+1456,
+85,
+85,
+46,
+85
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 854,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+392,
+393,
+41,
+41,
+46,
+85
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 8441,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+330,
+5,
+6,
+7,
+89
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 863,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+38,
+39,
+40,
+42,
+40,
+45
+]
+},
+{
+"tb": 5936,
+"tbk": 53,
+"tl": 3219501,
+"mb": 336,
+"mbk": 3,
+"gb": 112,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+4,
+1525,
+629,
+630,
+631
+]
+},
+{
+"tb": 12544,
+"tbk": 56,
+"tl": 61714,
+"mb": 224,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+3237,
+3238,
+3239,
+3240,
+3241,
+3242
+]
+},
+{
+"tb": 379272,
+"tbk": 3242,
+"tl": 2518361,
+"mb": 448,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+3243,
+3244,
+3245,
+3246
+]
+},
+{
+"tb": 1088,
+"tbk": 272,
+"tl": 940203,
+"mb": 12,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+3247
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6628,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+884,
+885,
+886,
+7,
+8
+]
+},
+{
+"tb": 28672,
+"tbk": 32,
+"tl": 94151,
+"mb": 1792,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1175,
+1176,
+1177,
+3248,
+862
+]
+},
+{
+"tb": 2427136,
+"tbk": 736,
+"tl": 12682539904,
+"mb": 437248,
+"mbk": 197,
+"gb": 175104,
+"gbk": 196,
+"eb": 175104,
+"ebk": 196,
+"fs": [
+204,
+205,
+3249,
+3250,
+3251,
+3252,
+3253,
+3254
+]
+},
+{
+"tb": 26120,
+"tbk": 653,
+"tl": 1086,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+379,
+380,
+381,
+382,
+383,
+384,
+385,
+1904
+]
+},
+{
+"tb": 2160,
+"tbk": 196,
+"tl": 266914,
+"mb": 51,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+3255,
+3256,
+3257,
+3258,
+3259
+]
+},
+{
+"tb": 18816,
+"tbk": 196,
+"tl": 12682589321,
+"mb": 18816,
+"mbk": 196,
+"gb": 18816,
+"gbk": 196,
+"eb": 18816,
+"ebk": 196,
+"fs": [
+204,
+205,
+2545,
+2546,
+2547,
+3260,
+1347
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5838,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+156,
+157,
+158,
+7,
+2394
+]
+},
+{
+"tb": 880,
+"tbk": 5,
+"tl": 925,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+1060,
+1061,
+1062,
+922,
+2628
+]
+},
+{
+"tb": 3200,
+"tbk": 80,
+"tl": 47699,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+127,
+128,
+129,
+130,
+131,
+7,
+56
+]
+},
+{
+"tb": 6144,
+"tbk": 13,
+"tl": 42756,
+"mb": 768,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+3139,
+3261,
+3262,
+3263,
+3264,
+3265,
+3266,
+3267,
+3268,
+3269
+]
+},
+{
+"tb": 4096,
+"tbk": 88,
+"tl": 545382,
+"mb": 384,
+"mbk": 8,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+3270,
+3271,
+3272,
+3273,
+3274
+]
+},
+{
+"tb": 2048,
+"tbk": 16,
+"tl": 19769,
+"mb": 128,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+3275,
+3276,
+3277,
+3278,
+3279
+]
+},
+{
+"tb": 288,
+"tbk": 3,
+"tl": 55,
+"mb": 96,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+1180,
+3280,
+3281,
+3282,
+3283,
+3284,
+3285,
+3286,
+3287
+]
+},
+{
+"tb": 176,
+"tbk": 1,
+"tl": 81,
+"mb": 176,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+341,
+332,
+829,
+334,
+335
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 9186,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+839,
+840,
+841,
+7,
+146
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 2207,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+808,
+144,
+145,
+7,
+132
+]
+},
+{
+"tb": 896,
+"tbk": 4,
+"tl": 89874,
+"mb": 224,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+2891,
+2892,
+1638,
+862,
+863,
+928,
+743
+]
+},
+{
+"tb": 8640,
+"tbk": 120,
+"tl": 134988,
+"mb": 144,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+3288,
+3289,
+348,
+349,
+350
+]
+},
+{
+"tb": 4736,
+"tbk": 74,
+"tl": 1862885,
+"mb": 128,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+266,
+267,
+268,
+1856,
+1857,
+1305,
+1306
+]
+},
+{
+"tb": 12000,
+"tbk": 24,
+"tl": 419,
+"mb": 500,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+3290,
+3291,
+3292,
+3293
+]
+},
+{
+"tb": 456,
+"tbk": 152,
+"tl": 681536,
+"mb": 6,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+3294,
+3295
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5169,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+105,
+106,
+107,
+7,
+167
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 12562,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1272,
+1030,
+1031,
+7,
+167
+]
+},
+{
+"tb": 4032,
+"tbk": 216,
+"tl": 1254449,
+"mb": 96,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+1631,
+1632,
+1633,
+3296,
+1635
+]
+},
+{
+"tb": 348,
+"tbk": 3,
+"tl": 318,
+"mb": 232,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+3297,
+3298,
+3299,
+3300
+]
+},
+{
+"tb": 360,
+"tbk": 9,
+"tl": 917,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+2529,
+46,
+46,
+47,
+403
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 568457,
+"mb": 336,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1577,
+925,
+926,
+701,
+927
+]
+},
+{
+"tb": 3136,
+"tbk": 200,
+"tl": 205574,
+"mb": 392,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+3301,
+3302,
+3303,
+3304,
+3305,
+3306,
+3307,
+3308,
+3309
+]
+},
+{
+"tb": 10368,
+"tbk": 144,
+"tl": 159396,
+"mb": 216,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+3310,
+1781,
+1698,
+1782,
+1783
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5802,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+711,
+440,
+441,
+7,
+442
+]
+},
+{
+"tb": 9344,
+"tbk": 248,
+"tl": 73878,
+"mb": 624,
+"mbk": 12,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+692,
+693,
+694,
+3311,
+3312
+]
+},
+{
+"tb": 16128,
+"tbk": 168,
+"tl": 28748,
+"mb": 224,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1165,
+1549,
+1550,
+1551,
+1552,
+1553,
+1554,
+3313,
+3314,
+3315
+]
+},
+{
+"tb": 120,
+"tbk": 3,
+"tl": 4,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1440,
+1441,
+1442,
+2728,
+2728,
+2728,
+1443
+]
+},
+{
+"tb": 154224,
+"tbk": 1605,
+"tl": 3021670,
+"mb": 120,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+273,
+274,
+275,
+276,
+277,
+278,
+279,
+280,
+3316
+]
+},
+{
+"tb": 7648,
+"tbk": 4,
+"tl": 258616918,
+"mb": 7648,
+"mbk": 4,
+"gb": 7648,
+"gbk": 4,
+"eb": 7648,
+"ebk": 4,
+"fs": [
+211,
+2853,
+2854,
+2855,
+2856,
+203,
+743,
+744
+]
+},
+{
+"tb": 662656,
+"tbk": 5177,
+"tl": 5109298,
+"mb": 512,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+2627,
+1588,
+1589,
+1590,
+1591,
+1592
+]
+},
+{
+"tb": 2160,
+"tbk": 196,
+"tl": 12676328319,
+"mb": 2160,
+"mbk": 196,
+"gb": 2160,
+"gbk": 196,
+"eb": 2160,
+"ebk": 196,
+"fs": [
+638,
+639,
+640,
+641,
+642,
+643,
+644,
+645,
+646,
+3317,
+3318,
+3319,
+3320,
+2164,
+2165,
+3321
+]
+},
+{
+"tb": 3168,
+"tbk": 18,
+"tl": 3654,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+252,
+1717,
+1718,
+1719,
+1720
+]
+},
+{
+"tb": 6272,
+"tbk": 56,
+"tl": 34534,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+944,
+945,
+946,
+7,
+56
+]
+},
+{
+"tb": 114296,
+"tbk": 446,
+"tl": 4489754,
+"mb": 3416,
+"mbk": 14,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+9,
+10,
+11,
+12,
+13,
+3322,
+3323,
+3324,
+3325
+]
+},
+{
+"tb": 16960,
+"tbk": 424,
+"tl": 69545,
+"mb": 240,
+"mbk": 6,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+313,
+314,
+315,
+1523,
+1524,
+3326,
+3327
+]
+},
+{
+"tb": 4608,
+"tbk": 64,
+"tl": 544579,
+"mb": 576,
+"mbk": 8,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+3328,
+3329,
+3330,
+3331,
+717,
+238,
+932
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 8367,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1272,
+1030,
+1031,
+7,
+89
+]
+},
+{
+"tb": 64,
+"tbk": 1,
+"tl": 24,
+"mb": 64,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+266,
+267,
+1482,
+1483,
+1484,
+461,
+2430
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 16430,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+839,
+840,
+841,
+7,
+159
+]
+},
+{
+"tb": 55040,
+"tbk": 214,
+"tl": 32937,
+"mb": 1792,
+"mbk": 7,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+3134,
+3135,
+3136,
+3332,
+3333
+]
+},
+{
+"tb": 71680,
+"tbk": 320,
+"tl": 436145,
+"mb": 896,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+231,
+1636,
+1637,
+1638,
+862,
+863,
+864,
+215
+]
+},
+{
+"tb": 164080,
+"tbk": 586,
+"tl": 45640,
+"mb": 560,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+2753,
+2754,
+2755,
+2756,
+3334,
+3335
+]
+},
+{
+"tb": 12960,
+"tbk": 27,
+"tl": 603079,
+"mb": 1920,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+3082,
+3336,
+3337,
+3338,
+3339,
+3340,
+3341,
+3342,
+3343,
+3344
+]
+},
+{
+"tb": 16512,
+"tbk": 1032,
+"tl": 14373,
+"mb": 16,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+3062,
+3063,
+227,
+228,
+229,
+605,
+1561
+]
+},
+{
+"tb": 320,
+"tbk": 8,
+"tl": 882,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+44,
+45,
+306,
+46,
+85
+]
+},
+{
+"tb": 2688,
+"tbk": 24,
+"tl": 21587,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+283,
+840,
+841,
+7,
+230
+]
+},
+{
+"tb": 148608,
+"tbk": 2064,
+"tl": 570101,
+"mb": 72,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+446,
+447,
+3345,
+2000,
+2001,
+2002,
+2003
+]
+},
+{
+"tb": 112,
+"tbk": 1,
+"tl": 64597898,
+"mb": 112,
+"mbk": 1,
+"gb": 112,
+"gbk": 1,
+"eb": 112,
+"ebk": 1,
+"fs": [
+1,
+388,
+2178,
+390,
+391,
+23,
+24,
+25
+]
+},
+{
+"tb": 4752,
+"tbk": 27,
+"tl": 5720,
+"mb": 352,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+98,
+99,
+341,
+453,
+454,
+455,
+749
+]
+},
+{
+"tb": 51072,
+"tbk": 304,
+"tl": 430478,
+"mb": 448,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+64,
+1165,
+3346,
+3347,
+3348,
+3349,
+3350,
+3351,
+3352
+]
+},
+{
+"tb": 1416,
+"tbk": 28,
+"tl": 545,
+"mb": 120,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+57,
+361,
+362,
+363,
+364,
+365,
+366,
+2463,
+3353
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 5189,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+1665,
+1666,
+1667,
+7,
+1855
+]
+},
+{
+"tb": 640,
+"tbk": 8,
+"tl": 904,
+"mb": 80,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+1052,
+84,
+46,
+85,
+46,
+47
+]
+},
+{
+"tb": 266,
+"tbk": 22,
+"tl": 27081,
+"mb": 44,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+147,
+518,
+519,
+767,
+768,
+3354,
+770
+]
+},
+{
+"tb": 17920,
+"tbk": 70,
+"tl": 2691,
+"mb": 768,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+2308,
+2309,
+2310,
+3355,
+3356
+]
+},
+{
+"tb": 1200,
+"tbk": 30,
+"tl": 3144,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+43,
+2529,
+46,
+85,
+46,
+47
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 7908,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+265,
+157,
+158,
+7,
+167
+]
+},
+{
+"tb": 20200,
+"tbk": 505,
+"tl": 2388,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+223,
+224,
+225,
+3357,
+3358,
+3359,
+3360
+]
+},
+{
+"tb": 59280,
+"tbk": 1482,
+"tl": 52449037,
+"mb": 200,
+"mbk": 5,
+"gb": 40,
+"gbk": 1,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+26,
+27,
+1326,
+3361,
+2842,
+814,
+815
+]
+},
+{
+"tb": 4480,
+"tbk": 40,
+"tl": 31184,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+86,
+87,
+88,
+7,
+230
+]
+},
+{
+"tb": 114048,
+"tbk": 1584,
+"tl": 1707582,
+"mb": 288,
+"mbk": 4,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+3362,
+3363,
+350,
+1697,
+1698
+]
+},
+{
+"tb": 89600,
+"tbk": 17920,
+"tl": 38803761,
+"mb": 25,
+"mbk": 5,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+3364,
+3365
+]
+},
+{
+"tb": 953008,
+"tbk": 8509,
+"tl": 1655505,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+4,
+5,
+2630,
+1745,
+2125
+]
+},
+{
+"tb": 12096,
+"tbk": 168,
+"tl": 202358,
+"mb": 144,
+"mbk": 2,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+3366,
+1342,
+124,
+125,
+126
+]
+},
+{
+"tb": 1792,
+"tbk": 16,
+"tl": 11128,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+839,
+840,
+841,
+7,
+913
+]
+},
+{
+"tb": 560,
+"tbk": 7,
+"tl": 875,
+"mb": 80,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2686,
+46,
+46,
+47,
+403,
+438
+]
+},
+{
+"tb": 80450,
+"tbk": 1609,
+"tl": 41805,
+"mb": 50,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1649,
+1650,
+1651,
+1652,
+1653,
+1654,
+1655,
+1656,
+1657,
+1658,
+1659,
+1660,
+1661,
+1662,
+595,
+452,
+596
+]
+},
+{
+"tb": 1720,
+"tbk": 43,
+"tl": 10630,
+"mb": 40,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1699,
+1700,
+1825,
+3367,
+1664,
+1806,
+461
+]
+},
+{
+"tb": 31,
+"tbk": 28,
+"tl": 3682,
+"mb": 4,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+3368,
+3369,
+3370
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 1811,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+156,
+157,
+158,
+7,
+913
+]
+},
+{
+"tb": 2510840,
+"tbk": 62771,
+"tl": 356397048,
+"mb": 1080,
+"mbk": 27,
+"gb": 240,
+"gbk": 6,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+26,
+27,
+1206,
+1207,
+2466,
+2467,
+3371
+]
+},
+{
+"tb": 128,
+"tbk": 1,
+"tl": 30,
+"mb": 128,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+90,
+1503,
+936,
+937,
+938,
+1505,
+1506
+]
+},
+{
+"tb": 77040,
+"tbk": 1605,
+"tl": 169919,
+"mb": 48,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+18,
+19,
+20,
+2156,
+2157,
+421,
+422
+]
+},
+{
+"tb": 113360,
+"tbk": 13585,
+"tl": 23905,
+"mb": 32,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+204,
+205,
+2166,
+2657,
+2658,
+3372,
+3373
+]
+},
+{
+"tb": 16704,
+"tbk": 232,
+"tl": 258173,
+"mb": 216,
+"mbk": 3,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+120,
+121,
+3374,
+3375,
+124,
+125,
+126
+]
+},
+{
+"tb": 896,
+"tbk": 8,
+"tl": 6502,
+"mb": 112,
+"mbk": 1,
+"gb": 0,
+"gbk": 0,
+"eb": 0,
+"ebk": 0,
+"fs": [
+1,
+2,
+3,
+143,
+144,
+145,
+7,
+89
+]
+}
+],
+"ftbl": [
+"[root]",
+"0x55d9d9c13333: alloc::alloc::exchange_malloc (alloc/src/alloc.rs:324:18)",
+"0x55d9d9ad1ae5: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9ad1ae5: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
+"0x55d9d9be2555: cedar_policy_core::ast::expr::ExprBuilder<T>::is_in (src/ast/expr.rs:1019:19)",
+"0x55d9d9c95290: cedar_policy_core::ast::expr::Expr::is_in (src/ast/expr.rs:399:9)",
+"0x55d9d9c9f12b: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:489:66)",
+"0x55d9d9ca05be: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
+"0x55d9d9c9fd5f: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:476:35)",
+"0x55d9d9f24af9: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
+"0x55d9d9f79518: hashbrown::raw::alloc::inner::do_alloc (src/raw/alloc.rs:11:15)",
+"0x55d9d9f0064e: hashbrown::raw::RawTableInner<A>::new_uninitialized (src/raw/mod.rs:1080:38)",
+"0x55d9d9f00c23: hashbrown::raw::RawTableInner<A>::fallible_with_capacity (src/raw/mod.rs:1109:30)",
+"0x55d9d9eff57e: hashbrown::raw::RawTableInner<A>::prepare_resize (src/raw/mod.rs:1353:29)",
+"0x55d9d9b50cd4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d9b50cd4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d9b50cd4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d9b65558: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9c1491e: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9c1491e: cedar_policy_core::ast::extension::ExtensionFunction::unary_never (src/ast/extension.rs:183:13)",
+"0x55d9d9b69604: cedar_policy_core::extensions::partial_evaluation::extension (src/extensions/partial_evaluation.rs:52:13)",
+"0x55d9d9bb5244: <cedar_policy_core::extensions::ALL_AVAILABLE_EXTENSIONS as core::ops::deref::Deref>::deref::__static_ref_initialize (cedar-policy-core/src/extensions.rs:36:9)",
+"0x55d9d9bb5244: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9bdc171: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
+"0x55d9d9b68c88: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
+"0x55d9d9d57dcd: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
+"0x55d9d9ad0716: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9ad0716: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
+"0x55d9d9cbe073: cedar_policy_core::ast::name::Name::parse_unqualified_name (src/ast/name.rs:69:19)",
+"0x55d9d9bb4ef5: <cedar_policy_core::extensions::decimal::names::GREATER_THAN as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/decimal.rs:50:46)",
+"0x55d9d9bb4ef5: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9bdbdc1: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
+"0x55d9d9b68418: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
+"0x55d9d9d5b0fd: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
+"0x55d9d9b5cb5d: hashbrown::raw::RawTable<T,A>::new_uninitialized (src/raw/mod.rs:442:20)",
+"0x55d9d9b429d5: <hashbrown::raw::RawTable<T,A> as core::clone::Clone>::clone (src/raw/mod.rs:1606:39)",
+"0x55d9d9cadb46: <hashbrown::map::HashMap<K,V,S,A> as core::clone::Clone>::clone (hashbrown-0.12.3/src/map.rs:197:20)",
+"0x55d9d9b06afd: <std::collections::hash::map::HashMap<K,V,S> as core::clone::Clone>::clone (collections/hash/map.rs:1267:22)",
+"0x55d9d9b0f355: cedar_policy_core::evaluator::<impl cedar_policy_core::ast::value::Value>::get_as_bool (cedar-policy-core/src/evaluator.rs:759:17)",
+"0x55d9d9b72726: cedar_policy_core::evaluator::Evaluator::eval_if (cedar-policy-core/src/evaluator.rs:616:20)",
+"0x55d9d9b6bc12: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:270:18)",
+"0x55d9d9b6c0ef: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:534:25)",
+"0x55d9d9b72653: cedar_policy_core::evaluator::Evaluator::eval_if (cedar-policy-core/src/evaluator.rs:614:15)",
+"0x55d9d9b0f525: cedar_policy_core::evaluator::<impl cedar_policy_core::ast::value::Value>::get_as_long (cedar-policy-core/src/evaluator.rs:771:17)",
+"0x55d9d9b6eb28: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:366:34)",
+"0x55d9d9b6be1e: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:348:21)",
+"0x55d9d9b714bf: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:281:35)",
+"0x55d9d9b6b128: cedar_policy_core::evaluator::Evaluator::partial_evaluate (cedar-policy-core/src/evaluator.rs:204:15)",
+"0x55d9d9eab881: alloc::alloc::alloc (alloc/src/alloc.rs:93:14)",
+"0x55d9d9eacf60: <hashbrown::raw::inner::alloc::inner::Global as hashbrown::raw::inner::alloc::inner::Allocator>::allocate (src/raw/alloc.rs:68:35)",
+"0x55d9d9eae077: hashbrown::raw::inner::alloc::inner::do_alloc (src/raw/alloc.rs:84:9)",
+"0x55d9d9eb8af2: hashbrown::raw::inner::RawTableInner<A>::new_uninitialized (src/raw/mod.rs:1578:38)",
+"0x55d9d9db2518: hashbrown::raw::inner::RawTable<T,A>::new_uninitialized (src/raw/mod.rs:861:20)",
+"0x55d9d9db1cf4: <hashbrown::raw::inner::RawTable<T,A> as core::clone::Clone>::clone_from (src/raw/mod.rs:2549:31)",
+"0x55d9d9db2819: hashbrown::raw::inner::RawTable<T,A>::clone_from_with_hasher (src/raw/mod.rs:2681:13)",
+"0x55d9d9d3d0ca: <indexmap::map::core::IndexMapCore<K,V> as core::clone::Clone>::clone_from (src/map/core.rs:71:9)",
+"0x55d9d9c9da3d: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:511:17)",
+"0x55d9d9a43cb9: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
+"0x55d9d9927569: alloc::boxed::Box<T,A>::try_new_uninit_in (alloc/src/boxed.rs:483:19)",
+"0x55d9d99263da: alloc::boxed::Box<T,A>::new_uninit_in (alloc/src/boxed.rs:448:15)",
+"0x55d9d9a1749d: alloc::collections::btree::node::LeafNode<K,V>::new (collections/btree/node.rs:83:28)",
+"0x55d9d9a0b9da: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::Leaf>::new_leaf (collections/btree/node.rs:217:29)",
+"0x55d9d9a0f70a: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::LeafOrInternal>::new (collections/btree/node.rs:584:9)",
+"0x55d9d9902ef7: <alloc::collections::btree::map::BTreeMap<K,V,A> as core::clone::Clone>::clone::clone_subtree (collections/btree/map.rs:219:36)",
+"0x55d9d9c13859: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
+"0x55d9d9b22efe: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9aa93a8: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa93a8: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa93a8: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d984f634: <serde::__private::de::content::TaggedContentVisitor<T> as serde::de::Visitor>::visit_map (src/private/de.rs:865:27)",
+"0x55d9d9816bcf: serde_json::value::de::visit_object (src/value/de.rs:196:20)",
+"0x55d9d98c9146: serde_json::value::de::<impl serde::de::Deserializer for serde_json::value::Value>::deserialize_any (src/value/de.rs:223:33)",
+"0x55d9d9895d14: cedar_policy_core::est::head_constraints::_::<impl serde::de::Deserialize for cedar_policy_core::est::head_constraints::ActionConstraint>::deserialize (src/est/head_constraints.rs:40:46)",
+"0x55d9d999e5ce: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d993925f: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d993925f: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d993925f: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d993925f: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d99491ee: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d99487a7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9961982: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9961982: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
+"0x55d9d98e8a24: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d9b71d87: cedar_policy_core::evaluator::Evaluator::eval_in (cedar-policy-core/src/evaluator.rs:577:52)",
+"0x55d9d9b6f952: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:417:53)",
+"0x55d9d9b6bc69: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:272:23)",
+"0x55d9d9be3dbd: cedar_policy_core::ast::expr::ExprBuilder<T>::has_attr (src/ast/expr.rs:1109:19)",
+"0x55d9d9c95b20: cedar_policy_core::ast::expr::Expr::has_attr (src/ast/expr.rs:459:9)",
+"0x55d9d9c9afb3: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:561:20)",
+"0x55d9d9c9a42b: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:574:17)",
+"0x55d9d9a43793: alloc::alloc::exchange_malloc (alloc/src/alloc.rs:324:18)",
+"0x55d9d99335b7: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d99335b7: <cedar_policy_validator::schema::ActionHeadVar as cedar_policy_validator::schema::HeadVar<cedar_policy_core::ast::entity::EntityUID>>::get_known_vars (cedar-policy-validator/src/schema.rs:1642:9)",
+"0x55d9d9904f52: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_entities_satisfying_constraint (cedar-policy-validator/src/rbac.rs:390:26)",
+"0x55d9d98d9062: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_actions_satisfying_constraint (cedar-policy-validator/src/rbac.rs:355:9)",
+"0x55d9d98d8f87: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_apply_specs_for_action (cedar-policy-validator/src/rbac.rs:330:9)",
+"0x55d9d98d8abe: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_in_fixes_principal (cedar-policy-validator/src/rbac.rs:172:14)",
+"0x55d9d98d8da0: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::validate_action_application (cedar-policy-validator/src/rbac.rs:283:38)",
+"0x55d9d9a3218b: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9a3218b: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
+"0x55d9d9a40664: cedar_policy_core::ast::expr::ExprBuilder<T>::and (src/ast/expr.rs:931:23)",
+"0x55d9d99170d5: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:790:45)",
+"0x55d9d99126f5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
+"0x55d9d99167c3: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:770:29)",
+"0x55d9d990f537: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d9be3f0d: cedar_policy_core::ast::expr::ExprBuilder<T>::like (src/ast/expr.rs:1119:19)",
+"0x55d9d9bdff00: cedar_policy_core::ast::expr::Expr::like (src/ast/expr.rs:466:9)",
+"0x55d9d9c9ad59: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:565:39)",
+"0x55d9d9cb9c06: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9cb9c06: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9cb9c06: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:139:27)",
+"0x55d9d9ac4008: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
+"0x55d9d9ac4008: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
+"0x55d9d9ac4008: <alloc::vec::Vec<T,A> as core::clone::Clone>::clone (src/vec/mod.rs:2643:9)",
+"0x55d9d9d53fe3: <serde::__private::de::content::Content as core::clone::Clone>::clone (src/private/de.rs:251:13)",
+"0x55d9d9bc8197: core::clone::Clone::clone (core/src/clone.rs:123:5)",
+"0x55d9d9cb9f07: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:146:32)",
+"0x55d9d9b70483: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:327:43)",
+"0x55d9d9b6bd7d: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:325:53)",
+"0x55d9d9b6bea8: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:482:61)",
+"0x55d9d9ad133e: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9ad133e: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
+"0x55d9d9cf44bd: cedar_policy_core::est::expr::Expr::less (src/est/expr.rs:314:20)",
+"0x55d9d9cf9592: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Relation>>::try_from (src/est/expr.rs:804:36)",
+"0x55d9d9d3c33e: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
+"0x55d9d9cf72df: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::And>>::try_from (src/est/expr.rs:765:24)",
+"0x55d9d9d3c2de: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
+"0x55d9d9ad0a16: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9ad0a16: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
+"0x55d9d9be3137: cedar_policy_core::ast::expr::ExprBuilder<T>::set (src/ast/expr.rs:1054:43)",
+"0x55d9d9bdf617: cedar_policy_core::ast::expr::Expr::set (src/ast/expr.rs:420:9)",
+"0x55d9d9c9a361: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:578:61)",
+"0x55d9d9c9d3e4: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:514:17)",
+"0x55d9d9b21d5e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9aa6432: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa6432: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa6432: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9aa6432: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9acdb8e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acd167: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c5f8f2: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9c5f8f2: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
+"0x55d9d9a94ea0: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d9be150c: cedar_policy_core::ast::expr::ExprBuilder<T>::and (src/ast/expr.rs:931:23)",
+"0x55d9d9c94400: cedar_policy_core::ast::expr::Expr::and (src/ast/expr.rs:347:9)",
+"0x55d9d9c9db01: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:509:67)",
+"0x55d9d9c9d85a: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:510:17)",
+"0x55d9d9eacda9: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
+"0x55d9d9ea9b2e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9eca228: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9eca228: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9eca228: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9ebbf5a: <serde_json::value::ser::Serializer as serde::ser::Serializer>::serialize_seq (src/value/ser.rs:233:18)",
+"0x55d9d98ccd24: serde::ser::Serializer::collect_seq (src/ser/mod.rs:1277:35)",
+"0x55d9d98900a6: serde::ser::impls::<impl serde::ser::Serialize for alloc::vec::Vec<T>>::serialize (src/ser/impls.rs:194:17)",
+"0x55d9d9890049: serde::ser::impls::<impl serde::ser::Serialize for &T>::serialize (src/ser/impls.rs:456:17)",
+"0x55d9d9be1347: cedar_policy_core::ast::expr::ExprBuilder<T>::is_eq (src/ast/expr.rs:920:19)",
+"0x55d9d9c940e0: cedar_policy_core::ast::expr::Expr::is_eq (src/ast/expr.rs:337:9)",
+"0x55d9d9c9f9f3: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:481:66)",
+"0x55d9d9c9ac75: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:565:55)",
+"0x55d9d9ad1816: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9ad1816: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
+"0x55d9d9be3247: cedar_policy_core::ast::expr::ExprBuilder<T>::record (src/ast/expr.rs:1060:20)",
+"0x55d9d9bdf9d7: cedar_policy_core::ast::expr::Expr::record (src/ast/expr.rs:425:9)",
+"0x55d9d9b7a452: cedar_policy_core::ast::restricted_expr::RestrictedExpr::record (src/ast/restricted_expr.rs:106:29)",
+"0x55d9d98b0b7f: cedar_policy_core::entities::json::jsonvalue::ValueParser::val_into_rexpr (entities/json/jsonvalue.rs:366:24)",
+"0x55d9d98b81c6: cedar_policy_core::entities::json::jsonvalue::ValueParser::val_into_rexpr::{{closure}} (entities/json/jsonvalue.rs:317:40)",
+"0x55d9d9c9ee90: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:490:17)",
+"0x55d9d97571f3: __rg_alloc (cedar-policy/tests/corpus_tests.rs:31:15)",
+"0x55d9da19e802: alloc::raw_vec::finish_grow (alloc/src/raw_vec.rs:0:0)",
+"0x55d9d97536a2: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d97536a2: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
+"0x55d9da1b4607: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
+"0x55d9da1b4607: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
+"0x55d9da1b4607: alloc::vec::Vec<T,A>::append_elements (src/vec/mod.rs:1940:9)",
+"0x55d9da1b4607: <alloc::vec::Vec<T,A> as alloc::vec::spec_extend::SpecExtend<&T,core::slice::iter::Iter<T>>>::spec_extend (src/vec/spec_extend.rs:55:18)",
+"0x55d9da1b4607: alloc::vec::Vec<T,A>::extend_from_slice (src/vec/mod.rs:2386:9)",
+"0x55d9da1b4607: std::io::impls::<impl std::io::Write for alloc::vec::Vec<u8,A>>::write_all (src/io/impls.rs:405:9)",
+"0x55d9da1b4607: <std::io::Write::write_fmt::Adapter<T> as core::fmt::Write>::write_str (src/io/mod.rs:1687:23)",
+"0x55d9da1df4fc: core::fmt::write (src/fmt/mod.rs:1252:21)",
+"0x55d9da1b42e5: std::io::Write::write_fmt (src/io/mod.rs:1698:15)",
+"0x55d9da1b3433: std::io::stdio::print_to_buffer_if_capture_used::{{closure}}::{{closure}} (src/io/stdio.rs:1030:25)",
+"0x55d9da1b3433: core::option::Option<T>::map (core/src/option.rs:1099:29)",
+"0x55d9da1b3433: std::io::stdio::print_to_buffer_if_capture_used::{{closure}} (src/io/stdio.rs:1029:13)",
+"0x55d9da1b3433: std::thread::local::LocalKey<T>::try_with (src/thread/local.rs:252:16)",
+"0x55d9da1b3433: std::io::stdio::print_to_buffer_if_capture_used (src/io/stdio.rs:1025:12)",
+"0x55d9da1b3724: std::io::stdio::print_to (src/io/stdio.rs:1013:8)",
+"0x55d9da1b3724: std::io::stdio::_eprint (src/io/stdio.rs:1106:5)",
+"0x55d9d9758cd6: cedar_policy::integration_testing::perform_integration_test_from_json_custom (cedar-policy/src/integration_testing.rs:184:5)",
+"0x55d9d9ccd04b: cedar_policy_core::parser::text_to_cst::grammar::__action151 (src/parser/grammar.rs:59758:5)",
+"0x55d9d9ccf68a: cedar_policy_core::parser::text_to_cst::grammar::__action185 (src/parser/grammar.rs:60381:5)",
+"0x55d9d9bf6828: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce15 (src/parser/grammar.rs:36998:20)",
+"0x55d9d9bede50: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35406:17)",
+"0x55d9d9bea683: <cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__StateMachine as lalrpop_util::state_machine::ParserDefinition>::reduce (src/parser/grammar.rs:33861:13)",
+"0x55d9d9d506dc: lalrpop_util::state_machine::Parser<D,I>::reduce (lalrpop-util-0.20.0/src/state_machine.rs:594:9)",
+"0x55d9d9c9d151: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:519:17)",
+"0x55d9d9f34dfc: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9ede008: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9ede008: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9ede008: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9fa23b5: regex_automata::util::pool::inner::Pool<T,F>::new (src/util/pool.rs:459:30)",
+"0x55d9d9fa22db: regex_automata::util::pool::Pool<T,F>::new (src/util/pool.rs:160:37)",
+"0x55d9d9f7b741: regex_automata::meta::regex::Builder::build_many_from_hir (src/meta/regex.rs:3557:13)",
+"0x55d9d9ed7e64: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3441:9)",
+"0x55d9da157b59: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
+"0x55d9da14793b: alloc::raw_vec::finish_grow (alloc/src/raw_vec.rs:475:9)",
+"0x55d9d9764f92: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d97656a8: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9785529: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9783253: <serde::de::impls::<impl serde::de::Deserialize for alloc::vec::Vec<T>>::deserialize::VecVisitor<T> as serde::de::Visitor>::visit_seq (src/de/impls.rs:1035:21)",
+"0x55d9d9774b0d: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_seq (serde_json-1.0.107/src/de.rs:1740:31)",
+"0x55d9d9f22e13: alloc::alloc::exchange_malloc (alloc/src/alloc.rs:324:18)",
+"0x55d9d9f7b6aa: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9f7b6aa: regex_automata::meta::regex::Builder::build_many_from_hir (src/meta/regex.rs:3556:39)",
+"0x55d9d9f7b18c: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3441:9)",
+"0x55d9d9f7a835: regex_automata::meta::regex::Builder::build (src/meta/regex.rs:3360:9)",
+"0x55d9d9edbc92: regex::builders::Builder::build_one_string (regex-1.9.5/src/builders.rs:79:9)",
+"0x55d9d9ed7266: regex::builders::string::RegexBuilder::build (regex-1.9.5/src/builders.rs:233:13)",
+"0x55d9d9edada6: regex::regex::string::Regex::new (src/regex/string.rs:181:9)",
+"0x55d9d99bd914: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d99bd914: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d99bd914: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d99d53b8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d99334f7: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d99334f7: <cedar_policy_validator::schema::PrincipalOrResourceHeadVar as cedar_policy_validator::schema::HeadVar<cedar_policy_core::ast::name::Name>>::get_descendants_if_present (cedar-policy-validator/src/schema.rs:1624:39)",
+"0x55d9d9997ce6: cedar_policy_validator::schema::ValidatorSchema::get_entities_in (cedar-policy-validator/src/schema.rs:1167:9)",
+"0x55d9d9905b91: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_entities_satisfying_constraint (cedar-policy-validator/src/rbac.rs:406:26)",
+"0x55d9d98d900e: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_principals_satisfying_constraint (cedar-policy-validator/src/rbac.rs:343:9)",
+"0x55d9d98d8d42: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::validate_action_application (cedar-policy-validator/src/rbac.rs:279:50)",
+"0x55d9d98d93e4: cedar_policy_validator::Validator::validate_policy (cedar-policy-validator/src/lib.rs:105:20)",
+"0x55d9d9c9f758: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:482:17)",
+"0x55d9da155473: alloc::alloc::exchange_malloc (alloc/src/alloc.rs:324:18)",
+"0x55d9da18a46c: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9da18a46c: regex_syntax::hir::Properties::empty (src/hir/mod.rs:2351:20)",
+"0x55d9da183a67: regex_syntax::hir::Hir::into_parts (src/hir/mod.rs:237:49)",
+"0x55d9da18472f: regex_syntax::hir::Hir::concat (src/hir/mod.rs:433:33)",
+"0x55d9da16b095: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_post (src/hir/translate.rs:466:42)",
+"0x55d9da111d15: regex_syntax::ast::visitor::HeapVisitor::visit (src/ast/visitor.rs:251:17)",
+"0x55d9da1116d3: regex_syntax::ast::visitor::visit (src/ast/visitor.rs:119:5)",
+"0x55d9d9f350ec: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9f22cdd: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9f22cdd: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9f22cdd: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:162:25)",
+"0x55d9d9ee5f58: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
+"0x55d9d9ee5f58: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
+"0x55d9d9ee5f58: <alloc::vec::Vec<T,A> as core::clone::Clone>::clone (src/vec/mod.rs:2643:9)",
+"0x55d9d9faccb4: regex_automata::dfa::remapper::Remapper::remap (src/dfa/remapper.rs:133:22)",
+"0x55d9d9f27406: regex_automata::dfa::onepass::InternalBuilder::shuffle_states (src/dfa/onepass.rs:753:9)",
+"0x55d9d9f26418: regex_automata::dfa::onepass::InternalBuilder::build (src/dfa/onepass.rs:724:9)",
+"0x55d9d9be3687: cedar_policy_core::ast::expr::ExprBuilder<T>::record (src/ast/expr.rs:1060:20)",
+"0x55d9d9bdf820: cedar_policy_core::ast::expr::Expr::record (src/ast/expr.rs:425:9)",
+"0x55d9d9c9a2ad: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:584:59)",
+"0x55d9d9a3fd93: cedar_policy_core::ast::expr::ExprBuilder<T>::binary_app (src/ast/expr.rs:1087:19)",
+"0x55d9d991b9f2: cedar_policy_validator::typecheck::Typechecker::typecheck_binary::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1303:29)",
+"0x55d9d9910a18: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d991b7f9: cedar_policy_validator::typecheck::Typechecker::typecheck_binary::{{closure}} (cedar-policy-validator/src/typecheck.rs:1301:21)",
+"0x55d9d990ec15: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d9be2097: cedar_policy_core::ast::expr::ExprBuilder<T>::add (src/ast/expr.rs:984:19)",
+"0x55d9d9c94d60: cedar_policy_core::ast::expr::Expr::add (src/ast/expr.rs:377:9)",
+"0x55d9d9c9d215: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:517:67)",
+"0x55d9d9b2c4d3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9b3d159: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9abc25f: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9cbf7b6: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::ast::name::Name>::into_func (src/parser/cst_to_ast.rs:1788:13)",
+"0x55d9d9a703c3: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1399:28)",
+"0x55d9d9be12a5: cedar_policy_core::ast::expr::ExprBuilder<T>::is_eq (src/ast/expr.rs:919:19)",
+"0x55d9d9a374a1: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9a374a1: cedar_policy_validator::types::Type::set (cedar-policy-validator/src/types.rs:137:32)",
+"0x55d9d98ec43a: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d99637f7: core::result::Result<T,E>::map (core/src/result.rs:759:25)",
+"0x55d9d99909d5: cedar_policy_validator::schema::WithUnresolvedTypeDefs<T>::map::{{closure}} (cedar-policy-validator/src/schema.rs:173:57)",
+"0x55d9d98eb73f: core::ops::function::FnOnce::call_once{{vtable.shim}} (src/ops/function.rs:250:5)",
+"0x55d9d99283d0: <alloc::boxed::Box<F,A> as core::ops::function::FnOnce<Args>>::call_once (alloc/src/boxed.rs:1973:9)",
+"0x55d9d9f35f9e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9937b6f: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9937b6f: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9937b6f: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9937b6f: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d99490be: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9948767: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d99dbfde: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d98d898c: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::validate_slots (cedar-policy-validator/src/rbac.rs:140:34)",
+"0x55d9d9ca0612: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from::{{closure}} (src/est/expr.rs:581:31)",
+"0x55d9d9be0fd4: cedar_policy_core::ast::expr::ExprBuilder<T>::ite (src/ast/expr.rs:902:24)",
+"0x55d9d9c821b3: cedar_policy_core::parser::cst_to_ast::construct_expr_if (src/parser/cst_to_ast.rs:1959:5)",
+"0x55d9d9a67831: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Expr>>>::to_expr_or_special (src/parser/cst_to_ast.rs:854:50)",
+"0x55d9d9a67143: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Expr>>>::to_expr (src/parser/cst_to_ast.rs:838:9)",
+"0x55d9d9a70d42: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1645:38)",
+"0x55d9d9b1bf5e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9aa4185: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa4185: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa4185: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9aa4185: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9acddde: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acd127: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c2a4ae: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a7081d: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::MemAccess>>>::to_access (src/parser/cst_to_ast.rs:1574:41)",
+"0x55d9da1468c9: alloc::boxed::Box<T,A>::try_new_uninit_in (alloc/src/boxed.rs:483:19)",
+"0x55d9da1467ea: alloc::boxed::Box<T,A>::new_uninit_in (alloc/src/boxed.rs:448:15)",
+"0x55d9da146d7c: <alloc::boxed::Box<T,A> as core::clone::Clone>::clone (alloc/src/boxed.rs:1281:25)",
+"0x55d9d9f03d9f: <regex_syntax::hir::Properties as core::clone::Clone>::clone (src/hir/mod.rs:1886:23)",
+"0x55d9d9f797a1: regex_automata::meta::regex::RegexInfo::new (src/meta/regex.rs:1928:24)",
+"0x55d9d9f7b421: regex_automata::meta::regex::Builder::build_many_from_hir (src/meta/regex.rs:3552:20)",
+"0x55d9d9c84dca: cedar_policy_core::ast::policy::TemplateBody::condition (src/ast/policy.rs:900:13)",
+"0x55d9d9c83c2b: cedar_policy_core::ast::policy::Template::condition (src/ast/policy.rs:140:9)",
+"0x55d9d9914ade: cedar_policy_validator::typecheck::Typechecker::apply_typecheck_fn_by_request_env (cedar-policy-validator/src/typecheck.rs:344:33)",
+"0x55d9d9b6bcf3: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:299:23)",
+"0x55d9da14857e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9da0fd0d8: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9da0fd0d8: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9da0fd0d8: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9da185726: regex_syntax::hir::Hir::alternation (src/hir/mod.rs:560:23)",
+"0x55d9da16b355: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_post (src/hir/translate.rs:475:42)",
+"0x55d9d9ad11a6: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9ad11a6: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
+"0x55d9d9b6a387: cedar_policy_core::evaluator::RestrictedEvaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:120:62)",
+"0x55d9d9c5b292: cedar_policy_core::evaluator::RestrictedEvaluator::partial_interpret::{{closure}} (cedar-policy-core/src/evaluator.rs:116:50)",
+"0x55d9d9af51af: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
+"0x55d9d9b9fa08: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
+"0x55d9d9aee81f: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
+"0x55d9da1806d3: <regex_syntax::ast::ClassSet as core::ops::drop::Drop>::drop (src/ast/mod.rs:1625:25)",
+"0x55d9da1766b7: core::ptr::drop_in_place<regex_syntax::ast::ClassSet> (src/ptr/mod.rs:490:1)",
+"0x55d9da176e2f: core::ptr::drop_in_place<regex_syntax::ast::ClassBracketed> (src/ptr/mod.rs:490:1)",
+"0x55d9da176238: core::ptr::drop_in_place<regex_syntax::ast::Class> (src/ptr/mod.rs:490:1)",
+"0x55d9da1760da: core::ptr::drop_in_place<regex_syntax::ast::Ast> (src/ptr/mod.rs:490:1)",
+"0x55d9da1802de: <regex_syntax::ast::Ast as core::ops::drop::Drop>::drop (src/ast/mod.rs:1587:9)",
+"0x55d9d9ad0e66: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9ad0e66: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
+"0x55d9d9b1a37d: cedar_policy_core::ast::pattern::Pattern::new (src/ast/pattern.rs:69:20)",
+"0x55d9d9be3f7f: cedar_policy_core::ast::expr::ExprBuilder<T>::like (src/ast/expr.rs:1120:22)",
+"0x55d9d9be25f7: cedar_policy_core::ast::expr::ExprBuilder<T>::is_in (src/ast/expr.rs:1020:19)",
+"0x55d9d9c9aecf: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:561:40)",
+"0x55d9d991be59: cedar_policy_validator::typecheck::Typechecker::typecheck_binary::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1324:41)",
+"0x55d9d990fc85: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
+"0x55d9d991bbb8: cedar_policy_validator::typecheck::Typechecker::typecheck_binary::{{closure}} (cedar-policy-validator/src/typecheck.rs:1320:25)",
+"0x55d9d990e335: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d9bb56b5: <cedar_policy_core::extensions::decimal::names::LESS_THAN as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/decimal.rs:48:43)",
+"0x55d9d9bb56b5: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9bdbf41: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
+"0x55d9d9b68268: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
+"0x55d9d9d579dd: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
+"0x55d9d9a3fddd: cedar_policy_core::ast::expr::ExprBuilder<T>::binary_app (src/ast/expr.rs:1088:19)",
+"0x55d9d991afc1: cedar_policy_validator::typecheck::Typechecker::typecheck_binary::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1238:48)",
+"0x55d9d990dd58: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d991aac3: cedar_policy_validator::typecheck::Typechecker::typecheck_binary::{{closure}} (cedar-policy-validator/src/typecheck.rs:1228:21)",
+"0x55d9d990d8e5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
+"0x55d9d9cf4ffc: cedar_policy_core::est::expr::Expr::contains (src/est/expr.rs:386:20)",
+"0x55d9d9cfec2c: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Member>>::try_from (src/est/expr.rs:1227:61)",
+"0x55d9d9d3c22e: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
+"0x55d9d9cfb47f: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Unary>>::try_from (src/est/expr.rs:988:24)",
+"0x55d9d9d3c35e: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
+"0x55d9d999da0e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d993c88e: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d993c88e: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d993c88e: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d993c88e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9948e9e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9948ae7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d99e3a02: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d99e3a02: <core::option::Option<V> as core::iter::traits::collect::FromIterator<core::option::Option<A>>>::from_iter::{{closure}} (core/src/option.rs:2505:51)",
+"0x55d9d98e6ffe: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d999c57e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d99457d7: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d99457d7: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d99457d7: <T as alloc::vec::spec_from_elem::SpecFromElem>::from_elem (src/vec/spec_from_elem.rs:15:21)",
+"0x55d9d9945747: alloc::vec::from_elem (src/vec/mod.rs:2550:5)",
+"0x55d9d9a44f59: cedar_policy_validator::fuzzy_match::levenshtein_distance (cedar-policy-validator/src/fuzzy_match.rs:38:22)",
+"0x55d9d9933ebc: cedar_policy_validator::fuzzy_match::fuzzy_search::{{closure}} (cedar-policy-validator/src/fuzzy_match.rs:23:21)",
+"0x55d9d9906c11: core::iter::traits::iterator::Iterator::fold (iter/traits/iterator.rs:2482:21)",
+"0x55d9d9be1c97: cedar_policy_core::ast::expr::ExprBuilder<T>::less (src/ast/expr.rs:956:19)",
+"0x55d9d9c94720: cedar_policy_core::ast::expr::Expr::less (src/ast/expr.rs:357:9)",
+"0x55d9d9c9ecc7: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:493:68)",
+"0x55d9d9baba95: cedar_policy_core::extensions::ipaddr::as_ipaddr (src/extensions/ipaddr.rs:214:13)",
+"0x55d9d9bac023: cedar_policy_core::extensions::ipaddr::is_ipv4 (src/extensions/ipaddr.rs:225:18)",
+"0x55d9d9bb19f4: core::ops::function::Fn::call (src/ops/function.rs:79:5)",
+"0x55d9d9d069bc: <alloc::boxed::Box<F,A> as core::ops::function::Fn<Args>>::call (alloc/src/boxed.rs:1987:9)",
+"0x55d9d9cab2f3: cedar_policy_core::ast::extension::ExtensionFunction::unary::{{closure}} (src/ast/extension.rs:208:27)",
+"0x55d9d9d06975: <alloc::boxed::Box<F,A> as core::ops::function::Fn<Args>>::call (alloc/src/boxed.rs:1987:9)",
+"0x55d9d985240a: cedar_policy_core::entities::json::entities::EntityJsonParser<S>::parse_ejson::{{closure}} (entities/json/entities.rs:257:29)",
+"0x55d9d9eab7d3: alloc::alloc::exchange_malloc (alloc/src/alloc.rs:324:18)",
+"0x55d9d9ea84c4: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9ea84c4: serde_json::error::make_error (serde_json-1.0.107/src/error.rs:461:14)",
+"0x55d9d9ea8241: <serde_json::error::Error as serde::de::Error>::custom (serde_json-1.0.107/src/error.rs:436:9)",
+"0x55d9d9ea833c: <serde_json::error::Error as serde::de::Error>::invalid_type (serde_json-1.0.107/src/error.rs:444:13)",
+"0x55d9d9a7353a: serde::de::Visitor::visit_bool (src/de/mod.rs:1313:13)",
+"0x55d9d9cb72b5: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:1726:37)",
+"0x55d9d9a7ac3d: cedar_policy_core::entities::json::jsonvalue::_::<impl serde::de::Deserialize for cedar_policy_core::entities::json::jsonvalue::JSONValue>::deserialize (entities/json/jsonvalue.rs:38:39)",
+"0x55d9d9c9ff02: cedar_policy_core::est::<impl core::convert::TryFrom<cedar_policy_core::est::Clause> for cedar_policy_core::ast::expr::Expr>::try_from (cedar-policy-core/src/est.rs:246:35)",
+"0x55d9d9c1532b: cedar_policy_core::ast::extension::ExtensionFunction::binary (src/ast/extension.rs:242:13)",
+"0x55d9d9b0df85: cedar_policy_core::extensions::decimal::extension (src/extensions/decimal.rs:274:13)",
+"0x55d9d9bb520b: <cedar_policy_core::extensions::ALL_AVAILABLE_EXTENSIONS as core::ops::deref::Deref>::deref::__static_ref_initialize (cedar-policy-core/src/extensions.rs:35:9)",
+"0x55d9d9bb520b: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9b0f6f5: cedar_policy_core::evaluator::<impl cedar_policy_core::ast::value::Value>::get_as_string (cedar-policy-core/src/evaluator.rs:783:17)",
+"0x55d9d9b6cb04: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:537:52)",
+"0x55d9d9b50524: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d9b50524: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d9b50524: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d9b654a8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9b56914: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d9b56914: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d9b56914: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d9b651e8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9b6c735: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:560:42)",
+"0x55d9d9c6be66: cedar_policy_core::authorizer::Authorizer::evaluate_policies (cedar-policy-core/src/authorizer.rs:294:19)",
+"0x55d9d9ea954c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9ea6e2d: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9ea6e2d: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9ea6e2d: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:162:25)",
+"0x55d9d9eb566b: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
+"0x55d9d9eb566b: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
+"0x55d9d9eb566b: alloc::slice::<impl [T]>::to_vec (alloc/src/slice.rs:416:14)",
+"0x55d9d9eb566b: alloc::slice::<impl alloc::borrow::ToOwned for [T]>::to_owned (alloc/src/slice.rs:823:14)",
+"0x55d9d9ebb002: alloc::str::<impl alloc::borrow::ToOwned for str>::to_owned (alloc/src/str.rs:209:46)",
+"0x55d9d9ebb002: <alloc::string::String as core::convert::From<&str>>::from (alloc/src/string.rs:2650:11)",
+"0x55d9d9ebc114: <serde_json::value::ser::Serializer as serde::ser::Serializer>::serialize_struct_variant (src/value/ser.rs:287:19)",
+"0x55d9d98685ff: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9c14d2b: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9c14d2b: cedar_policy_core::ast::extension::ExtensionFunction::unary (src/ast/extension.rs:207:13)",
+"0x55d9d9bacb99: cedar_policy_core::extensions::ipaddr::extension (src/extensions/ipaddr.rs:267:13)",
+"0x55d9d998286c: cedar_policy_validator::extensions::ipaddr::extension_schema (src/extensions/ipaddr.rs:56:22)",
+"0x55d9d9a5b65e: cedar_policy_validator::extensions::all_available_extension_schemas (cedar-policy-validator/src/extensions.rs:33:9)",
+"0x55d9d9a27b39: cedar_policy_validator::typecheck::Typechecker::new (cedar-policy-validator/src/typecheck.rs:252:26)",
+"0x55d9d98d95a0: cedar_policy_validator::Validator::typecheck_policy (cedar-policy-validator/src/lib.rs:118:25)",
+"0x55d9d9a40765: cedar_policy_core::ast::expr::ExprBuilder<T>::and (src/ast/expr.rs:932:24)",
+"0x55d9d9916fd8: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:777:41)",
+"0x55d9d9912858: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d990f3c5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
+"0x55d9d9b1f72e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9939659: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9939659: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9939659: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9939659: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9948ede: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9948597: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d99e3a62: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d99e3a62: <core::option::Option<V> as core::iter::traits::collect::FromIterator<core::option::Option<A>>>::from_iter::{{closure}} (core/src/option.rs:2505:51)",
+"0x55d9d98e8c42: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d9b715ae: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:289:62)",
+"0x55d9d9c6a7bf: cedar_policy_core::authorizer::Authorizer::is_authorized_core (cedar-policy-core/src/authorizer.rs:179:23)",
+"0x55d9d9be18cc: cedar_policy_core::ast::expr::ExprBuilder<T>::or (src/ast/expr.rs:945:23)",
+"0x55d9d9c94590: cedar_policy_core::ast::expr::Expr::or (src/ast/expr.rs:352:9)",
+"0x55d9d9c9d68b: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:513:66)",
+"0x55d9d9c9c0b8: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:526:39)",
+"0x55d9d9b6e408: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:349:21)",
+"0x55d9d9c84e52: cedar_policy_core::ast::policy::TemplateBody::condition (src/ast/policy.rs:899:9)",
+"0x55d9d9c84628: cedar_policy_core::ast::policy::Policy::condition (src/ast/policy.rs:415:9)",
+"0x55d9d9ad168e: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9ad168e: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
+"0x55d9d9c5ad07: cedar_policy_core::ast::request::EntityUIDEntry::concrete (src/ast/request.rs:67:24)",
+"0x55d9d9c5adf4: cedar_policy_core::ast::request::Request::new (src/ast/request.rs:89:21)",
+"0x55d9d98c647f: cedar_policy::api::Request::new (cedar-policy/src/api.rs:2712:14)",
+"0x55d9d9759f84: cedar_policy::integration_testing::perform_integration_test_from_json_custom (cedar-policy/src/integration_testing.rs:300:23)",
+"0x55d9d9758b7c: cedar_policy::integration_testing::perform_integration_test_from_json (cedar-policy/src/integration_testing.rs:349:5)",
+"0x55d9d991b612: cedar_policy_validator::typecheck::Typechecker::typecheck_binary::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1277:29)",
+"0x55d9d990f218: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d991b419: cedar_policy_validator::typecheck::Typechecker::typecheck_binary::{{closure}} (cedar-policy-validator/src/typecheck.rs:1275:21)",
+"0x55d9d99105a5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
+"0x55d9d9a41ec4: cedar_policy_core::ast::expr::ExprBuilder<T>::has_attr (src/ast/expr.rs:1109:19)",
+"0x55d9d9919671: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:1056:33)",
+"0x55d9d990f839: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d9a290b8: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:999:17)",
+"0x55d9d9a2c76c: cedar_policy_validator::typecheck::Typechecker::expect_one_of_types (cedar-policy-validator/src/typecheck.rs:2004:22)",
+"0x55d9d9c149fe: cedar_policy_core::ast::extension::ExtensionFunction::unary_never (src/ast/extension.rs:192:13)",
+"0x55d9d9b69451: cedar_policy_core::extensions::partial_evaluation::extension (src/extensions/partial_evaluation.rs:46:13)",
+"0x55d9d9c9b356: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:554:17)",
+"0x55d9d9f356ce: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9f24264: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9f24264: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9f24264: <T as alloc::vec::spec_from_elem::SpecFromElem>::from_elem (src/vec/spec_from_elem.rs:15:21)",
+"0x55d9d9ee5b47: alloc::vec::from_elem (src/vec/mod.rs:2550:5)",
+"0x55d9d9f3057c: regex_automata::nfa::thompson::map::Utf8SuffixMap::clear (nfa/thompson/map.rs:244:24)",
+"0x55d9d9ef3616: regex_automata::nfa::thompson::compiler::Compiler::c_unicode_class_reverse_with_suffix (nfa/thompson/compiler.rs:1516:9)",
+"0x55d9d9ef2a26: regex_automata::nfa::thompson::compiler::Compiler::c_unicode_class (nfa/thompson/compiler.rs:1398:17)",
+"0x55d9d9b0c225: cedar_policy_core::extensions::decimal::as_decimal (src/extensions/decimal.rs:205:13)",
+"0x55d9d9b0ca58: cedar_policy_core::extensions::decimal::decimal_le (src/extensions/decimal.rs:224:16)",
+"0x55d9d9bb1718: core::ops::function::Fn::call (src/ops/function.rs:79:5)",
+"0x55d9d9d06a63: <alloc::boxed::Box<F,A> as core::ops::function::Fn<Args>>::call (alloc/src/boxed.rs:1987:9)",
+"0x55d9d9cab4c9: cedar_policy_core::ast::extension::ExtensionFunction::binary::{{closure}} (src/ast/extension.rs:234:37)",
+"0x55d9d9f34b0c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9f1dd09: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9f1dd09: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9f1dd09: <T as alloc::vec::spec_from_elem::SpecFromElem>::from_elem (src/vec/spec_from_elem.rs:15:21)",
+"0x55d9d9ee5aeb: alloc::vec::from_elem (src/vec/mod.rs:2550:5)",
+"0x55d9d9fbde5b: regex_automata::util::captures::Captures::all (src/util/captures.rs:217:50)",
+"0x55d9d9f8c483: <regex_automata::meta::strategy::Core as regex_automata::meta::strategy::Strategy>::create_cache (src/meta/strategy.rs:669:25)",
+"0x55d9d9f7b901: regex_automata::meta::regex::Builder::build_many_from_hir::{{closure}} (src/meta/regex.rs:3556:56)",
+"0x55d9d9b559b4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d9b559b4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d9b559b4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d9b65a28: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9be11ae: cedar_policy_core::ast::expr::ExprBuilder<T>::not (src/ast/expr.rs:911:18)",
+"0x55d9d9c93f6a: cedar_policy_core::ast::expr::Expr::not (src/ast/expr.rs:332:9)",
+"0x55d9d9c9fe0f: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:476:20)",
+"0x55d9d9c9b9af: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:551:17)",
+"0x55d9d9990392: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9990392: cedar_policy_validator::schema::WithUnresolvedTypeDefs<T>::new (cedar-policy-validator/src/schema.rs:167:30)",
+"0x55d9d9992fcb: cedar_policy_validator::schema::ValidatorNamespaceDef::parse_record_attributes (cedar-policy-validator/src/schema.rs:552:12)",
+"0x55d9d99314f6: cedar_policy_validator::schema::ValidatorNamespaceDef::try_schema_type_into_validator_type (cedar-policy-validator/src/schema.rs:691:25)",
+"0x55d9d9992411: cedar_policy_validator::schema::ValidatorNamespaceDef::build_action_ids::{{closure}} (cedar-policy-validator/src/schema.rs:461:35)",
+"0x55d9d99de4f7: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
+"0x55d9d995b3eb: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
+"0x55d9d9be2b67: cedar_policy_core::ast::expr::ExprBuilder<T>::contains_any (src/ast/expr.rs:1048:19)",
+"0x55d9d9c95740: cedar_policy_core::ast::expr::Expr::contains_any (src/ast/expr.rs:415:9)",
+"0x55d9d9c9b5fd: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:553:75)",
+"0x55d9d999dfee: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d99399c8: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d99399c8: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d99399c8: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d99399c8: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9948f1e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d99486e7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d99dc0de: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a5d43e: cedar_policy_validator::extensions::partial_evaluation::extension_schema (src/extensions/partial_evaluation.rs:44:47)",
+"0x55d9da18a62e: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9da18a62e: regex_syntax::hir::Properties::literal (src/hir/mod.rs:2370:20)",
+"0x55d9da183d0b: regex_syntax::hir::Hir::literal (src/hir/mod.rs:333:21)",
+"0x55d9da169cdf: regex_syntax::hir::translate::HirFrame::unwrap_expr (src/hir/translate.rs:256:39)",
+"0x55d9da16af0f: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_post (src/hir/translate.rs:453:28)",
+"0x55d9d9ea8d8b: alloc::raw_vec::finish_grow (alloc/src/raw_vec.rs:475:9)",
+"0x55d9d9eaa3c1: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9eab568: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
+"0x55d9d9ecaab0: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
+"0x55d9d9ecaab0: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
+"0x55d9d9eca39d: alloc::vec::Vec<T,A>::append_elements (src/vec/mod.rs:1940:9)",
+"0x55d9d9eca1ab: <alloc::vec::Vec<T,A> as alloc::vec::spec_extend::SpecExtend<&T,core::slice::iter::Iter<T>>>::spec_extend (src/vec/spec_extend.rs:55:18)",
+"0x55d9d99c0ee4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d99c0ee4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d99c0ee4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d99d4ee8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9a755d7: serde::de::Visitor::visit_u64 (src/de/mod.rs:1421:13)",
+"0x55d9d9cb6528: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:1730:36)",
+"0x55d9d9a7a51e: cedar_policy_core::entities::json::jsonvalue::_::<impl serde::de::Deserialize for cedar_policy_core::entities::json::jsonvalue::JSONValue>::deserialize (entities/json/jsonvalue.rs:38:39)",
+"0x55d9d9bb4235: <cedar_policy_core::extensions::decimal::names::GREATER_THAN_OR_EQUAL as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/decimal.rs:51:55)",
+"0x55d9d9bb4235: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9bdc001: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
+"0x55d9d9b68808: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
+"0x55d9d9d5a52d: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
+"0x55d9d9905078: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9905078: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_entities_satisfying_constraint (cedar-policy-validator/src/rbac.rs:416:17)",
+"0x55d9d9ad0d06: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9ad0d06: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
+"0x55d9d9b0ae56: <cedar_policy_core::ast::value::Set as core::iter::traits::collect::FromIterator<cedar_policy_core::ast::value::Value>>::from_iter (src/ast/value.rs:214:32)",
+"0x55d9d9b933ca: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9b6a569: cedar_policy_core::evaluator::RestrictedEvaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:108:59)",
+"0x55d9d9dc5dc9: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
+"0x55d9d9dc463c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9a595fd: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a595fd: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a595fd: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:162:25)",
+"0x55d9d9945c78: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
+"0x55d9d9945c78: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
+"0x55d9d9945c78: <alloc::vec::Vec<T,A> as core::clone::Clone>::clone (src/vec/mod.rs:2643:9)",
+"0x55d9d9946377: <alloc::vec::ExtendElement<T> as alloc::vec::ExtendWith<T>>::next (src/vec/mod.rs:2481:9)",
+"0x55d9d993ea6a: alloc::vec::Vec<T,A>::extend_with (src/vec/mod.rs:2503:33)",
+"0x55d9d9945868: <T as alloc::vec::spec_from_elem::SpecFromElem>::from_elem (src/vec/spec_from_elem.rs:16:9)",
+"0x55d9d9c14e7b: cedar_policy_core::ast::extension::ExtensionFunction::unary (src/ast/extension.rs:216:13)",
+"0x55d9d9f38f33: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9f43639: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9ee384d: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9ef6031: regex_automata::nfa::thompson::compiler::Utf8Node::set_last_transition (nfa/thompson/compiler.rs:1860:13)",
+"0x55d9d9ef5f9c: regex_automata::nfa::thompson::compiler::Utf8Compiler::top_last_freeze (nfa/thompson/compiler.rs:1853:9)",
+"0x55d9da147cac: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9da13cacd: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9da13cacd: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9da13cacd: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:162:25)",
+"0x55d9da179e5b: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
+"0x55d9da179e5b: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
+"0x55d9da179e5b: alloc::slice::<impl [T]>::to_vec (alloc/src/slice.rs:416:14)",
+"0x55d9da179e5b: alloc::slice::<impl alloc::borrow::ToOwned for [T]>::to_owned (alloc/src/slice.rs:823:14)",
+"0x55d9d98c8092: alloc::str::<impl alloc::borrow::ToOwned for str>::to_owned (alloc/src/str.rs:209:46)",
+"0x55d9d98c8092: <alloc::string::String as core::convert::From<&str>>::from (alloc/src/string.rs:2650:11)",
+"0x55d9d98cc12e: <serde_json::value::ser::SerializeStructVariant as serde::ser::SerializeStructVariant>::serialize_field (src/value/ser.rs:694:25)",
+"0x55d9d98669a5: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9b0fa75: cedar_policy_core::evaluator::<impl cedar_policy_core::ast::value::Value>::get_as_entity (cedar-policy-core/src/evaluator.rs:803:17)",
+"0x55d9d9b6eb42: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:398:36)",
+"0x55d9d9f3ab53: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9f43a59: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9ee224a: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9ef714f: regex_automata::nfa::thompson::nfa::Inner::add (nfa/thompson/nfa.rs:1382:9)",
+"0x55d9d9f65f71: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:471:34)",
+"0x55d9d99a5313: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d99a7359: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d994455d: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d99138f6: cedar_policy_validator::typecheck::TypecheckAnswer::sequence_all_then_typecheck (cedar-policy-validator/src/typecheck.rs:202:13)",
+"0x55d9d9a28e9d: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:1160:17)",
+"0x55d9da1b5dde: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
+"0x55d9da1b5dde: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
+"0x55d9da1b5dde: alloc::vec::Vec<T,A>::append_elements (src/vec/mod.rs:1940:9)",
+"0x55d9da1b5dde: <alloc::vec::Vec<T,A> as alloc::vec::spec_extend::SpecExtend<&T,core::slice::iter::Iter<T>>>::spec_extend (src/vec/spec_extend.rs:55:18)",
+"0x55d9da1b5dde: alloc::vec::Vec<T,A>::extend_from_slice (src/vec/mod.rs:2386:9)",
+"0x55d9da1b5dde: std::sys::unix::os_str::Buf::push_slice (sys/unix/os_str.rs:168:9)",
+"0x55d9da1b5dde: std::ffi::os_str::OsString::push (src/ffi/os_str.rs:195:9)",
+"0x55d9da1b5dde: std::path::PathBuf::_push (std/src/path.rs:1346:9)",
+"0x55d9d9757de9: std::path::PathBuf::push (std/src/path.rs:1275:9)",
+"0x55d9d9758730: cedar_policy::integration_testing::resolve_integration_test_path (cedar-policy/src/integration_testing.rs:112:9)",
+"0x55d9d9758dfb: cedar_policy::integration_testing::perform_integration_test_from_json_custom (cedar-policy/src/integration_testing.rs:189:23)",
+"0x55d9d9757622: corpus_tests::corpus_tests (cedar-policy/tests/corpus_tests.rs:83:9)",
+"0x55d9d9c858f1: cedar_policy_core::ast::policy::PrincipalOrResourceConstraint::as_expr (src/ast/policy.rs:1257:17)",
+"0x55d9d9c854c4: cedar_policy_core::ast::policy::ResourceConstraint::as_expr (src/ast/policy.rs:1066:9)",
+"0x55d9d9c84c5e: cedar_policy_core::ast::policy::TemplateBody::resource_constraint_expr (src/ast/policy.rs:882:9)",
+"0x55d9d9933017: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9933017: <cedar_policy_validator::schema::PrincipalOrResourceHeadVar as cedar_policy_validator::schema::HeadVar<cedar_policy_core::ast::name::Name>>::get_known_vars (cedar-policy-validator/src/schema.rs:1593:9)",
+"0x55d9d990568f: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_entities_satisfying_constraint (cedar-policy-validator/src/rbac.rs:390:26)",
+"0x55d9d98d90be: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_resources_satisfying_constraint (cedar-policy-validator/src/rbac.rs:367:9)",
+"0x55d9d98d8ce4: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::validate_action_application (cedar-policy-validator/src/rbac.rs:278:13)",
+"0x55d9d9905d1b: cedar_policy_validator::Validator::validate::{{closure}} (cedar-policy-validator/src/lib.rs:88:27)",
+"0x55d9da14c083: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9da152e19: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9da101151: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9da113ca9: regex_syntax::ast::visitor::HeapVisitor::visit_class (src/ast/visitor.rs:322:17)",
+"0x55d9da1131d2: regex_syntax::ast::visitor::HeapVisitor::induct (src/ast/visitor.rs:268:17)",
+"0x55d9d9ebb361: <serde_json::value::de::<impl serde::de::Deserialize for serde_json::value::Value>::deserialize::ValueVisitor as serde::de::Visitor>::visit_str (src/value/de.rs:63:35)",
+"0x55d9d9ebadcc: serde::de::Visitor::visit_borrowed_str (src/de/mod.rs:1508:9)",
+"0x55d9da1bac0d: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
+"0x55d9da1bac0d: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9da1bac0d: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9da1bac0d: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9da1bac0d: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:162:25)",
+"0x55d9da1bac0d: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
+"0x55d9da1bac0d: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
+"0x55d9da1bac0d: alloc::slice::<impl [T]>::to_vec (alloc/src/slice.rs:416:14)",
+"0x55d9da1bac0d: std::sys::unix::os_str::Slice::to_owned (sys/unix/os_str.rs:213:33)",
+"0x55d9da1bac0d: std::ffi::os_str::OsStr::to_os_string (src/ffi/os_str.rs:775:27)",
+"0x55d9da1bac0d: std::path::Path::to_path_buf (std/src/path.rs:2151:34)",
+"0x55d9da1bac0d: std::sys::unix::fs::readdir (sys/unix/fs.rs:1427:20)",
+"0x55d9d97829c0: std::fs::read_dir (std/src/fs.rs:2373:5)",
+"0x55d9d975738b: corpus_tests::corpus_tests (cedar-policy/tests/corpus_tests.rs:51:22)",
+"0x55d9d9be1bf5: cedar_policy_core::ast::expr::ExprBuilder<T>::less (src/ast/expr.rs:955:19)",
+"0x55d9d9c823e4: cedar_policy_core::parser::cst_to_ast::construct_expr_rel (src/parser/cst_to_ast.rs:1990:29)",
+"0x55d9d9c90a56: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Relation>>>::to_expr_or_special::{{closure}} (src/parser/cst_to_ast.rs:1064:54)",
+"0x55d9d9c1e00d: core::option::Option<T>::map (core/src/option.rs:1099:29)",
+"0x55d9d9a6a162: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Relation>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1062:52)",
+"0x55d9d9ccde0c: cedar_policy_core::parser::text_to_cst::grammar::__action163 (src/parser/grammar.rs:59932:5)",
+"0x55d9d9cd35f2: cedar_policy_core::parser::text_to_cst::grammar::__action215 (src/parser/grammar.rs:61359:5)",
+"0x55d9d9d17c9b: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce24 (src/parser/grammar.rs:28448:20)",
+"0x55d9d9d0df8b: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26691:17)",
+"0x55d9d9d0a5f3: <cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__StateMachine as lalrpop_util::state_machine::ParserDefinition>::reduce (src/parser/grammar.rs:25119:13)",
+"0x55d9d9d5059c: lalrpop_util::state_machine::Parser<D,I>::reduce (lalrpop-util-0.20.0/src/state_machine.rs:594:9)",
+"0x55d9da1d69ee: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
+"0x55d9da1d69ee: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9da1d69ee: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9da1d69ee: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9da1d69ee: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:162:25)",
+"0x55d9da1d69ee: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
+"0x55d9da1d69ee: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
+"0x55d9da1d69ee: <alloc::vec::Vec<T,A> as core::clone::Clone>::clone (src/vec/mod.rs:2643:9)",
+"0x55d9da1d69ee: <alloc::string::String as core::clone::Clone>::clone (alloc/src/string.rs:1992:23)",
+"0x55d9d9d53e42: <serde::__private::de::content::Content as core::clone::Clone>::clone (src/private/de.rs:240:16)",
+"0x55d9d9bc8180: core::clone::Clone::clone (core/src/clone.rs:123:5)",
+"0x55d9d99bf7d4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d99bf7d4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d99bf7d4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d99d5d58: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9f41bd3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9f439f9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9ee33aa: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9faf86b: regex_automata::nfa::thompson::range_trie::RangeTrie::add_empty (nfa/thompson/range_trie.rs:445:13)",
+"0x55d9d9fae146: regex_automata::nfa::thompson::range_trie::RangeTrie::clear (nfa/thompson/range_trie.rs:239:9)",
+"0x55d9d99abd6e: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d99abd6e: cedar_policy_validator::types::<impl core::convert::TryFrom<cedar_policy_validator::types::Type> for cedar_policy_core::entities::json::schema_types::SchemaType>::try_from (cedar-policy-validator/src/types.rs:649:29)",
+"0x55d9d99abc89: cedar_policy_validator::types::<impl core::convert::TryFrom<cedar_policy_validator::types::Type> for cedar_policy_core::entities::json::schema_types::SchemaType>::try_from (cedar-policy-validator/src/types.rs:649:38)",
+"0x55d9d999947e: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
+"0x55d9d9932a9f: <cedar_policy_validator::schema::EntityTypeDescription as cedar_policy_core::entities::json::schema::EntityTypeDescription>::attr_type (cedar-policy-validator/src/schema.rs:1352:73)",
+"0x55d9d98522c7: cedar_policy_core::entities::json::entities::EntityJsonParser<S>::parse_ejson::{{closure}} (entities/json/entities.rs:247:54)",
+"0x55d9d983112f: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
+"0x55d9d9be2997: cedar_policy_core::ast::expr::ExprBuilder<T>::contains_all (src/ast/expr.rs:1039:19)",
+"0x55d9d9c8336d: cedar_policy_core::parser::cst_to_ast::construct_method_contains_all (src/parser/cst_to_ast.rs:2049:5)",
+"0x55d9d9cbece3: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::ast::name::Id>::to_meth (src/parser/cst_to_ast.rs:430:22)",
+"0x55d9d9a6e052: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1443:28)",
+"0x55d9d9c90ea0: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Unary>>>::to_expr_or_special::{{closure}} (src/parser/cst_to_ast.rs:1252:33)",
+"0x55d9d9b6c065: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:513:55)",
+"0x55d9d9a7343a: serde::de::Visitor::visit_bool (src/de/mod.rs:1313:13)",
+"0x55d9d9cb6475: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:1726:37)",
+"0x55d9d9cb85a1: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::__deserialize_content (src/private/de.rs:2063:16)",
+"0x55d9d9cbd366: <serde::__private::de::content::Content as serde::de::Deserialize>::deserialize (src/private/de.rs:301:13)",
+"0x55d9d9f359be: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9eddfb8: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9eddfb8: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9eddfb8: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9ef2586: regex_automata::nfa::thompson::compiler::Compiler::c_unicode_class (nfa/thompson/compiler.rs:1380:29)",
+"0x55d9d9eedd0d: regex_automata::nfa::thompson::compiler::Compiler::c (nfa/thompson/compiler.rs:1002:45)",
+"0x55d9d9ef1537: regex_automata::nfa::thompson::compiler::Compiler::c_at_least (nfa/thompson/compiler.rs:1243:32)",
+"0x55d9d9ef06b1: regex_automata::nfa::thompson::compiler::Compiler::c_repetition (nfa/thompson/compiler.rs:1148:28)",
+"0x55d9d9828d84: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d9828d84: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d9828d84: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d982cbf8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9ccb425: cedar_policy_core::parser::text_to_cst::grammar::__action96 (src/parser/grammar.rs:58948:5)",
+"0x55d9d9cd3001: cedar_policy_core::parser::text_to_cst::grammar::__action211 (src/parser/grammar.rs:61243:5)",
+"0x55d9d9d170cf: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce19 (src/parser/grammar.rs:28341:20)",
+"0x55d9d9d0de8c: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26676:17)",
+"0x55d9d9b6dfd2: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:484:30)",
+"0x55d9d9f3b001: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9f43819: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9ee2a42: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9ef6776: regex_automata::nfa::thompson::nfa::Inner::into_nfa (nfa/thompson/nfa.rs:1280:13)",
+"0x55d9d9f67350: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:592:25)",
+"0x55d9d9be2385: cedar_policy_core::ast::expr::ExprBuilder<T>::mul (src/ast/expr.rs:1000:18)",
+"0x55d9d9c93776: cedar_policy_core::parser::cst_to_ast::construct_expr_mul (src/parser/cst_to_ast.rs:2023:16)",
+"0x55d9d9a6b97a: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Mult>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1218:42)",
+"0x55d9d9a6a52b: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Add>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1115:27)",
+"0x55d9d9a69090: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Relation>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1045:35)",
+"0x55d9d9be1ff5: cedar_policy_core::ast::expr::ExprBuilder<T>::add (src/ast/expr.rs:983:19)",
+"0x55d9d9eaf262: alloc::str::<impl alloc::borrow::ToOwned for str>::to_owned (alloc/src/str.rs:209:46)",
+"0x55d9d9ec9601: <serde::de::impls::StringVisitor as serde::de::Visitor>::visit_str (src/de/impls.rs:486:12)",
+"0x55d9d98583e5: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_str (serde_json-1.0.107/src/de.rs:1532:45)",
+"0x55d9d9a4183f: cedar_policy_core::ast::expr::ExprBuilder<T>::is_in (src/ast/expr.rs:1019:19)",
+"0x55d9d991dd4f: cedar_policy_validator::typecheck::Typechecker::typecheck_in::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1639:29)",
+"0x55d9d99123e5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
+"0x55d9d991cd38: cedar_policy_validator::typecheck::Typechecker::typecheck_in::{{closure}} (cedar-policy-validator/src/typecheck.rs:1546:13)",
+"0x55d9d990eda5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
+"0x55d9d9be1a02: cedar_policy_core::ast::expr::ExprBuilder<T>::or (src/ast/expr.rs:946:24)",
+"0x55d9da179dfb: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
+"0x55d9da179dfb: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
+"0x55d9da179dfb: alloc::slice::<impl [T]>::to_vec (alloc/src/slice.rs:416:14)",
+"0x55d9da16f673: regex_syntax::hir::translate::TranslatorI::push_char (src/hir/translate.rs:720:42)",
+"0x55d9da16c64d: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_post (src/hir/translate.rs:398:37)",
+"0x55d9da111acb: regex_syntax::ast::visitor::HeapVisitor::visit (src/ast/visitor.rs:224:13)",
+"0x55d9d9c83f04: <cedar_policy_core::ast::policy::Template as core::convert::From<cedar_policy_core::ast::policy::TemplateBody>>::from (src/ast/policy.rs:233:21)",
+"0x55d9d9c83b40: cedar_policy_core::ast::policy::Template::new (src/ast/policy.rs:83:9)",
+"0x55d9d9be2ac5: cedar_policy_core::ast::expr::ExprBuilder<T>::contains_any (src/ast/expr.rs:1047:19)",
+"0x55d9d9c8353d: cedar_policy_core::parser::cst_to_ast::construct_method_contains_any (src/parser/cst_to_ast.rs:2054:5)",
+"0x55d9d9cbeeb0: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::ast::name::Id>::to_meth (src/parser/cst_to_ast.rs:434:22)",
+"0x55d9d9b6f26e: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:429:62)",
+"0x55d9d99a5c73: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d99a7b28: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
+"0x55d9d9944c40: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
+"0x55d9d9944c40: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
+"0x55d9d99481f4: <alloc::vec::Vec<T,A> as core::iter::traits::collect::Extend<T>>::extend_reserve (src/vec/mod.rs:2796:9)",
+"0x55d9d99370fc: <(ExtendA,ExtendB) as core::iter::traits::collect::Extend<(A,B)>>::extend (iter/traits/collect.rs:436:13)",
+"0x55d9d9b58024: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d9b58024: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d9b58024: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d9b65298: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9b38053: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9b3d039: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9ab9a1a: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9b0aa1b: cedar_policy_core::ast::value::split (src/ast/value.rs:151:21)",
+"0x55d9d9b6c43a: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:558:23)",
+"0x55d9d9b73911: cedar_policy_core::evaluator::Evaluator::get_attr (cedar-policy-core/src/evaluator.rs:708:21)",
+"0x55d9d9b6c00e: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:512:49)",
+"0x55d9d9bb51d2: <cedar_policy_core::extensions::ALL_AVAILABLE_EXTENSIONS as core::ops::deref::Deref>::deref::__static_ref_initialize (cedar-policy-core/src/extensions.rs:33:9)",
+"0x55d9d9bb51d2: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9edc06d: regex::builders::Builder::build_many_string (regex-1.9.5/src/builders.rs:113:9)",
+"0x55d9d9ed7286: regex::builders::string::RegexSetBuilder::build (regex-1.9.5/src/builders.rs:811:13)",
+"0x55d9d9d55da6: regex::regexset::string::RegexSet::new (src/regexset/string.rs:159:9)",
+"0x55d9d9bd5711: lalrpop_util::lexer::MatcherBuilder::new (lalrpop-util-0.20.0/src/lexer.rs:33:32)",
+"0x55d9d9a7aba6: cedar_policy_core::entities::json::jsonvalue::_::<impl serde::de::Deserialize for cedar_policy_core::entities::json::jsonvalue::JSONValue>::deserialize (entities/json/jsonvalue.rs:38:39)",
+"0x55d9d990f0b5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
+"0x55d9d9910725: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d9bb3b75: <cedar_policy_core::extensions::ipaddr::names::IS_LOOPBACK as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/ipaddr.rs:37:45)",
+"0x55d9d9bb3b75: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9bdbd61: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
+"0x55d9d9b68928: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
+"0x55d9d9d575ed: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
+"0x55d9d991d1fc: cedar_policy_validator::typecheck::Typechecker::typecheck_in::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1560:25)",
+"0x55d9d990ef08: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d996f5be: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d996f5be: cedar_policy_validator::schema_file_format::SchemaTypeVisitor::build_schema_type (cedar-policy-validator/src/schema_file_format.rs:398:34)",
+"0x55d9d996b84e: <cedar_policy_validator::schema_file_format::SchemaTypeVisitor as serde::de::Visitor>::visit_map (cedar-policy-validator/src/schema_file_format.rs:330:9)",
+"0x55d9d9a46e40: <serde::__private::de::FlatMapDeserializer<E> as serde::de::Deserializer>::deserialize_map (src/private/de.rs:2658:9)",
+"0x55d9d9a46d86: <serde::__private::de::FlatMapDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:2630:9)",
+"0x55d9d996aa07: <cedar_policy_validator::schema_file_format::SchemaType as serde::de::Deserialize>::deserialize (cedar-policy-validator/src/schema_file_format.rs:206:9)",
+"0x55d9d99798f4: <cedar_policy_validator::schema_file_format::_::<impl serde::de::Deserialize for cedar_policy_validator::schema_file_format::TypeOfAttribute>::deserialize::__Visitor as serde::de::Visitor>::visit_map (cedar-policy-validator/src/schema_file_format.rs:588:46)",
+"0x55d9d9999c2b: cedar_policy_validator::types::<impl core::convert::TryFrom<cedar_policy_validator::types::Type> for cedar_policy_core::entities::json::schema_types::SchemaType>::try_from::{{closure}} (cedar-policy-validator/src/types.rs:669:51)",
+"0x55d9d9bab46b: cedar_policy_core::extensions::ipaddr::ip_from_str (src/extensions/ipaddr.rs:184:15)",
+"0x55d9d9bb17e4: core::ops::function::Fn::call (src/ops/function.rs:79:5)",
+"0x55d9d9eab019: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9eca701: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9ebe47f: serde_json::read::parse_escape (serde_json-1.0.107/src/read.rs:858:17)",
+"0x55d9d9ebd49c: serde_json::read::SliceRead::parse_str_bytes (serde_json-1.0.107/src/read.rs:471:26)",
+"0x55d9d9eb9024: hashbrown::raw::inner::RawTableInner<A>::fallible_with_capacity (src/raw/mod.rs:1614:30)",
+"0x55d9d9eb78f9: hashbrown::raw::inner::RawTableInner<A>::prepare_resize (src/raw/mod.rs:2156:29)",
+"0x55d9d9eb65a7: hashbrown::raw::inner::RawTableInner<A>::resize_inner (src/raw/mod.rs:2229:29)",
+"0x55d9d9eb65a7: hashbrown::raw::inner::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:2206:13)",
+"0x55d9d9eb65a7: hashbrown::raw::inner::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:1120:13)",
+"0x55d9d9eb73fc: hashbrown::raw::inner::RawTable<T,A>::reserve (src/raw/mod.rs:1086:16)",
+"0x55d9d999b6db: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d999b6db: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_in_fixes_resource::{{closure}} (cedar-policy-validator/src/rbac.rs:185:21)",
+"0x55d9d999adab: core::ops::function::impls::<impl core::ops::function::Fn<A> for &F>::call (src/ops/function.rs:263:13)",
+"0x55d9d999b75c: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_none_equal::{{closure}} (cedar-policy-validator/src/rbac.rs:223:17)",
+"0x55d9d99086bb: <core::slice::iter::Iter<T> as core::iter::traits::iterator::Iterator>::any (slice/iter/macros.rs:232:24)",
+"0x55d9d9904c09: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_none_equal (cedar-policy-validator/src/rbac.rs:222:14)",
+"0x55d9d99048d3: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_in_fixes (cedar-policy-validator/src/rbac.rs:207:9)",
+"0x55d9d9b39313: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9b3cf19: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9ab98ca: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9acb57b: <alloc::vec::Vec<T,A> as core::iter::traits::collect::Extend<T>>::extend_one (src/vec/mod.rs:2791:9)",
+"0x55d9d9bdbc0e: core::iter::traits::iterator::Iterator::partition::extend::{{closure}} (iter/traits/iterator.rs:2094:21)",
+"0x55d9d9b1d0fc: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9aa3e29: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa3e29: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa3e29: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9aa3e29: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9ac04fc: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
+"0x55d9d9acc3d7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c5fcb2: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9c5fcb2: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
+"0x55d9d9a929d0: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d9cf497c: cedar_policy_core::est::expr::Expr::and (src/est/expr.rs:345:19)",
+"0x55d9d9cf77cf: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::And>>::try_from (src/est/expr.rs:773:20)",
+"0x55d9d9cf6b88: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Or>>::try_from (src/est/expr.rs:747:24)",
+"0x55d9d9d3c31e: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
+"0x55d9d991981f: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:1079:25)",
+"0x55d9d9a71d0c: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Name>>>::to_var (src/parser/cst_to_ast.rs:1750:17)",
+"0x55d9d9a70cc8: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1637:34)",
+"0x55d9d9916d07: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:808:41)",
+"0x55d9d9c84d2e: cedar_policy_core::ast::policy::TemplateBody::condition (src/ast/policy.rs:901:17)",
+"0x55d9d9be1642: cedar_policy_core::ast::expr::ExprBuilder<T>::and (src/ast/expr.rs:932:24)",
+"0x55d9d99904d2: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d99904d2: cedar_policy_validator::schema::WithUnresolvedTypeDefs<T>::new (cedar-policy-validator/src/schema.rs:167:30)",
+"0x55d9d99905bd: cedar_policy_validator::schema::WithUnresolvedTypeDefs<T>::map (cedar-policy-validator/src/schema.rs:173:17)",
+"0x55d9d99315ee: cedar_policy_validator::schema::ValidatorNamespaceDef::try_schema_type_into_validator_type (cedar-policy-validator/src/schema.rs:691:25)",
+"0x55d9d999181e: cedar_policy_validator::schema::ValidatorNamespaceDef::build_entity_types::{{closure}} (cedar-policy-validator/src/schema.rs:323:38)",
+"0x55d9d99dd913: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
+"0x55d9d995af52: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
+"0x55d9d9ccd98b: cedar_policy_core::parser::text_to_cst::grammar::__action159 (src/parser/grammar.rs:59874:5)",
+"0x55d9d9cd493b: cedar_policy_core::parser::text_to_cst::grammar::__action227 (src/parser/grammar.rs:61713:5)",
+"0x55d9d9bfa848: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce43 (src/parser/grammar.rs:37584:20)",
+"0x55d9d9bee3e4: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35490:17)",
+"0x55d9d98d8cd5: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::validate_action_application (cedar-policy-validator/src/rbac.rs:276:31)",
+"0x55d9d9cc69c1: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9cc69c1: cedar_policy_core::parser::text_to_cst::grammar::__action35 (src/parser/grammar.rs:57903:37)",
+"0x55d9d9cd9b93: cedar_policy_core::parser::text_to_cst::grammar::__action269 (src/parser/grammar.rs:63060:5)",
+"0x55d9d9ce538e: cedar_policy_core::parser::text_to_cst::grammar::__action359 (src/parser/grammar.rs:65951:5)",
+"0x55d9d9c023c6: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce104 (src/parser/grammar.rs:38793:20)",
+"0x55d9d9bef00b: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35673:17)",
+"0x55d9d9d22326: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce104 (src/parser/grammar.rs:30051:20)",
+"0x55d9d9d0ef7b: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26931:17)",
+"0x55d9d990fde8: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d9be2725: cedar_policy_core::ast::expr::ExprBuilder<T>::contains (src/ast/expr.rs:1029:19)",
+"0x55d9d9c8319d: cedar_policy_core::parser::cst_to_ast::construct_method_contains (src/parser/cst_to_ast.rs:2046:5)",
+"0x55d9d9cbeb18: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::ast::name::Id>::to_meth (src/parser/cst_to_ast.rs:426:22)",
+"0x55d9d9a6dc06: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1431:28)",
+"0x55d9d9b1a33d: cedar_policy_core::ast::pattern::Pattern::new (src/ast/pattern.rs:69:20)",
+"0x55d9d9a416a4: cedar_policy_core::ast::expr::ExprBuilder<T>::like (src/ast/expr.rs:1120:22)",
+"0x55d9d9919aa3: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:1097:25)",
+"0x55d9d9911f43: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d9a28c7d: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:1095:17)",
+"0x55d9d9be0f32: cedar_policy_core::ast::expr::ExprBuilder<T>::ite (src/ast/expr.rs:901:24)",
+"0x55d9d9c93e3f: cedar_policy_core::ast::expr::Expr::ite (src/ast/expr.rs:327:9)",
+"0x55d9d9c9a8f8: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:573:22)",
+"0x55d9d9b234de: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9aa457d: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa457d: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa457d: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9aa457d: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9acdb6e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9accd79: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9b0539e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9be3674: cedar_policy_core::ast::expr::ExprBuilder<T>::record (src/ast/expr.rs:1060:29)",
+"0x55d9d9b0d8cf: cedar_policy_core::extensions::decimal::extension (src/extensions/decimal.rs:260:13)",
+"0x55d9da14f8c3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9f453e8: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
+"0x55d9d9ee5330: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
+"0x55d9d9ee5330: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
+"0x55d9d9ed86ce: alloc::vec::Vec<T,A>::extend_trusted (src/vec/mod.rs:2840:13)",
+"0x55d9d9ed89eb: <alloc::vec::Vec<T,A> as alloc::vec::spec_extend::SpecExtend<T,I>>::spec_extend (src/vec/spec_extend.rs:26:9)",
+"0x55d9da125b39: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9da125b39: regex_syntax::ast::parse::ParserI<P>::parse_group (src/ast/parse.rs:1244:26)",
+"0x55d9da11e56a: regex_syntax::ast::parse::ParserI<P>::push_group (src/ast/parse.rs:687:15)",
+"0x55d9da122ab4: regex_syntax::ast::parse::ParserI<P>::parse_with_comments (src/ast/parse.rs:974:33)",
+"0x55d9da1221c3: regex_syntax::ast::parse::ParserI<P>::parse (src/ast/parse.rs:959:9)",
+"0x55d9da11c666: regex_syntax::ast::parse::Parser::parse (src/ast/parse.rs:345:9)",
+"0x55d9d9f7ab9a: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3424:23)",
+"0x55d9d9f23ffb: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
+"0x55d9d9f23ffb: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
+"0x55d9d9f23ffb: alloc::slice::<impl [T]>::to_vec (alloc/src/slice.rs:416:14)",
+"0x55d9d9f66734: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:523:29)",
+"0x55d9d9eed5c5: regex_automata::nfa::thompson::compiler::Compiler::compile (nfa/thompson/compiler.rs:985:19)",
+"0x55d9d9eecb91: regex_automata::nfa::thompson::compiler::Compiler::build_many_from_hir (nfa/thompson/compiler.rs:881:9)",
+"0x55d9d9cccdc3: cedar_policy_core::parser::text_to_cst::grammar::__action149 (src/parser/grammar.rs:59729:5)",
+"0x55d9d9c01b7f: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce101 (src/parser/grammar.rs:38728:20)",
+"0x55d9d9beef72: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35664:17)",
+"0x55d9d9d4d392: lalrpop_util::state_machine::Parser<D,I>::parse (lalrpop-util-0.20.0/src/state_machine.rs:264:38)",
+"0x55d9d9b31de3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d99a73e9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9944406: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d994819b: <alloc::vec::Vec<T,A> as core::iter::traits::collect::Extend<T>>::extend_one (src/vec/mod.rs:2791:9)",
+"0x55d9d9a31c8b: core::iter::traits::iterator::Iterator::partition::extend::{{closure}} (iter/traits/iterator.rs:2094:21)",
+"0x55d9d9b0b4b5: cedar_policy_core::ast::value::Value::set (src/ast/value.rs:436:32)",
+"0x55d9d9b6c92e: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:548:46)",
+"0x55d9d9cf436d: cedar_policy_core::est::expr::Expr::_in (src/est/expr.rs:306:20)",
+"0x55d9d9cf99d6: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Relation>>::try_from (src/est/expr.rs:801:36)",
+"0x55d9d9be245e: cedar_policy_core::ast::expr::ExprBuilder<T>::neg (src/ast/expr.rs:1009:18)",
+"0x55d9d9c9511a: cedar_policy_core::ast::expr::Expr::neg (src/ast/expr.rs:392:9)",
+"0x55d9d9c9fc6c: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:479:20)",
+"0x55d9d9c9fbbc: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:479:35)",
+"0x55d9d9c95021: cedar_policy_core::ast::expr::Expr::mul (src/ast/expr.rs:387:9)",
+"0x55d9d9c9c5ff: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:537:40)",
+"0x55d9d9c9a60e: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:575:17)",
+"0x55d9d9b31933: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9b3cdf9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9abab1a: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d99600bd: cedar_policy_validator::type_error::AttributeAccess::from_expr (cedar-policy-validator/src/type_error.rs:388:17)",
+"0x55d9d991849e: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:963:41)",
+"0x55d9d9b6f7ca: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:416:58)",
+"0x55d9d9c6dd89: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9c6dd89: <cedar_policy_core::ast::entity::Entity as cedar_policy_core::transitive_closure::TCNode<cedar_policy_core::ast::entity::EntityUID>>::out_edges (src/ast/entity.rs:333:9)",
+"0x55d9d99f0586: cedar_policy_core::transitive_closure::add_ancestors_to_set (cedar-policy-core/src/transitive_closure.rs:153:25)",
+"0x55d9d99f06d1: cedar_policy_core::transitive_closure::add_ancestors_to_set (cedar-policy-core/src/transitive_closure.rs:158:17)",
+"0x55d9d99eeec7: cedar_policy_core::transitive_closure::compute_tc_internal (cedar-policy-core/src/transitive_closure.rs:82:9)",
+"0x55d9d9ccca7f: cedar_policy_core::parser::text_to_cst::grammar::__action144 (src/parser/grammar.rs:59656:5)",
+"0x55d9d9cd3fa8: cedar_policy_core::parser::text_to_cst::grammar::__action221 (src/parser/grammar.rs:61533:5)",
+"0x55d9d9bf933d: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce33 (src/parser/grammar.rs:37382:20)",
+"0x55d9d9bee1e6: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35460:17)",
+"0x55d9d9a71b8d: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Name>>>::to_ident (src/parser/cst_to_ast.rs:1735:13)",
+"0x55d9d9a71c01: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Name>>>::to_var (src/parser/cst_to_ast.rs:1742:20)",
+"0x55d9d9a27c9f: cedar_policy_validator::typecheck::Typechecker::typecheck_policy (cedar-policy-validator/src/typecheck.rs:292:61)",
+"0x55d9d9a4164c: cedar_policy_core::ast::expr::ExprBuilder<T>::like (src/ast/expr.rs:1119:19)",
+"0x55d9d9911df5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
+"0x55d9d9c9be25: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:547:17)",
+"0x55d9d9a418b2: cedar_policy_core::ast::expr::ExprBuilder<T>::is_in (src/ast/expr.rs:1020:19)",
+"0x55d9d9c9f067: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:491:17)",
+"0x55d9d9ea91cc: alloc::raw_vec::RawVec<T,A>::grow_exact (alloc/src/raw_vec.rs:423:19)",
+"0x55d9d9eab0b5: alloc::raw_vec::RawVec<T,A>::try_reserve_exact (alloc/src/raw_vec.rs:342:50)",
+"0x55d9d9eca5fe: alloc::vec::Vec<T,A>::try_reserve_exact (src/vec/mod.rs:1018:9)",
+"0x55d9d9eafc47: indexmap::map::core::IndexMapCore<K,V>::reserve_entries (src/map/core.rs:210:36)",
+"0x55d9d9eaf6b8: indexmap::map::core::IndexMapCore<K,V>::push_entry (src/map/core.rs:282:13)",
+"0x55d9d9a402d4: cedar_policy_core::ast::expr::ExprBuilder<T>::or (src/ast/expr.rs:945:23)",
+"0x55d9d9917c8f: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:881:41)",
+"0x55d9d99114f5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
+"0x55d9d9917419: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:859:25)",
+"0x55d9d9912b77: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d9be2267: cedar_policy_core::ast::expr::ExprBuilder<T>::sub (src/ast/expr.rs:993:19)",
+"0x55d9d9c9323f: cedar_policy_core::parser::cst_to_ast::construct_expr_add (src/parser/cst_to_ast.rs:2010:34)",
+"0x55d9d9a6a98d: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Add>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1123:38)",
+"0x55d9d9a68587: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::And>>>::to_expr_or_special (src/parser/cst_to_ast.rs:996:27)",
+"0x55d9d9ed7876: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3424:23)",
+"0x55d9da171b73: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9da171b73: regex_syntax::hir::translate::TranslatorI::hir_capture (src/hir/translate.rs:980:55)",
+"0x55d9da16b5e0: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_post (src/hir/translate.rs:456:42)",
+"0x55d9da169be6: regex_syntax::hir::translate::Translator::translate (src/hir/translate.rs:174:9)",
+"0x55d9d9f7af3c: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3434:23)",
+"0x55d9d9a40aa6: cedar_policy_core::ast::expr::ExprBuilder<T>::ite (src/ast/expr.rs:903:24)",
+"0x55d9d991637e: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}}::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:710:50)",
+"0x55d9d990e785: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
+"0x55d9d9915f2c: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:703:29)",
+"0x55d9d9911038: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9da183b14: regex_syntax::hir::Hir::empty (src/hir/mod.rs:259:21)",
+"0x55d9da1893d6: <regex_syntax::hir::Hir as core::ops::drop::Drop>::drop (src/hir/mod.rs:1864:57)",
+"0x55d9da176127: core::ptr::drop_in_place<regex_syntax::hir::Hir> (src/ptr/mod.rs:490:1)",
+"0x55d9da176c01: core::ptr::drop_in_place<[regex_syntax::hir::Hir]> (src/ptr/mod.rs:490:1)",
+"0x55d9da105dcb: <alloc::vec::Vec<T,A> as core::ops::drop::Drop>::drop (src/vec/mod.rs:3018:13)",
+"0x55d9d9be28f5: cedar_policy_core::ast::expr::ExprBuilder<T>::contains_all (src/ast/expr.rs:1038:19)",
+"0x55d9d9c955b0: cedar_policy_core::ast::expr::Expr::contains_all (src/ast/expr.rs:410:9)",
+"0x55d9d9c9ba73: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:549:75)",
+"0x55d9d9b1a8e5: cedar_policy_core::ast::expr_iterator::ExprIterator<T>::new (src/ast/expr_iterator.rs:35:31)",
+"0x55d9d9bde777: cedar_policy_core::ast::expr::Expr<T>::subexpressions (src/ast/expr.rs:258:9)",
+"0x55d9d9a328ce: cedar_policy_validator::expr_iterator::expr_entity_uids (cedar-policy-validator/src/expr_iterator.rs:23:5)",
+"0x55d9d9a32b1c: cedar_policy_validator::expr_iterator::policy_entity_uids (cedar-policy-validator/src/expr_iterator.rs:39:16)",
+"0x55d9d98d8726: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::validate_entity_types (cedar-policy-validator/src/rbac.rs:68:9)",
+"0x55d9d98d9357: cedar_policy_validator::Validator::validate_policy (cedar-policy-validator/src/lib.rs:103:9)",
+"0x55d9d99278c9: alloc::boxed::Box<T,A>::try_new_uninit_in (alloc/src/boxed.rs:483:19)",
+"0x55d9d992664a: alloc::boxed::Box<T,A>::new_uninit_in (alloc/src/boxed.rs:448:15)",
+"0x55d9d9927fec: <alloc::boxed::Box<T,A> as core::clone::Clone>::clone (alloc/src/boxed.rs:1281:25)",
+"0x55d9d99eccf1: <core::option::Option<T> as core::clone::Clone>::clone (core/src/option.rs:2041:29)",
+"0x55d9d9a3b38f: <cedar_policy_validator::types::Type as core::clone::Clone>::clone (cedar-policy-validator/src/types.rs:73:9)",
+"0x55d9d9922dee: cedar_policy_validator::typecheck::Typechecker::expect_one_of_types::{{closure}} (cedar-policy-validator/src/typecheck.rs:2026:25)",
+"0x55d9d9b1f43c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9aa5cd7: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa5cd7: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa5cd7: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9aa5cd7: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
+"0x55d9d9abf820: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
+"0x55d9d9acbe69: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9af0f5e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a6b491: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Mult>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1188:32)",
+"0x55d9d9c9f92f: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:483:17)",
+"0x55d9d9a9b26e: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a9b26e: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a9b26e: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9a9b26e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9acde9e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acbd29: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c5fb02: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9c5fb02: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
+"0x55d9d9a950f4: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d9cbd570: <serde::__private::de::content::ContentVisitor as serde::de::Visitor>::visit_map (src/private/de.rs:504:17)",
+"0x55d9d9a97776: serde_json::value::de::visit_object (src/value/de.rs:196:20)",
+"0x55d9d9a6005a: serde_json::value::de::<impl serde::de::Deserializer for serde_json::value::Value>::deserialize_any (src/value/de.rs:223:33)",
+"0x55d9d9a60e71: serde::de::Deserializer::__deserialize_content (src/de/mod.rs:1231:9)",
+"0x55d9d9c8599e: cedar_policy_core::ast::policy::PrincipalOrResourceConstraint::as_expr (src/ast/policy.rs:1260:17)",
+"0x55d9da1b6869: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
+"0x55d9da1b6869: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9da1b6869: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9da1b6869: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9da1b6869: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:162:25)",
+"0x55d9da1b6869: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
+"0x55d9da1b6869: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
+"0x55d9da1b6869: alloc::slice::<impl [T]>::to_vec (alloc/src/slice.rs:416:14)",
+"0x55d9da1b6869: std::sys::unix::os_str::Slice::to_owned (sys/unix/os_str.rs:213:33)",
+"0x55d9da1b6869: std::ffi::os_str::OsStr::to_os_string (src/ffi/os_str.rs:775:27)",
+"0x55d9da1b6869: std::path::Path::to_path_buf (std/src/path.rs:2151:34)",
+"0x55d9da1b6869: std::path::Path::_join (std/src/path.rs:2551:23)",
+"0x55d9da1b14a4: std::path::Path::join (std/src/path.rs:2547:9)",
+"0x55d9da1b14a4: std::sys::unix::fs::DirEntry::path (sys/unix/fs.rs:782:9)",
+"0x55d9da1b14a4: std::fs::DirEntry::path (std/src/fs.rs:1661:9)",
+"0x55d9d9778d15: corpus_tests::corpus_tests::{{closure}} (cedar-policy/tests/corpus_tests.rs:58:18)",
+"0x55d9d9763713: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
+"0x55d9d9782af6: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
+"0x55d9d9763493: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
+"0x55d9d975641f: <core::iter::adapters::filter::Filter<I,P> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/filter.rs:93:9)",
+"0x55d9d975646b: core::iter::traits::iterator::Iterator::find (iter/traits/iterator.rs:2773:9)",
+"0x55d9d9cf520b: cedar_policy_core::est::expr::Expr::get_attr (src/est/expr.rs:409:19)",
+"0x55d9d9cfe5cf: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Member>>::try_from (src/est/expr.rs:1261:62)",
+"0x55d9d9b39c73: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9b3cf49: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9abbb7d: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9d4e2eb: lalrpop_util::state_machine::Parser<D,I>::parse (lalrpop-util-0.20.0/src/state_machine.rs:259:21)",
+"0x55d9d9d4c34b: lalrpop_util::state_machine::Parser<D,I>::drive (lalrpop-util-0.20.0/src/state_machine.rs:218:9)",
+"0x55d9d9c151db: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9c151db: cedar_policy_core::ast::extension::ExtensionFunction::binary (src/ast/extension.rs:233:13)",
+"0x55d9d9b0e2e5: cedar_policy_core::extensions::decimal::extension (src/extensions/decimal.rs:281:13)",
+"0x55d9d992d17c: cedar_policy_validator::extensions::decimal::extension_schema (src/extensions/decimal.rs:57:23)",
+"0x55d9d9a5b693: cedar_policy_validator::extensions::all_available_extension_schemas (cedar-policy-validator/src/extensions.rs:35:9)",
+"0x55d9d9b55204: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d9b55204: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d9b55204: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d9b65818: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9999056: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9999056: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9999056: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:139:27)",
+"0x55d9d999961b: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
+"0x55d9d999961b: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
+"0x55d9d999961b: alloc::slice::<impl [T]>::to_vec (alloc/src/slice.rs:416:14)",
+"0x55d9d9922da9: cedar_policy_validator::typecheck::Typechecker::expect_one_of_types::{{closure}} (cedar-policy-validator/src/typecheck.rs:2025:25)",
+"0x55d9d9910419: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d9a2c7e2: cedar_policy_validator::typecheck::Typechecker::expect_one_of_types (cedar-policy-validator/src/typecheck.rs:2005:9)",
+"0x55d9d9be1dc5: cedar_policy_core::ast::expr::ExprBuilder<T>::lesseq (src/ast/expr.rs:964:19)",
+"0x55d9d9c948b0: cedar_policy_core::ast::expr::Expr::lesseq (src/ast/expr.rs:362:9)",
+"0x55d9d9c9e863: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:497:70)",
+"0x55d9d9bac971: cedar_policy_core::extensions::ipaddr::extension (src/extensions/ipaddr.rs:266:9)",
+"0x55d9d9b6775d: std::sync::once::Once::call_once (src/sync/once.rs:149:9)",
+"0x55d9d99053aa: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d99053aa: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_entities_satisfying_constraint (cedar-policy-validator/src/rbac.rs:398:37)",
+"0x55d9d98d8bde: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_in_fixes_resource (cedar-policy-validator/src/rbac.rs:182:14)",
+"0x55d9d98d8deb: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::validate_action_application (cedar-policy-validator/src/rbac.rs:284:37)",
+"0x55d9d99c6374: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d99c6374: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d99c6374: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d99d51a8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9a9a345: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a9a345: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a9a345: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9a9a345: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9acdcce: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acc107: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c2a4ee: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a70deb: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1647:36)",
+"0x55d9da16fb40: regex_syntax::hir::translate::TranslatorI::pop_concat_expr (src/hir/translate.rs:752:44)",
+"0x55d9da16af77: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_post (src/hir/translate.rs:460:40)",
+"0x55d9d9b71ac8: cedar_policy_core::evaluator::Evaluator::eval_in (cedar-policy-core/src/evaluator.rs:586:21)",
+"0x55d9d9cb9aa3: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:146:32)",
+"0x55d9d9ac41e8: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
+"0x55d9d9ac41e8: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
+"0x55d9d9ac41e8: <alloc::vec::Vec<T,A> as core::clone::Clone>::clone (src/vec/mod.rs:2643:9)",
+"0x55d9d9fa22ea: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9fa22ea: regex_automata::util::pool::Pool<T,F>::new (src/util/pool.rs:160:14)",
+"0x55d9d9bad054: cedar_policy_core::extensions::ipaddr::extension (src/extensions/ipaddr.rs:281:13)",
+"0x55d9d9a403d5: cedar_policy_core::ast::expr::ExprBuilder<T>::or (src/ast/expr.rs:946:24)",
+"0x55d9d9917762: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:906:37)",
+"0x55d9d9911658: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d9f66c44: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:482:34)",
+"0x55d9da18542e: regex_syntax::hir::Hir::concat (src/hir/mod.rs:477:22)",
+"0x55d9d9bad864: cedar_policy_core::extensions::ipaddr::extension (src/extensions/ipaddr.rs:302:13)",
+"0x55d9d9b208cc: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9aa2ce1: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa2ce1: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa2ce1: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9aa2ce1: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
+"0x55d9d9acdcfb: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acc0d6: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9af0fdb: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9c86433: cedar_policy_core::ast::policy::ActionConstraint::iter_euids (src/ast/policy.rs:1361:39)",
+"0x55d9d9d4c7cc: lalrpop_util::state_machine::Parser<D,I>::drive (lalrpop-util-0.20.0/src/state_machine.rs:221:21)",
+"0x55d9d9bed592: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::PolicyParser::parse (src/parser/grammar.rs:35300:13)",
+"0x55d9d9bb4d6a: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9b40543: cedar_policy_core::parser::text_to_cst::parse_collect_errors (src/parser/text_to_cst.rs:49:18)",
+"0x55d9d9d074f6: cedar_policy_core::parser::text_to_cst::parse_policy (src/parser/text_to_cst.rs:89:5)",
+"0x55d9d9c70e17: cedar_policy_core::parser::parse_policy_or_template_to_est (cedar-policy-core/src/parser.rs:212:15)",
+"0x55d9d9f700fb: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9f700fb: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
+"0x55d9d9f79919: regex_automata::meta::regex::RegexInfo::new (src/meta/regex.rs:1932:19)",
+"0x55d9d9bdbbb5: core::iter::traits::iterator::Iterator::partition::extend::{{closure}} (iter/traits/iterator.rs:2096:21)",
+"0x55d9d9f71d27: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
+"0x55d9d9f71d27: alloc::sync::Arc<[T]>::allocate_for_slice::{{closure}} (alloc/src/sync.rs:1380:33)",
+"0x55d9d9f6f121: alloc::sync::Arc<T>::try_allocate_for_layout (alloc/src/sync.rs:1322:19)",
+"0x55d9d9f6efbb: alloc::sync::Arc<T>::allocate_for_layout (alloc/src/sync.rs:1304:13)",
+"0x55d9d9f71ca4: alloc::sync::Arc<[T]>::allocate_for_slice (alloc/src/sync.rs:1378:13)",
+"0x55d9d9f71bee: alloc::sync::Arc<[T]>::copy_from_slice (alloc/src/sync.rs:1392:23)",
+"0x55d9d9edd361: <alloc::sync::Arc<[T]> as alloc::sync::ArcFromSlice<T>>::from_slice (alloc/src/sync.rs:1468:18)",
+"0x55d9d9edd361: <alloc::sync::Arc<[T]> as core::convert::From<&[T]>>::from (alloc/src/sync.rs:2672:9)",
+"0x55d9d9edd361: <alloc::sync::Arc<str> as core::convert::From<&str>>::from (alloc/src/sync.rs:2690:19)",
+"0x55d9d9edbad8: regex::builders::Builder::build_one_string (regex-1.9.5/src/builders.rs:78:23)",
+"0x55d9d9b2f863: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9b3ce89: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9aba1dd: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9d4d7a3: lalrpop_util::state_machine::Parser<D,I>::parse (lalrpop-util-0.20.0/src/state_machine.rs:259:21)",
+"0x55d9d9d4c92b: lalrpop_util::state_machine::Parser<D,I>::drive (lalrpop-util-0.20.0/src/state_machine.rs:218:9)",
+"0x55d9d9cf54d1: cedar_policy_core::est::expr::Expr::ite (src/est/expr.rs:433:24)",
+"0x55d9d9cf6296: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Expr>>::try_from (src/est/expr.rs:735:24)",
+"0x55d9d9d3c257: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
+"0x55d9d9cfc282: cedar_policy_core::est::expr::interpret_primary (src/est/expr.rs:1130:41)",
+"0x55d9d9cfdcab: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Member>>::try_from (src/est/expr.rs:1171:24)",
+"0x55d9d9bd48f9: <indexmap::Bucket<K,V> as core::clone::Clone>::clone (indexmap-2.0.1/src/lib.rs:171:18)",
+"0x55d9d9bb21a0: core::ops::function::FnMut::call_mut (src/ops/function.rs:166:5)",
+"0x55d9d9afa10b: core::iter::adapters::map::map_fold::{{closure}} (iter/adapters/map.rs:84:28)",
+"0x55d9d9b9ce08: core::iter::traits::iterator::Iterator::fold (iter/traits/iterator.rs:2482:21)",
+"0x55d9d9aeb63a: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::fold (iter/adapters/map.rs:124:9)",
+"0x55d9d9d08bb3: <core::iter::adapters::cloned::Cloned<I> as core::iter::traits::iterator::Iterator>::fold (iter/adapters/cloned.rs:60:9)",
+"0x55d9d9d08f6a: core::iter::traits::iterator::Iterator::for_each (iter/traits/iterator.rs:857:9)",
+"0x55d9d9f73367: <alloc::sync::Arc<[T]> as alloc::sync::ArcFromSlice<T>>::from_slice (alloc/src/sync.rs:1468:18)",
+"0x55d9d9f733c7: <alloc::sync::Arc<[T]> as core::convert::From<&[T]>>::from (alloc/src/sync.rs:2672:9)",
+"0x55d9d9c142a6: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9c142a6: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9c142a6: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9c142a6: alloc::string::String::with_capacity (alloc/src/string.rs:499:23)",
+"0x55d9d9baa0c0: itertools::Itertools::join (itertools-0.10.5/src/lib.rs:2067:34)",
+"0x55d9d9d5c0ab: cedar_policy_core::evaluator::err::pretty_type_error (src/evaluator/err.rs:279:17)",
+"0x55d9d9d5c72d: <cedar_policy_core::evaluator::err::EvaluationErrorKind as core::fmt::Display>::fmt (src/evaluator/err.rs:213:19)",
+"0x55d9d9d5b6bf: <cedar_policy_core::evaluator::err::EvaluationError as core::fmt::Display>::fmt (src/evaluator/err.rs:36:13)",
+"0x55d9d9c92037: cedar_policy_core::parser::cst_to_ast::construct_expr_or (src/parser/cst_to_ast.rs:1967:17)",
+"0x55d9d9c9053e: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Or>>>::to_expr_or_special::{{closure}} (src/parser/cst_to_ast.rs:957:46)",
+"0x55d9d9c1af8d: core::option::Option<T>::map (core/src/option.rs:1099:29)",
+"0x55d9d9a6818b: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Or>>>::to_expr_or_special (src/parser/cst_to_ast.rs:955:55)",
+"0x55d9d99222ec: cedar_policy_validator::typecheck::Typechecker::entity_in_descendants (cedar-policy-validator/src/typecheck.rs:1920:13)",
+"0x55d9d9921d35: cedar_policy_validator::typecheck::Typechecker::type_of_euid_in_euids (cedar-policy-validator/src/typecheck.rs:1888:13)",
+"0x55d9d9920466: cedar_policy_validator::typecheck::Typechecker::type_of_entity_literal_in_entity_literals (cedar-policy-validator/src/typecheck.rs:1822:25)",
+"0x55d9d991dba9: cedar_policy_validator::typecheck::Typechecker::typecheck_in::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1626:92)",
+"0x55d9d9b1dcbe: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9aa9358: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa9358: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa9358: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9bd5667: lalrpop_util::lexer::MatcherBuilder::new (lalrpop-util-0.20.0/src/lexer.rs:31:29)",
+"0x55d9d9c8f9ee: cedar_policy_core::parser::text_to_cst::grammar::__intern_token::new_builder (src/parser/grammar.rs:57323:9)",
+"0x55d9d9d8a33b: cedar_policy_core::parser::text_to_cst::grammar::__parse__Name::NameParser::new (src/parser/grammar.rs:17781:29)",
+"0x55d9d9bb36d1: <cedar_policy_core::parser::text_to_cst::NAME_PARSER as core::ops::deref::Deref>::deref::__static_ref_initialize (src/parser/text_to_cst.rs:76:51)",
+"0x55d9d9bb36d1: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9da1d63b1: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
+"0x55d9da1d63b1: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9da1d63b1: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9da1d63b1: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9da1d63b1: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9da1d63b1: alloc::string::String::with_capacity (alloc/src/string.rs:499:23)",
+"0x55d9da1d63b1: alloc::fmt::format::format_inner (alloc/src/fmt.rs:611:26)",
+"0x55d9da11a735: alloc::fmt::format::{{closure}} (alloc/src/fmt.rs:616:34)",
+"0x55d9da139eee: core::option::Option<T>::map_or_else (core/src/option.rs:1193:21)",
+"0x55d9d9c16e7d: alloc::fmt::format (alloc/src/fmt.rs:616:5)",
+"0x55d9d9c8fe86: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Policies>>>::with_generated_policyids::{{closure}} (src/parser/cst_to_ast.rs:90:66)",
+"0x55d9d9afa4eb: core::iter::adapters::map::map_fold::{{closure}} (iter/adapters/map.rs:84:28)",
+"0x55d9d9cc01ce: <core::iter::adapters::enumerate::Enumerate<I> as core::iter::traits::iterator::Iterator>::fold::enumerate::{{closure}} (iter/adapters/enumerate.rs:107:27)",
+"0x55d9d9b9c991: core::iter::traits::iterator::Iterator::fold (iter/traits/iterator.rs:2482:21)",
+"0x55d9d9bde7ae: cedar_policy_core::ast::expr::Expr<T>::slots (src/ast/expr.rs:263:9)",
+"0x55d9d9c83f42: <cedar_policy_core::ast::policy::Template as core::convert::From<cedar_policy_core::ast::policy::TemplateBody>>::from (src/ast/policy.rs:233:21)",
+"0x55d9d9b799db: cedar_policy_core::est::Policy::try_into_ast_template (cedar-policy-core/src/est.rs:230:12)",
+"0x55d9d99c1694: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d99c1694: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d99c1694: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d99d5468: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9be27c7: cedar_policy_core::ast::expr::ExprBuilder<T>::contains (src/ast/expr.rs:1030:19)",
+"0x55d9d99be874: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d99be874: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d99be874: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d99d5258: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9b237ce: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9aa1d36: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa1d36: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa1d36: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9aa1d36: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9abde5c: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
+"0x55d9d9acca87: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c5f8c2: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9c5f8c2: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
+"0x55d9d9a95d08: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9da14d7f3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9da152ea9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9da1018ed: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9ed7a1d: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3429:13)",
+"0x55d9d9bacdea: cedar_policy_core::extensions::ipaddr::extension (src/extensions/ipaddr.rs:274:13)",
+"0x55d9d999ce4e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d993bbf4: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d993bbf4: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d993bbf4: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d993bbf4: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d994907e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9948417: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d99dc39e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d98fe3dc: <alloc::collections::btree::map::BTreeMap<K,V> as core::iter::traits::collect::FromIterator<(K,V)>>::from_iter (collections/btree/map.rs:2229:34)",
+"0x55d9d986773a: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9864648: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d999e2de: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d993b4a7: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d993b4a7: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d993b4a7: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d993b4a7: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
+"0x55d9d99490de: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d99486a9: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d99dc15e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a28d25: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:1110:34)",
+"0x55d9d9916af2: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:817:41)",
+"0x55d9d9be2cd7: cedar_policy_core::ast::expr::ExprBuilder<T>::set (src/ast/expr.rs:1054:43)",
+"0x55d9d9bdf4b7: cedar_policy_core::ast::expr::Expr::set (src/ast/expr.rs:420:9)",
+"0x55d9d9b7a3f2: cedar_policy_core::ast::restricted_expr::RestrictedExpr::set (src/ast/restricted_expr.rs:98:29)",
+"0x55d9d98b1978: cedar_policy_core::entities::json::jsonvalue::ValueParser::val_into_rexpr (entities/json/jsonvalue.rs:314:58)",
+"0x55d9d98b8999: cedar_policy_core::entities::json::jsonvalue::ValueParser::val_into_rexpr::{{closure}} (entities/json/jsonvalue.rs:345:43)",
+"0x55d9d9c81843: cedar_policy_core::parser::cst_to_ast::construct_name (src/parser/cst_to_ast.rs:1930:15)",
+"0x55d9d9a718ea: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Name>>>::to_name (src/parser/cst_to_ast.rs:1720:58)",
+"0x55d9d9a71e4d: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Ref>>>::to_ref (src/parser/cst_to_ast.rs:1803:34)",
+"0x55d9d9a72377: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Ref>>>::to_expr (src/parser/cst_to_ast.rs:1832:9)",
+"0x55d9d9a70c66: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1632:37)",
+"0x55d9d998244e: cedar_policy_validator::extensions::ipaddr::get_argument_types (src/extensions/ipaddr.rs:31:24)",
+"0x55d9d9a472fd: cedar_policy_validator::extensions::ipaddr::extension_schema::{{closure}} (src/extensions/ipaddr.rs:71:17)",
+"0x55d9d9a470af: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
+"0x55d9d99e94e2: core::option::Option<T>::map (core/src/option.rs:1099:29)",
+"0x55d9d99d88dd: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::next (iter/adapters/map.rs:103:9)",
+"0x55d9d993809f: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:26:32)",
+"0x55d9d9b0d581: cedar_policy_core::extensions::decimal::extension (src/extensions/decimal.rs:253:13)",
+"0x55d9d9904f80: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9904f80: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_entities_satisfying_constraint (cedar-policy-validator/src/rbac.rs:390:17)",
+"0x55d9d99de7fc: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
+"0x55d9d9b70893: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:307:28)",
+"0x55d9d9c77465: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_ref_or_refs (src/parser/cst_to_ast.rs:1603:61)",
+"0x55d9d9c76912: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_ref_or_refs (src/parser/cst_to_ast.rs:1342:18)",
+"0x55d9d9c914f3: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_expr_or_special::{{closure}} (src/parser/cst_to_ast.rs:1462:49)",
+"0x55d9d9c2558a: core::option::Option<T>::and_then (core/src/option.rs:1440:24)",
+"0x55d9d9f70829: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9f70829: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
+"0x55d9d9fbf84d: regex_automata::util::captures::GroupInfo::new (src/util/captures.rs:1608:22)",
+"0x55d9d9ef7338: regex_automata::nfa::thompson::nfa::Inner::set_captures (nfa/thompson/nfa.rs:1432:27)",
+"0x55d9d9f65bcf: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:439:9)",
+"0x55d9d9a7aac4: cedar_policy_core::entities::json::jsonvalue::_::<impl serde::de::Deserialize for cedar_policy_core::entities::json::jsonvalue::JSONValue>::deserialize (entities/json/jsonvalue.rs:38:39)",
+"0x55d9d9b3f467: <core::marker::PhantomData<T> as serde::de::DeserializeSeed>::deserialize (src/de/mod.rs:794:9)",
+"0x55d9d984651a: <serde::__private::de::content::VariantRefDeserializer<E> as serde::de::VariantAccess>::newtype_variant_seed (src/private/de.rs:2140:32)",
+"0x55d9d9846bc7: serde::de::VariantAccess::newtype_variant (src/de/mod.rs:2119:9)",
+"0x55d9da1b0ca7: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
+"0x55d9da1b0ca7: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9da1b0ca7: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9da1b0ca7: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9da1b0ca7: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9da1b0ca7: alloc::string::String::with_capacity (alloc/src/string.rs:499:23)",
+"0x55d9da1b0ca7: std::fs::read_to_string::inner (std/src/fs.rs:293:26)",
+"0x55d9d97828b1: std::fs::read_to_string (std/src/fs.rs:297:5)",
+"0x55d9d975907f: cedar_policy::integration_testing::perform_integration_test_from_json_custom (cedar-policy/src/integration_testing.rs:223:23)",
+"0x55d9d9ca82d4: serde::ser::Serializer::collect_seq (src/ser/mod.rs:1277:35)",
+"0x55d9d9ac2c86: serde::ser::impls::<impl serde::ser::Serialize for alloc::vec::Vec<T>>::serialize (src/ser/impls.rs:194:17)",
+"0x55d9d9ac2bc9: serde::ser::impls::<impl serde::ser::Serialize for &T>::serialize (src/ser/impls.rs:456:17)",
+"0x55d9da188fde: <regex_syntax::hir::Hir as core::ops::drop::Drop>::drop (src/hir/mod.rs:1853:25)",
+"0x55d9da177987: core::ptr::drop_in_place<alloc::vec::Vec<regex_syntax::hir::Hir>> (src/ptr/mod.rs:490:1)",
+"0x55d9d9f7b19f: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3442:5)",
+"0x55d9d9a60aa6: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a60aa6: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a60aa6: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:139:27)",
+"0x55d9d9ac3c48: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
+"0x55d9d9ac3c48: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
+"0x55d9d9ac3c48: <alloc::vec::Vec<T,A> as core::clone::Clone>::clone (src/vec/mod.rs:2643:9)",
+"0x55d9d9be7db6: <serde_json::value::Value as core::clone::Clone>::clone (src/value/mod.rs:159:11)",
+"0x55d9d9bd4908: <indexmap::Bucket<K,V> as core::clone::Clone>::clone (indexmap-2.0.1/src/lib.rs:172:20)",
+"0x55d9d9c77b85: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_ref_or_refs (src/parser/cst_to_ast.rs:1603:61)",
+"0x55d9d9c76ba2: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_ref_or_refs (src/parser/cst_to_ast.rs:1342:18)",
+"0x55d9d9d0d42b: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::PoliciesParser::new (src/parser/grammar.rs:26540:29)",
+"0x55d9d9bb4421: <cedar_policy_core::parser::text_to_cst::POLICIES_PARSER as core::ops::deref::Deref>::deref::__static_ref_initialize (src/parser/text_to_cst.rs:71:59)",
+"0x55d9d9bb4421: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9c95420: cedar_policy_core::ast::expr::Expr::contains (src/ast/expr.rs:405:9)",
+"0x55d9d9c9bee9: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:545:72)",
+"0x55d9d9be374d: cedar_policy_core::ast::expr::ExprBuilder<T>::call_extension_fn (src/ast/expr.rs:1069:19)",
+"0x55d9d9c9586a: cedar_policy_core::ast::expr::Expr::call_extension_fn (src/ast/expr.rs:431:9)",
+"0x55d9d9c99870: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:606:28)",
+"0x55d9d9c824d1: cedar_policy_core::parser::cst_to_ast::construct_expr_rel (src/parser/cst_to_ast.rs:1991:31)",
+"0x55d9d9d16788: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce15 (src/parser/grammar.rs:28256:20)",
+"0x55d9d9d0ddc0: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26664:17)",
+"0x55d9d9916e96: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:798:45)",
+"0x55d9d9be1e67: cedar_policy_core::ast::expr::ExprBuilder<T>::lesseq (src/ast/expr.rs:965:19)",
+"0x55d9d9b1eb6e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9aa0cd7: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa0cd7: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa0cd7: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9aa0cd7: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
+"0x55d9d9acdfde: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acc637: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c1802e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9ccb689: cedar_policy_core::parser::text_to_cst::grammar::__action99 (src/parser/grammar.rs:58992:5)",
+"0x55d9d9be1079: cedar_policy_core::ast::expr::ExprBuilder<T>::ite (src/ast/expr.rs:903:24)",
+"0x55d9d9ebbe32: <serde_json::value::de::KeyClassifier as serde::de::Visitor>::visit_str (src/value/de.rs:1280:35)",
+"0x55d9d976e3d3: <serde_json::de::MapKey<R> as serde::de::Deserializer>::deserialize_any (serde_json-1.0.107/src/de.rs:2186:37)",
+"0x55d9d9866a77: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9ec7edf: <serde_json::de::MapKey<R> as serde::de::Deserializer>::deserialize_any (serde_json-1.0.107/src/de.rs:2186:37)",
+"0x55d9d9c9ea2c: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:494:17)",
+"0x55d9d9f7cf86: regex_automata::util::determinize::epsilon_closure (util/determinize/mod.rs:360:5)",
+"0x55d9d9f061b1: regex_automata::hybrid::dfa::Lazy::cache_start_one (src/hybrid/dfa.rs:2173:9)",
+"0x55d9d9a41d34: cedar_policy_core::ast::expr::ExprBuilder<T>::get_attr (src/ast/expr.rs:1098:19)",
+"0x55d9d9918234: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:944:42)",
+"0x55d9d99120d5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
+"0x55d9d9a292ff: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:940:17)",
+"0x55d9d9f3a6a3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9f43669: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9ee3fc6: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9f681e1: regex_automata::nfa::thompson::builder::Builder::add (nfa/thompson/builder.rs:1118:9)",
+"0x55d9d9f6769a: regex_automata::nfa::thompson::builder::Builder::add_empty (nfa/thompson/builder.rs:693:9)",
+"0x55d9d9c9ccdb: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:523:17)",
+"0x55d9d990da48: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9da123d62: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9da123d62: regex_syntax::ast::parse::ParserI<P>::parse_uncounted_repetition (src/ast/parse.rs:1067:18)",
+"0x55d9da122cdc: regex_syntax::ast::parse::ParserI<P>::parse_with_comments (src/ast/parse.rs:988:30)",
+"0x55d9d99316a7: cedar_policy_validator::schema::ValidatorNamespaceDef::try_schema_type_into_validator_type (cedar-policy-validator/src/schema.rs:678:17)",
+"0x55d9d9993144: cedar_policy_validator::schema::ValidatorNamespaceDef::parse_record_attributes::{{closure}} (cedar-policy-validator/src/schema.rs:546:25)",
+"0x55d9d99dd50e: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
+"0x55d9d9dc5d5c: <alloc::alloc::Global as core::alloc::Allocator>::allocate_zeroed (alloc/src/alloc.rs:240:9)",
+"0x55d9d9dc465c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:185:38)",
+"0x55d9d9dc3b73: alloc::raw_vec::RawVec<T,A>::with_capacity_zeroed_in (alloc/src/raw_vec.rs:138:9)",
+"0x55d9d9dc3b73: <T as alloc::vec::spec_from_elem::SpecFromElem>::from_elem (src/vec/spec_from_elem.rs:25:31)",
+"0x55d9d9dc3a9b: alloc::vec::from_elem (src/vec/mod.rs:2550:5)",
+"0x55d9d9a44f18: cedar_policy_validator::fuzzy_match::levenshtein_distance (cedar-policy-validator/src/fuzzy_match.rs:38:27)",
+"0x55d9d99c5414: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d99c5414: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d99c5414: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d99d5518: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9b1cb1e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9937306: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9937306: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9937306: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9937306: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d994901e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9948967: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d98ff46e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a39ec5: cedar_policy_validator::types::EntityRecordKind::all_attrs (cedar-policy-validator/src/types.rs:1107:17)",
+"0x55d9d9cbdf0d: cedar_policy_core::ast::name::Name::unqualified_name (src/ast/name.rs:60:19)",
+"0x55d9d9a702c5: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1398:41)",
+"0x55d9d9a6bd28: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Unary>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1255:21)",
+"0x55d9d9a6ac4f: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Mult>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1155:27)",
+"0x55d9d9a9dff6: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a9dff6: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a9dff6: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9a9dff6: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9abfb5c: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
+"0x55d9d9accbe7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c5f9b2: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9c5f9b2: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
+"0x55d9d9a95788: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d9b0f8c1: cedar_policy_core::evaluator::<impl cedar_policy_core::ast::value::Value>::get_as_set (cedar-policy-core/src/evaluator.rs:793:50)",
+"0x55d9d9b6eb87: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:433:40)",
+"0x55d9d9cf460d: cedar_policy_core::est::expr::Expr::lesseq (src/est/expr.rs:322:20)",
+"0x55d9d9cf9648: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Relation>>::try_from (src/est/expr.rs:807:36)",
+"0x55d9d9f3b963: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9f43ae9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9ee2934: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9fc0153: regex_automata::util::captures::GroupInfoInner::add_first_group (src/util/captures.rs:2201:9)",
+"0x55d9d9fbf438: regex_automata::util::captures::GroupInfo::new (src/util/captures.rs:1594:13)",
+"0x55d9d9f24048: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9f24048: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9f24048: <T as alloc::vec::spec_from_elem::SpecFromElem>::from_elem (src/vec/spec_from_elem.rs:15:21)",
+"0x55d9d9ee5b1a: alloc::vec::from_elem (src/vec/mod.rs:2550:5)",
+"0x55d9d9f2591e: regex_automata::dfa::onepass::InternalBuilder::new (src/dfa/onepass.rs:566:28)",
+"0x55d9d9f254f0: regex_automata::dfa::onepass::Builder::build_from_nfa (src/dfa/onepass.rs:413:9)",
+"0x55d9d9fc8600: regex_automata::meta::wrappers::OnePassEngine::new (src/meta/wrappers.rs:402:26)",
+"0x55d9d9f7ad41: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3429:13)",
+"0x55d9da18af43: regex_syntax::hir::Properties::capture (src/hir/mod.rs:2488:16)",
+"0x55d9da184417: regex_syntax::hir::Hir::capture (src/hir/mod.rs:392:21)",
+"0x55d9da171c56: regex_syntax::hir::translate::TranslatorI::hir_capture (src/hir/translate.rs:980:9)",
+"0x55d9d9932a89: <cedar_policy_validator::schema::EntityTypeDescription as cedar_policy_core::entities::json::schema::EntityTypeDescription>::attr_type (cedar-policy-validator/src/schema.rs:1352:73)",
+"0x55d9d9b1e58c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9aa2776: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa2776: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa2776: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9aa2776: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9acdd1e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9accf97: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c2a50e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9b07b59: cedar_policy_core::extensions::Extensions::func (cedar-policy-core/src/extensions.rs:82:56)",
+"0x55d9d9ccc56f: cedar_policy_core::parser::text_to_cst::grammar::__action140 (src/parser/grammar.rs:59598:5)",
+"0x55d9d9d28f8a: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce150 (src/parser/grammar.rs:30976:20)",
+"0x55d9d9d0f935: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:27078:17)",
+"0x55d9d9d52cfe: lalrpop_util::state_machine::Parser<D,I>::parse_eof (lalrpop-util-0.20.0/src/state_machine.rs:295:21)",
+"0x55d9d9d4d976: lalrpop_util::state_machine::Parser<D,I>::parse (lalrpop-util-0.20.0/src/state_machine.rs:240:42)",
+"0x55d9d98689bd: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9bd65df: serde::de::Error::missing_field (src/de/mod.rs:287:17)",
+"0x55d9d9bcf8bb: <serde::__private::de::missing_field::MissingFieldDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:40:17)",
+"0x55d9d9bcfa65: <serde::__private::de::missing_field::MissingFieldDeserializer<E> as serde::de::Deserializer>::deserialize_struct (serde-1.0.188/src/macros.rs:133:13)",
+"0x55d9d9a7ce2b: cedar_policy_core::entities::json::jsonvalue::_::<impl serde::de::Deserialize for cedar_policy_core::entities::json::jsonvalue::TypeAndId>::deserialize (entities/json/jsonvalue.rs:80:39)",
+"0x55d9d9ccd29f: cedar_policy_core::parser::text_to_cst::grammar::__action153 (src/parser/grammar.rs:59787:5)",
+"0x55d9d9cce87c: cedar_policy_core::parser::text_to_cst::grammar::__action178 (src/parser/grammar.rs:60161:5)",
+"0x55d9d9bf5518: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce7 (src/parser/grammar.rs:36837:20)",
+"0x55d9d9bedcb8: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35382:17)",
+"0x55d9d9b51c34: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d9b51c34: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d9b51c34: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d9b65348: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9f65ee7: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:454:34)",
+"0x55d9d99a3ba3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d99a7299: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d994495f: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d991850d: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:961:37)",
+"0x55d9d9bac303: cedar_policy_core::extensions::ipaddr::is_loopback (src/extensions/ipaddr.rs:239:18)",
+"0x55d9d9bb17a4: core::ops::function::Fn::call (src/ops/function.rs:79:5)",
+"0x55d9d9c14182: alloc::str::<impl alloc::borrow::ToOwned for str>::to_owned (alloc/src/str.rs:209:46)",
+"0x55d9d9c14182: <alloc::string::String as core::convert::From<&str>>::from (alloc/src/string.rs:2650:11)",
+"0x55d9d9c14182: <str as alloc::string::ToString>::to_string (alloc/src/string.rs:2596:9)",
+"0x55d9d9d53bf5: regex::builders::Builder::new::{{closure}} (regex-1.9.5/src/builders.rs:66:52)",
+"0x55d9d9d53a5b: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
+"0x55d9d9c9b7cc: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:550:17)",
+"0x55d9da122d69: regex_syntax::ast::parse::ParserI<P>::parse_with_comments (src/ast/parse.rs:994:30)",
+"0x55d9d99cae1d: hashbrown::raw::RawTable<T,A>::new_uninitialized (src/raw/mod.rs:442:20)",
+"0x55d9d99acaf5: <hashbrown::raw::RawTable<T,A> as core::clone::Clone>::clone (src/raw/mod.rs:1606:39)",
+"0x55d9d99866f6: <hashbrown::map::HashMap<K,V,S,A> as core::clone::Clone>::clone (hashbrown-0.12.3/src/map.rs:197:20)",
+"0x55d9d99e2f2d: <hashbrown::set::HashSet<T,S,A> as core::clone::Clone>::clone (hashbrown-0.12.3/src/set.rs:122:18)",
+"0x55d9d9bb2109: core::ops::function::FnMut::call_mut (src/ops/function.rs:166:5)",
+"0x55d9d9cf4b4d: cedar_policy_core::est::expr::Expr::or (src/est/expr.rs:354:20)",
+"0x55d9d9cf7076: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Or>>::try_from (src/est/expr.rs:755:20)",
+"0x55d9d9cf6834: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Expr>>::try_from (src/est/expr.rs:719:28)",
+"0x55d9da172008: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9da172008: regex_syntax::hir::translate::TranslatorI::hir_repetition (src/hir/translate.rs:1005:18)",
+"0x55d9da16b703: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_post (src/hir/translate.rs:450:42)",
+"0x55d9d9ed7c14: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3434:23)",
+"0x55d9d9eec15d: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9eec15d: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9eec15d: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:162:25)",
+"0x55d9d9ee5e68: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
+"0x55d9d9ee5e68: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
+"0x55d9d9ee5e68: <alloc::vec::Vec<T,A> as core::clone::Clone>::clone (src/vec/mod.rs:2643:9)",
+"0x55d9d9ef5801: regex_automata::nfa::thompson::compiler::Utf8Compiler::compile (nfa/thompson/compiler.rs:1804:42)",
+"0x55d9d9ef562a: regex_automata::nfa::thompson::compiler::Utf8Compiler::compile_from (nfa/thompson/compiler.rs:1790:20)",
+"0x55d9d9ef515e: regex_automata::nfa::thompson::compiler::Utf8Compiler::finish (nfa/thompson/compiler.rs:1764:9)",
+"0x55d9d9aa30ae: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa30ae: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa30ae: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9aa30ae: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9acddfe: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acc397: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c17782: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9c17782: <core::option::Option<V> as core::iter::traits::collect::FromIterator<core::option::Option<A>>>::from_iter::{{closure}} (core/src/option.rs:2505:51)",
+"0x55d9d9a94a82: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d99bc204: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d99bc204: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d99bc204: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d99d4f98: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9cbefa8: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::ast::name::Id>::to_meth (src/parser/cst_to_ast.rs:440:45)",
+"0x55d9d975901f: cedar_policy::integration_testing::perform_integration_test_from_json_custom (cedar-policy/src/integration_testing.rs:222:23)",
+"0x55d9d991d479: cedar_policy_validator::typecheck::Typechecker::typecheck_in::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1566:25)",
+"0x55d9d9912548: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d98661f5: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9932e2d: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9932e2d: <cedar_policy_validator::schema::ValidatorEntityType as cedar_policy_core::transitive_closure::TCNode<cedar_policy_core::ast::name::Name>>::out_edges (cedar-policy-validator/src/schema.rs:1445:9)",
+"0x55d9d99f00c6: cedar_policy_core::transitive_closure::add_ancestors_to_set (cedar-policy-core/src/transitive_closure.rs:153:25)",
+"0x55d9d99ef2f7: cedar_policy_core::transitive_closure::compute_tc_internal (cedar-policy-core/src/transitive_closure.rs:82:9)",
+"0x55d9d99ee5ff: cedar_policy_core::transitive_closure::compute_tc (cedar-policy-core/src/transitive_closure.rs:59:15)",
+"0x55d9d9995667: cedar_policy_validator::schema::ValidatorSchema::from_schema_fragments (cedar-policy-validator/src/schema.rs:963:9)",
+"0x55d9d9931b19: <cedar_policy_validator::schema::ValidatorSchema as core::convert::TryFrom<cedar_policy_validator::schema_file_format::SchemaFragment>>::try_from (cedar-policy-validator/src/schema.rs:808:9)",
+"0x55d9d9b2291e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9a9cf27: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a9cf27: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a9cf27: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9a9cf27: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
+"0x55d9d9acdcae: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acbde7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9af11fe: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a6ca86: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1358:37)",
+"0x55d9d9b71106: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:280:28)",
+"0x55d9d9f72679: <alloc::sync::Arc<T> as core::default::Default>::default (alloc/src/sync.rs:2624:9)",
+"0x55d9d9fc34f7: <regex_automata::util::captures::GroupInfo as core::default::Default>::default (src/util/captures.rs:1450:22)",
+"0x55d9d9efb514: <regex_automata::nfa::thompson::nfa::Inner as core::default::Default>::default (nfa/thompson/nfa.rs:1214:5)",
+"0x55d9d9f659ab: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:423:23)",
+"0x55d9d9eec24b: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
+"0x55d9d9eec24b: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
+"0x55d9d9eec24b: alloc::slice::<impl [T]>::to_vec (alloc/src/slice.rs:416:14)",
+"0x55d9d9f66d82: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:464:33)",
+"0x55d9d999ee9c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d993a381: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d993a381: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d993a381: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d993a381: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9948e5e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9948457: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d99dc05e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d98d8bf6: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_in_fixes_resource (cedar-policy-validator/src/rbac.rs:182:14)",
+"0x55d9d9863a29: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d98cbffe: <serde_json::value::ser::SerializeStructVariant as serde::ser::SerializeStructVariant>::serialize_field (src/value/ser.rs:694:25)",
+"0x55d9d986442e: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9863fed: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d99c3554: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d99c3554: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d99c3554: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d99d5308: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9a2b5f4: cedar_policy_validator::typecheck::Typechecker::typecheck_in (cedar-policy-validator/src/typecheck.rs:1536:17)",
+"0x55d9d9a2a3d3: cedar_policy_validator::typecheck::Typechecker::typecheck_binary (cedar-policy-validator/src/typecheck.rs:1312:17)",
+"0x55d9d9a28a58: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:920:17)",
+"0x55d9d9a2a14e: cedar_policy_validator::typecheck::Typechecker::typecheck_binary (cedar-policy-validator/src/typecheck.rs:1225:30)",
+"0x55d9d9b20bbe: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9a99841: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a99841: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a99841: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9a99841: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
+"0x55d9d9acdbdb: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9accf66: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9af102b: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a626b8: <cedar_policy_core::est::head_constraints::ActionConstraint as core::convert::From<cedar_policy_core::ast::policy::ActionConstraint>>::from (src/est/head_constraints.rs:376:31)",
+"0x55d9da1506d3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9da152fc9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9da100df1: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9f7b144: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3439:13)",
+"0x55d9d9f3da33: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9f437b9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9ee3ac1: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9fc0182: regex_automata::util::captures::GroupInfoInner::add_first_group (src/util/captures.rs:2202:9)",
+"0x55d9d9916017: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}}::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:706:37)",
+"0x55d9d9910ed5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
+"0x55d9d9915c06: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:702:25)",
+"0x55d9d9910115: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d9771fc6: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_any (serde_json-1.0.107/src/de.rs:1421:45)",
+"0x55d9d9a40d52: cedar_policy_core::ast::expr::ExprBuilder<T>::neg (src/ast/expr.rs:1009:18)",
+"0x55d9d9922b14: cedar_policy_validator::typecheck::Typechecker::typecheck_unary::{{closure}} (cedar-policy-validator/src/typecheck.rs:1984:25)",
+"0x55d9d990fafc: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d9a2c6e0: cedar_policy_validator::typecheck::Typechecker::typecheck_unary (cedar-policy-validator/src/typecheck.rs:1982:17)",
+"0x55d9d9a28a1e: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:917:17)",
+"0x55d9d986574c: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d99eff33: cedar_policy_core::transitive_closure::enforce_dag_from_tc (cedar-policy-core/src/transitive_closure.rs:177:12)",
+"0x55d9d99ee7a1: cedar_policy_core::transitive_closure::compute_tc (cedar-policy-core/src/transitive_closure.rs:61:16)",
+"0x55d9d9880537: cedar_policy_core::entities::Entities::from_entities (cedar-policy-core/src/entities.rs:152:17)",
+"0x55d9d98541b5: cedar_policy_core::entities::json::entities::EntityJsonParser<S>::parse_ejsons (entities/json/entities.rs:165:9)",
+"0x55d9d977a35e: cedar_policy_core::entities::json::entities::EntityJsonParser<S>::from_json_file (entities/json/entities.rs:117:9)",
+"0x55d9d9cbd0a2: serde::__private::de::content::ContentRefDeserializer<E>::invalid_type (src/private/de.rs:1638:13)",
+"0x55d9d9cbd112: serde::__private::de::content::ContentRefDeserializer<E>::deserialize_integer (src/private/de.rs:1654:26)",
+"0x55d9d9cb7956: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_i64 (src/private/de.rs:1788:13)",
+"0x55d9d9b0afcd: <cedar_policy_core::ast::value::Set as core::iter::traits::collect::FromIterator<cedar_policy_core::ast::value::Value>>::from_iter (src/ast/value.rs:235:32)",
+"0x55d9d9c5a1e7: cedar_policy_core::entities::build_evaluated_entities::{{closure}}::{{closure}} (cedar-policy-core/src/entities.rs:322:41)",
+"0x55d9d9af50d0: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
+"0x55d9d9c82972: cedar_policy_core::parser::cst_to_ast::construct_expr_rel (src/parser/cst_to_ast.rs:1996:27)",
+"0x55d9d98b3679: cedar_policy_core::entities::json::jsonvalue::ValueParser::val_into_rexpr (entities/json/jsonvalue.rs:366:24)",
+"0x55d9d98d763c: cedar_policy_core::entities::json::context::ContextJsonParser<S>::from_json_value (entities/json/context.rs:80:21)",
+"0x55d9d9a9c982: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a9c982: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a9c982: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9a9c982: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9acda6e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acd057: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c2a3ee: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a70e8e: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1655:35)",
+"0x55d9da185465: regex_syntax::hir::Hir::concat (src/hir/mod.rs:477:13)",
+"0x55d9da11e230: regex_syntax::ast::parse::ParserI<P>::push_or_add_alternation (src/ast/parse.rs:667:19)",
+"0x55d9da11df0a: regex_syntax::ast::parse::ParserI<P>::push_alternate (src/ast/parse.rs:650:9)",
+"0x55d9da122ba8: regex_syntax::ast::parse::ParserI<P>::parse_with_comments (src/ast/parse.rs:976:33)",
+"0x55d9d9b1dfae: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9a9ab4b: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a9ab4b: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a9ab4b: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9a9ab4b: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9acdebe: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acc357: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c2a42e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a716b1: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Name>>>::to_name (src/parser/cst_to_ast.rs:1711:28)",
+"0x55d9d9ca0206: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9ca0206: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9ca0206: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:139:27)",
+"0x55d9d9ac44b8: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
+"0x55d9d9ac44b8: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
+"0x55d9d9ac44b8: <alloc::vec::Vec<T,A> as core::clone::Clone>::clone (src/vec/mod.rs:2643:9)",
+"0x55d9d9d0138e: <cedar_policy_core::est::expr::ExprNoExt as core::clone::Clone>::clone (src/est/expr.rs:233:9)",
+"0x55d9d9d00a27: <cedar_policy_core::est::expr::Expr as core::clone::Clone>::clone (src/est/expr.rs:37:15)",
+"0x55d9d9c9da22: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:511:17)",
+"0x55d9d9a2a613: cedar_policy_validator::typecheck::Typechecker::typecheck_binary (cedar-policy-validator/src/typecheck.rs:1226:30)",
+"0x55d9d9905aa4: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9905aa4: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_entities_satisfying_constraint (cedar-policy-validator/src/rbac.rs:398:37)",
+"0x55d9d99047bf: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
+"0x55d9d9d3d16a: <indexmap::map::core::IndexMapCore<K,V> as core::clone::Clone>::clone_from (src/map/core.rs:75:13)",
+"0x55d9d9bad504: cedar_policy_core::extensions::ipaddr::extension (src/extensions/ipaddr.rs:295:13)",
+"0x55d9d9a5d22e: cedar_policy_validator::extensions::partial_evaluation::get_argument_types (src/extensions/partial_evaluation.rs:27:22)",
+"0x55d9d9a5a076: cedar_policy_validator::extensions::partial_evaluation::extension_schema::{{closure}} (src/extensions/partial_evaluation.rs:56:17)",
+"0x55d9d9a59e5f: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
+"0x55d9d99e7152: core::option::Option<T>::map (core/src/option.rs:1099:29)",
+"0x55d9d99d8d59: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::next (iter/adapters/map.rs:103:9)",
+"0x55d9d994162c: alloc::vec::Vec<T,A>::extend_desugared (src/vec/mod.rs:2812:35)",
+"0x55d9d9b2c983: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9b3d189: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9abae7a: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9cbe1a9: cedar_policy_core::ast::name::Name::type_in_namespace (src/ast/name.rs:77:9)",
+"0x55d9d9930915: cedar_policy_validator::schema::ValidatorNamespaceDef::parse_action_id_with_namespace (cedar-policy-validator/src/schema.rs:654:36)",
+"0x55d9da18b24a: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9da18b24a: regex_syntax::hir::Properties::capture (src/hir/mod.rs:2481:20)",
+"0x55d9d9be21c5: cedar_policy_core::ast::expr::ExprBuilder<T>::sub (src/ast/expr.rs:992:19)",
+"0x55d9d9c94ef0: cedar_policy_core::ast::expr::Expr::sub (src/ast/expr.rs:382:9)",
+"0x55d9d9c9cd9f: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:521:67)",
+"0x55d9d999b65b: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d999b65b: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_in_fixes_principal::{{closure}} (cedar-policy-validator/src/rbac.rs:175:21)",
+"0x55d9d999ad8b: core::ops::function::impls::<impl core::ops::function::Fn<A> for &F>::call (src/ops/function.rs:263:13)",
+"0x55d9d999b9dc: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_any_contain::{{closure}} (cedar-policy-validator/src/rbac.rs:245:17)",
+"0x55d9d9908a7b: <core::slice::iter::Iter<T> as core::iter::traits::iterator::Iterator>::any (slice/iter/macros.rs:232:24)",
+"0x55d9d9904d07: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_any_contain (cedar-policy-validator/src/rbac.rs:244:13)",
+"0x55d9d9904a5d: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_in_fixes (cedar-policy-validator/src/rbac.rs:208:16)",
+"0x55d9d992cc0e: cedar_policy_validator::extensions::decimal::get_argument_types (src/extensions/decimal.rs:29:22)",
+"0x55d9d9a5ba7d: cedar_policy_validator::extensions::decimal::extension_schema::{{closure}} (src/extensions/decimal.rs:72:17)",
+"0x55d9d9a5b82f: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
+"0x55d9d99e6192: core::option::Option<T>::map (core/src/option.rs:1099:29)",
+"0x55d9d99d8d0d: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::next (iter/adapters/map.rs:103:9)",
+"0x55d9d994292c: alloc::vec::Vec<T,A>::extend_desugared (src/vec/mod.rs:2812:35)",
+"0x55d9d9938d7f: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:26:32)",
+"0x55d9d9ad0595: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9ad0595: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
+"0x55d9d9b0b621: cedar_policy_core::ast::value::Value::set (src/ast/value.rs:437:28)",
+"0x55d9d9a751e0: serde::de::Visitor::visit_str (src/de/mod.rs:1491:13)",
+"0x55d9d9cb6a9b: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:1738:43)",
+"0x55d9d9dc12b9: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
+"0x55d9d9dc012c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9dbf9bd: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9dbf9bd: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9dbf9bd: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:162:25)",
+"0x55d9d9dbfe3b: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
+"0x55d9d9dbfe3b: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
+"0x55d9d9dbfe3b: alloc::slice::<impl [T]>::to_vec (alloc/src/slice.rs:416:14)",
+"0x55d9d9dbfe3b: alloc::slice::<impl alloc::borrow::ToOwned for [T]>::to_owned (alloc/src/slice.rs:823:14)",
+"0x55d9d9dbfab2: alloc::str::<impl alloc::borrow::ToOwned for str>::to_owned (alloc/src/str.rs:209:46)",
+"0x55d9d9dbfab2: <alloc::string::String as core::convert::From<&str>>::from (alloc/src/string.rs:2650:11)",
+"0x55d9d9dbfcba: <T as core::convert::Into<U>>::into (src/convert/mod.rs:727:9)",
+"0x55d9d9babf4a: cedar_policy_core::extensions::ipaddr::as_ipaddr (src/extensions/ipaddr.rs:211:13)",
+"0x55d9da188ff0: <regex_syntax::hir::Hir as core::ops::drop::Drop>::drop (src/hir/mod.rs:1853:49)",
+"0x55d9d99381e8: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d99381e8: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d99381e8: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d99381e8: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d994911e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d99487e9: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d99dc07e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9982959: cedar_policy_validator::extensions::ipaddr::extension_schema (src/extensions/ipaddr.rs:59:47)",
+"0x55d9d9a9d7bb: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a9d7bb: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a9d7bb: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9a9d7bb: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9acde1e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acbf67: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9af155e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9c5bd6b: cedar_policy_core::evaluator::Evaluator::get_attr::{{closure}} (cedar-policy-core/src/evaluator.rs:679:25)",
+"0x55d9d9c83643: cedar_policy_core::parser::cst_to_ast::construct_ext_meth (src/parser/cst_to_ast.rs:2062:16)",
+"0x55d9d9cbeffe: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::ast::name::Id>::to_meth (src/parser/cst_to_ast.rs:440:26)",
+"0x55d9d9b2ea51: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9b3cee9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9abb912: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9d3da0b: cedar_policy_core::parser::unescape::to_pattern::{{closure}} (src/parser/unescape.rs:56:13)",
+"0x55d9d9be7924: rustc_lexer::unescape::unescape_str_or_byte_str (rustc_lexer-0.1.0/src/unescape.rs:257:9)",
+"0x55d9da11fa84: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9da11fa84: regex_syntax::ast::parse::ParserI<P>::pop_group (src/ast/parse.rs:764:29)",
+"0x55d9da122b2e: regex_syntax::ast::parse::ParserI<P>::parse_with_comments (src/ast/parse.rs:975:33)",
+"0x55d9d9c9e5bc: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:498:17)",
+"0x55d9da1800b1: <regex_syntax::ast::Ast as core::ops::drop::Drop>::drop (src/ast/mod.rs:1564:25)",
+"0x55d9da175f87: core::ptr::drop_in_place<regex_syntax::ast::Ast> (src/ptr/mod.rs:490:1)",
+"0x55d9da176b40: core::ptr::drop_in_place<[regex_syntax::ast::Ast]> (src/ptr/mod.rs:490:1)",
+"0x55d9da105e7b: <alloc::vec::Vec<T,A> as core::ops::drop::Drop>::drop (src/vec/mod.rs:3018:13)",
+"0x55d9da177927: core::ptr::drop_in_place<alloc::vec::Vec<regex_syntax::ast::Ast>> (src/ptr/mod.rs:490:1)",
+"0x55d9d9ed7e87: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3442:5)",
+"0x55d9d9ec7d7f: <serde_json::de::MapKey<R> as serde::de::Deserializer>::deserialize_any (serde_json-1.0.107/src/de.rs:2186:37)",
+"0x55d9d9c9d5c7: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:515:17)",
+"0x55d9d9fc019f: regex_automata::util::captures::GroupInfoInner::add_first_group (src/util/captures.rs:2203:33)",
+"0x55d9da1b0420: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
+"0x55d9da1b0420: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9da1b0420: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9da1b0420: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9da1b0420: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:162:25)",
+"0x55d9da1b0420: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
+"0x55d9da1b0420: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
+"0x55d9da1b0420: alloc::slice::<impl [T]>::to_vec (alloc/src/slice.rs:416:14)",
+"0x55d9da1b0420: std::sys::unix::os::getenv (sys/unix/os.rs:571:76)",
+"0x55d9da1b0420: std::env::_var_os (std/src/env.rs:266:5)",
+"0x55d9da1b0213: std::env::var_os (std/src/env.rs:262:5)",
+"0x55d9da1b0213: std::env::_var (std/src/env.rs:232:11)",
+"0x55d9d9dc5ee6: std::env::var (std/src/env.rs:228:5)",
+"0x55d9d9758682: cedar_policy::integration_testing::resolve_integration_test_path (cedar-policy/src/integration_testing.rs:110:28)",
+"0x55d9d9919e25: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:1130:29)",
+"0x55d9d991402b: cedar_policy_validator::typecheck::TypecheckAnswer::sequence_all_then_typecheck (cedar-policy-validator/src/typecheck.rs:217:19)",
+"0x55d9d9be3c6d: cedar_policy_core::ast::expr::ExprBuilder<T>::get_attr (src/ast/expr.rs:1098:19)",
+"0x55d9d9c959c0: cedar_policy_core::ast::expr::Expr::get_attr (src/ast/expr.rs:451:9)",
+"0x55d9d9c9b1f5: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:558:20)",
+"0x55d9d98b445f: cedar_policy_core::entities::json::jsonvalue::ValueParser::val_into_rexpr (entities/json/jsonvalue.rs:314:58)",
+"0x55d9d98b8401: cedar_policy_core::entities::json::jsonvalue::ValueParser::val_into_rexpr::{{closure}} (entities/json/jsonvalue.rs:345:43)",
+"0x55d9d97589bd: cedar_policy::integration_testing::resolve_integration_test_path (cedar-policy/src/integration_testing.rs:112:24)",
+"0x55d9d9757374: corpus_tests::corpus_tests (cedar-policy/tests/corpus_tests.rs:50:31)",
+"0x55d9d9ebe4be: serde_json::read::parse_escape (serde_json-1.0.107/src/read.rs:861:17)",
+"0x55d9d9759162: cedar_policy::integration_testing::perform_integration_test_from_json_custom (cedar-policy/src/integration_testing.rs:227:23)",
+"0x55d9d9993b22: cedar_policy_validator::schema::ValidatorNamespaceDef::parse_unqualified_name_with_namespace (cedar-policy-validator/src/schema.rs:630:35)",
+"0x55d9d97c6f49: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
+"0x55d9d97c1488: hashbrown::raw::alloc::inner::do_alloc (src/raw/alloc.rs:11:15)",
+"0x55d9d97bf05e: hashbrown::raw::RawTableInner<A>::new_uninitialized (src/raw/mod.rs:1080:38)",
+"0x55d9d97800bd: hashbrown::raw::RawTable<T,A>::new_uninitialized (src/raw/mod.rs:442:20)",
+"0x55d9d977dc11: <hashbrown::raw::RawTable<T,A> as core::clone::Clone>::clone (src/raw/mod.rs:1606:39)",
+"0x55d9d9779792: <hashbrown::map::HashMap<K,V,S,A> as core::clone::Clone>::clone (hashbrown-0.12.3/src/map.rs:197:20)",
+"0x55d9d9763e0c: <std::collections::hash::map::HashMap<K,V,S> as core::clone::Clone>::clone (collections/hash/map.rs:1267:22)",
+"0x55d9d9a409bf: cedar_policy_core::ast::expr::ExprBuilder<T>::ite (src/ast/expr.rs:901:24)",
+"0x55d9da184a67: regex_syntax::hir::Hir::concat (src/hir/mod.rs:472:21)",
+"0x55d9d9edda77: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9edda77: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9edda77: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9edda77: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
+"0x55d9d9eea1fe: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9ee9d47: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9f1664e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9facb5b: regex_automata::dfa::remapper::Remapper::new (src/dfa/remapper.rs:93:19)",
+"0x55d9d98c8ba5: cedar_policy::api::LosslessPolicy::policy_or_template_text (cedar-policy/src/api.rs:2429:19)",
+"0x55d9d9905ba0: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9905ba0: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_entities_satisfying_constraint (cedar-policy-validator/src/rbac.rs:406:17)",
+"0x55d9d9cf3fe1: cedar_policy_core::est::expr::Expr::neg (src/est/expr.rs:283:47)",
+"0x55d9d9cfb9c0: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Unary>>::try_from (src/est/expr.rs:1020:29)",
+"0x55d9d9cfabf0: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Mult>>::try_from (src/est/expr.rs:960:24)",
+"0x55d9d9d3c2be: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
+"0x55d9d9a31ea6: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9a31ea6: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
+"0x55d9d9a3ffd1: cedar_policy_core::ast::expr::ExprBuilder<T>::call_extension_fn (src/ast/expr.rs:1069:19)",
+"0x55d9d9a2d7e6: cedar_policy_validator::typecheck::Typechecker::typecheck_extension (cedar-policy-validator/src/typecheck.rs:2189:29)",
+"0x55d9d9a28acc: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:926:17)",
+"0x55d9d9a291d4: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:932:30)",
+"0x55d9d9a40a32: cedar_policy_core::ast::expr::ExprBuilder<T>::ite (src/ast/expr.rs:902:24)",
+"0x55d9d97d8202: alloc::raw_vec::finish_grow (alloc/src/raw_vec.rs:0:0)",
+"0x55d9d97d8621: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d97d8621: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d97ff10d: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d97ff10d: test::run_tests::get_timed_out_tests (test/src/lib.rs:362:17)",
+"0x55d9d97e205b: test::run_tests (test/src/lib.rs:417:33)",
+"0x55d9d97e205b: test::console::run_tests_console (test/src/console.rs:329:5)",
+"0x55d9d97fdc8e: test::test_main (test/src/lib.rs:139:15)",
+"0x55d9d97febc1: test::test_main_static (test/src/lib.rs:158:5)",
+"0x55d9d97578c3: corpus_tests::main (cedar-policy/tests/corpus_tests.rs:1:1)",
+"0x55d9d977b8cb: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d991c6c9: cedar_policy_validator::typecheck::Typechecker::typecheck_binary::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1362:41)",
+"0x55d9d9911348: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d991c427: cedar_policy_validator::typecheck::Typechecker::typecheck_binary::{{closure}} (cedar-policy-validator/src/typecheck.rs:1358:25)",
+"0x55d9d9911c65: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d9c5b6a5: cedar_policy_core::evaluator::Evaluator::partial_interpret::{{closure}} (cedar-policy-core/src/evaluator.rs:499:32)",
+"0x55d9d9af3adf: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
+"0x55d9d9b9efb8: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
+"0x55d9d9aee97f: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
+"0x55d9d9924130: <serde::de::impls::<impl serde::de::Deserialize for alloc::vec::Vec<T>>::deserialize::VecVisitor<T> as serde::de::Visitor>::visit_seq (src/de/impls.rs:1035:21)",
+"0x55d9d9a059b1: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_seq (serde_json-1.0.107/src/de.rs:1740:31)",
+"0x55d9d9c82cbd: cedar_policy_core::parser::cst_to_ast::construct_expr_attr (src/parser/cst_to_ast.rs:2033:5)",
+"0x55d9d9a6f3b0: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1526:38)",
+"0x55d9d9b0af1a: <cedar_policy_core::ast::value::Set as core::iter::traits::collect::FromIterator<cedar_policy_core::ast::value::Value>>::from_iter (src/ast/value.rs:215:28)",
+"0x55d9d9d21adf: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce101 (src/parser/grammar.rs:29986:20)",
+"0x55d9d9d0eee2: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26922:17)",
+"0x55d9d9d4df06: lalrpop_util::state_machine::Parser<D,I>::parse (lalrpop-util-0.20.0/src/state_machine.rs:264:38)",
+"0x55d9d9900928: alloc::collections::btree::map::BTreeMap<K,V,A>::bulk_build_from_sorted_iter (collections/btree/map.rs:1508:24)",
+"0x55d9d9b205de: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9aa93f8: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa93f8: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa93f8: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9cbd7e0: <serde::__private::de::content::ContentVisitor as serde::de::Visitor>::visit_seq (src/private/de.rs:492:17)",
+"0x55d9d9a9742d: serde_json::value::de::visit_array (src/value/de.rs:178:20)",
+"0x55d9d9a60030: serde_json::value::de::<impl serde::de::Deserializer for serde_json::value::Value>::deserialize_any (src/value/de.rs:222:32)",
+"0x55d9d9be2e08: cedar_policy_core::ast::expr::ExprBuilder<T>::set (src/ast/expr.rs:1054:43)",
+"0x55d9d9bdf6c7: cedar_policy_core::ast::expr::Expr::set (src/ast/expr.rs:420:9)",
+"0x55d9d9c5aac2: cedar_policy_core::ast::policy::ActionConstraint::euids_into_expr (src/ast/policy.rs:1339:9)",
+"0x55d9d9c8635f: cedar_policy_core::ast::policy::ActionConstraint::as_expr (src/ast/policy.rs:1348:17)",
+"0x55d9d9c84c17: cedar_policy_core::ast::policy::TemplateBody::action_constraint_expr (src/ast/policy.rs:870:9)",
+"0x55d9d9cf49fd: cedar_policy_core::est::expr::Expr::and (src/est/expr.rs:346:20)",
+"0x55d9d9bb51bf: <cedar_policy_core::extensions::ALL_AVAILABLE_EXTENSIONS as core::ops::deref::Deref>::deref::__static_ref_initialize (cedar-policy-core/src/extensions.rs:31:59)",
+"0x55d9d9bb51bf: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9b081fa: lazy_static::lazy::Lazy<T>::get (lazy_static-1.4.0/src/inline_lazy.rs:30:9)",
+"0x55d9d9b081fa: <cedar_policy_core::extensions::ALL_AVAILABLE_EXTENSIONS as core::ops::deref::Deref>::deref::__stability (lazy_static-1.4.0/src/lib.rs:142:21)",
+"0x55d9d9b081fa: <cedar_policy_core::extensions::ALL_AVAILABLE_EXTENSIONS as core::ops::deref::Deref>::deref (lazy_static-1.4.0/src/lib.rs:144:17)",
+"0x55d9d9aa51a7: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa51a7: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa51a7: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9aa51a7: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
+"0x55d9d9ac01c0: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
+"0x55d9d9acca49: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9af127e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9c5aa38: cedar_policy_core::ast::policy::ActionConstraint::is_in (src/ast/policy.rs:1330:30)",
+"0x55d9d9932efd: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9932efd: <cedar_policy_validator::schema::ValidatorActionId as cedar_policy_core::transitive_closure::TCNode<cedar_policy_core::ast::entity::EntityUID>>::out_edges (cedar-policy-validator/src/schema.rs:1501:9)",
+"0x55d9d99f0346: cedar_policy_core::transitive_closure::add_ancestors_to_set (cedar-policy-core/src/transitive_closure.rs:153:25)",
+"0x55d9d99ef767: cedar_policy_core::transitive_closure::compute_tc_internal (cedar-policy-core/src/transitive_closure.rs:82:9)",
+"0x55d9d99ee4f0: cedar_policy_core::transitive_closure::compute_tc (cedar-policy-core/src/transitive_closure.rs:59:15)",
+"0x55d9d9995781: cedar_policy_validator::schema::ValidatorSchema::from_schema_fragments (cedar-policy-validator/src/schema.rs:966:9)",
+"0x55d9d999b80c: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_none_equal::{{closure}} (cedar-policy-validator/src/rbac.rs:223:17)",
+"0x55d9d99089bb: <core::slice::iter::Iter<T> as core::iter::traits::iterator::Iterator>::any (slice/iter/macros.rs:232:24)",
+"0x55d9d9904b49: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_none_equal (cedar-policy-validator/src/rbac.rs:222:14)",
+"0x55d9d9904a13: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_in_fixes (cedar-policy-validator/src/rbac.rs:207:9)",
+"0x55d9d9ca04fc: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:146:32)",
+"0x55d9d99339e1: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d99339e1: <cedar_policy_validator::schema::ActionHeadVar as cedar_policy_validator::schema::HeadVar<cedar_policy_core::ast::entity::EntityUID>>::get_descendants_if_present (cedar-policy-validator/src/schema.rs:1669:37)",
+"0x55d9d9997ee6: cedar_policy_validator::schema::ValidatorSchema::get_entities_in (cedar-policy-validator/src/schema.rs:1167:9)",
+"0x55d9d999829a: cedar_policy_validator::schema::ValidatorSchema::get_entities_in_set::{{closure}} (cedar-policy-validator/src/schema.rs:1187:32)",
+"0x55d9d99de11b: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
+"0x55d9d98deeef: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
+"0x55d9d99d8feb: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
+"0x55d9d9ef71f2: regex_automata::nfa::thompson::nfa::Inner::set_starts (nfa/thompson/nfa.rs:1400:30)",
+"0x55d9d9f65b81: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:438:9)",
+"0x55d9d9cf4ebc: cedar_policy_core::est::expr::Expr::mul (src/est/expr.rs:377:19)",
+"0x55d9d9cfb183: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Mult>>::try_from (src/est/expr.rs:970:28)",
+"0x55d9d9cf9c79: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Add>>::try_from (src/est/expr.rs:874:24)",
+"0x55d9d9d3c29e: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
+"0x55d9d9a40ed2: cedar_policy_core::ast::expr::ExprBuilder<T>::not (src/ast/expr.rs:911:18)",
+"0x55d9d99227de: cedar_policy_validator::typecheck::Typechecker::typecheck_unary::{{closure}} (cedar-policy-validator/src/typecheck.rs:1958:29)",
+"0x55d9d990e4b3: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
+"0x55d9d9a2c64b: cedar_policy_validator::typecheck::Typechecker::typecheck_unary (cedar-policy-validator/src/typecheck.rs:1951:17)",
+"0x55d9d9f66866: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:517:38)",
+"0x55d9d9866850: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9c8383b: cedar_policy_core::parser::cst_to_ast::construct_expr_set (src/parser/cst_to_ast.rs:2069:5)",
+"0x55d9d9a711a0: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1649:46)",
+"0x55d9d9a6c99d: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1355:26)",
+"0x55d9d9856ad7: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
+"0x55d9d9856ad7: alloc::sync::Arc<T>::allocate_for_ptr::{{closure}} (alloc/src/sync.rs:1343:33)",
+"0x55d9d9856d0d: alloc::sync::Arc<T>::try_allocate_for_layout (alloc/src/sync.rs:1322:19)",
+"0x55d9d9856bc3: alloc::sync::Arc<T>::allocate_for_layout (alloc/src/sync.rs:1304:13)",
+"0x55d9d9856aa2: alloc::sync::Arc<T>::allocate_for_ptr (alloc/src/sync.rs:1341:13)",
+"0x55d9d9856f28: alloc::sync::Arc<T>::from_box (alloc/src/sync.rs:1356:23)",
+"0x55d9d98571ab: <alloc::sync::Arc<T> as core::convert::From<alloc::boxed::Box<T>>>::from (alloc/src/sync.rs:2729:9)",
+"0x55d9d989272b: <T as core::convert::Into<U>>::into (src/convert/mod.rs:727:9)",
+"0x55d9d9865532: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9b70c88: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:311:35)",
+"0x55d9d9ed7e77: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3442:5)",
+"0x55d9d999943b: <T as alloc::alloc::WriteCloneIntoRaw>::write_clone_into_raw (alloc/src/alloc.rs:427:31)",
+"0x55d9d9919f54: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:1138:57)",
+"0x55d9d9a28daf: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:1120:17)",
+"0x55d9d9919b9f: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:1112:33)",
+"0x55d9d99e0a7e: core::iter::adapters::map::map_fold::{{closure}} (iter/adapters/map.rs:84:28)",
+"0x55d9d98c2426: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d98c2426: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d98c2426: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:139:27)",
+"0x55d9d9890268: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
+"0x55d9d9890268: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
+"0x55d9d9890268: <alloc::vec::Vec<T,A> as core::clone::Clone>::clone (src/vec/mod.rs:2643:9)",
+"0x55d9d98d45d8: <cedar_policy_core::est::head_constraints::ActionInConstraint as core::clone::Clone>::clone (src/est/head_constraints.rs:115:9)",
+"0x55d9d98d4525: <cedar_policy_core::est::head_constraints::ActionConstraint as core::clone::Clone>::clone (src/est/head_constraints.rs:51:8)",
+"0x55d9d985745e: <cedar_policy_core::est::Policy as core::clone::Clone>::clone (cedar-policy-core/src/est.rs:45:5)",
+"0x55d9d9cf4ded: cedar_policy_core::est::expr::Expr::sub (src/est/expr.rs:370:20)",
+"0x55d9d9cfa27e: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Add>>::try_from (src/est/expr.rs:887:28)",
+"0x55d9d9cf8fbd: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Relation>>::try_from (src/est/expr.rs:785:32)",
+"0x55d9d992205c: cedar_policy_validator::typecheck::Typechecker::entity_in_descendants (cedar-policy-validator/src/typecheck.rs:1920:13)",
+"0x55d9d9921896: cedar_policy_validator::typecheck::Typechecker::type_of_euid_in_euids (cedar-policy-validator/src/typecheck.rs:1888:13)",
+"0x55d9d99211ae: cedar_policy_validator::typecheck::Typechecker::type_of_entity_literal_in_entity_literals (cedar-policy-validator/src/typecheck.rs:1831:25)",
+"0x55d9d991de89: cedar_policy_validator::typecheck::Typechecker::typecheck_in::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1616:30)",
+"0x55d9d9a4104b: cedar_policy_core::ast::expr::ExprBuilder<T>::set (src/ast/expr.rs:1054:43)",
+"0x55d9d991a01e: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:1138:29)",
+"0x55d9d9b3e5a8: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
+"0x55d9d9abd3f0: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
+"0x55d9d9abd3f0: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
+"0x55d9d9abc6ca: alloc::vec::Vec<T,A>::insert (src/vec/mod.rs:1446:13)",
+"0x55d9d9cbef89: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::ast::name::Id>::to_meth (src/parser/cst_to_ast.rs:438:21)",
+"0x55d9d9ccdbdf: cedar_policy_core::parser::text_to_cst::grammar::__action161 (src/parser/grammar.rs:59903:5)",
+"0x55d9d9d2414f: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce120 (src/parser/grammar.rs:30344:20)",
+"0x55d9d9d0f33b: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26988:17)",
+"0x55d9d9b20eae: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9a9c0d5: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a9c0d5: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a9c0d5: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9a9c0d5: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9acdabe: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acc837: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c5f9e2: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9c5f9e2: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
+"0x55d9d9a93c60: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d9d1a7a8: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce43 (src/parser/grammar.rs:28842:20)",
+"0x55d9d9d0e354: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26748:17)",
+"0x55d9d99c5bc4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d99c5bc4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d99c5bc4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d99d5b48: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9ccd73f: cedar_policy_core::parser::text_to_cst::grammar::__action157 (src/parser/grammar.rs:59845:5)",
+"0x55d9d9cd4291: cedar_policy_core::parser::text_to_cst::grammar::__action223 (src/parser/grammar.rs:61591:5)",
+"0x55d9d9d19d18: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce38 (src/parser/grammar.rs:28741:20)",
+"0x55d9d9d0e255: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26733:17)",
+"0x55d9d9c9b111: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:558:40)",
+"0x55d9d99907b3: cedar_policy_validator::schema::WithUnresolvedTypeDefs<T>::map (cedar-policy-validator/src/schema.rs:175:85)",
+"0x55d9d993177d: cedar_policy_validator::schema::ValidatorNamespaceDef::try_schema_type_into_validator_type (cedar-policy-validator/src/schema.rs:678:17)",
+"0x55d9d9c85324: cedar_policy_core::ast::policy::PrincipalConstraint::as_expr (src/ast/policy.rs:980:9)",
+"0x55d9d9c84bde: cedar_policy_core::ast::policy::TemplateBody::principal_constraint_expr (src/ast/policy.rs:858:9)",
+"0x55d9d976e283: <serde_json::de::MapKey<R> as serde::de::Deserializer>::deserialize_any (serde_json-1.0.107/src/de.rs:2186:37)",
+"0x55d9d9b6a092: cedar_policy_core::evaluator::RestrictedEvaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:119:23)",
+"0x55d9d9b0b4f2: cedar_policy_core::ast::value::Value::set (src/ast/value.rs:441:32)",
+"0x55d9d9c5b1c6: cedar_policy_core::evaluator::RestrictedEvaluator::partial_interpret::{{closure}} (cedar-policy-core/src/evaluator.rs:105:33)",
+"0x55d9d9af49bf: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
+"0x55d9d9867eea: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d98d8866: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::validate_action_ids (cedar-policy-validator/src/rbac.rs:108:9)",
+"0x55d9d98d936e: cedar_policy_validator::Validator::validate_policy (cedar-policy-validator/src/lib.rs:104:20)",
+"0x55d9d9b1f14e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9a9c377: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a9c377: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a9c377: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9a9c377: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
+"0x55d9d9abf190: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
+"0x55d9d9accdf9: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9af110e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9c6aad3: cedar_policy_core::authorizer::Authorizer::is_authorized_core (cedar-policy-core/src/authorizer.rs:181:22)",
+"0x55d9d9b37ba3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9b3d399: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9abc0fd: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9d504e7: lalrpop_util::state_machine::Parser<D,I>::parse (lalrpop-util-0.20.0/src/state_machine.rs:259:21)",
+"0x55d9d9d4cc1b: lalrpop_util::state_machine::Parser<D,I>::drive (lalrpop-util-0.20.0/src/state_machine.rs:218:9)",
+"0x55d9d9ab6804: alloc::vec::Vec<T,A>::extend_desugared (src/vec/mod.rs:2816:17)",
+"0x55d9d9acd70b: <alloc::vec::Vec<T,A> as alloc::vec::spec_extend::SpecExtend<T,I>>::spec_extend (src/vec/spec_extend.rs:17:9)",
+"0x55d9d9b1bc6c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9a9cc51: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a9cc51: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a9cc51: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9a9cc51: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
+"0x55d9d9acdf8b: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acc5c6: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9d08e6b: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9b1a332: cedar_policy_core::ast::pattern::Pattern::new (src/ast/pattern.rs:69:29)",
+"0x55d9d9c8fdeb: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
+"0x55d9d9c1aae7: core::option::Option<T>::map (core/src/option.rs:1099:29)",
+"0x55d9d9aecda9: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::next (iter/adapters/map.rs:103:9)",
+"0x55d9da18515c: regex_syntax::hir::Hir::concat (src/hir/mod.rs:439:42)",
+"0x55d9d9b51484: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d9b51484: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d9b51484: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d9b65ad8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9863afb: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9a754d7: serde::de::Visitor::visit_u64 (src/de/mod.rs:1421:13)",
+"0x55d9d9cb7368: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:1730:36)",
+"0x55d9d9a7a5b5: cedar_policy_core::entities::json::jsonvalue::_::<impl serde::de::Deserialize for cedar_policy_core::entities::json::jsonvalue::JSONValue>::deserialize (entities/json/jsonvalue.rs:38:39)",
+"0x55d9d9864a89: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9864cb0: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d99f28f2: <serde::__private::de::content::ContentVisitor as serde::de::Visitor>::visit_str (src/private/de.rs:421:32)",
+"0x55d9d9a74d57: serde::de::Visitor::visit_i64 (src/de/mod.rs:1359:13)",
+"0x55d9d9cb741b: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:1734:36)",
+"0x55d9d9b0c6da: cedar_policy_core::extensions::decimal::as_decimal (src/extensions/decimal.rs:202:13)",
+"0x55d9d9b73ac7: cedar_policy_core::evaluator::Evaluator::get_attr (cedar-policy-core/src/evaluator.rs:710:43)",
+"0x55d9d9babc51: cedar_policy_core::extensions::ipaddr::as_ipaddr (src/extensions/ipaddr.rs:207:13)",
+"0x55d9d9bac5e8: cedar_policy_core::extensions::ipaddr::is_in_range (src/extensions/ipaddr.rs:254:20)",
+"0x55d9d9bb16a8: core::ops::function::Fn::call (src/ops/function.rs:79:5)",
+"0x55d9d9b34363: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9b3cfd9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9abbe3d: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9d4f98b: lalrpop_util::state_machine::Parser<D,I>::parse (lalrpop-util-0.20.0/src/state_machine.rs:259:21)",
+"0x55d9d9d4c05b: lalrpop_util::state_machine::Parser<D,I>::drive (lalrpop-util-0.20.0/src/state_machine.rs:218:9)",
+"0x55d9d9b36d91: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9b3d129: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9ab9b38: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9c6c4b8: cedar_policy_core::authorizer::Authorizer::evaluate_policies (cedar-policy-core/src/authorizer.rs:297:25)",
+"0x55d9d991907f: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:1025:37)",
+"0x55d9d990f6c5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
+"0x55d9d9bf7d3b: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce24 (src/parser/grammar.rs:37190:20)",
+"0x55d9d9bee01b: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35433:17)",
+"0x55d9d9c934e1: cedar_policy_core::parser::cst_to_ast::construct_expr_mul (src/parser/cst_to_ast.rs:2023:16)",
+"0x55d9d9a6b74f: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Mult>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1206:42)",
+"0x55d9d9c9bc42: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:546:17)",
+"0x55d9d9b21a6e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9aa59c7: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa59c7: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa59c7: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9aa59c7: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
+"0x55d9d9abf4f3: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
+"0x55d9d9acbe27: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9b1811e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a8242c: <alloc::collections::btree::map::BTreeMap<K,V> as core::iter::traits::collect::FromIterator<(K,V)>>::from_iter (collections/btree/map.rs:2229:34)",
+"0x55d9d9a5e256: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a5e256: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a5e256: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:139:27)",
+"0x55d9d9ac3f18: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
+"0x55d9d9ac3f18: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
+"0x55d9d9ac3f18: <alloc::vec::Vec<T,A> as core::clone::Clone>::clone (src/vec/mod.rs:2643:9)",
+"0x55d9d9a5edc9: cedar_policy_core::ast::name::unwrap_or_clone::{{closure}} (src/ast/name.rs:32:47)",
+"0x55d9d9c617e7: core::result::Result<T,E>::unwrap_or_else (core/src/result.rs:1464:23)",
+"0x55d9d9a5ed5e: cedar_policy_core::ast::name::unwrap_or_clone (src/ast/name.rs:32:5)",
+"0x55d9d978036d: hashbrown::raw::RawTable<T,A>::new_uninitialized (src/raw/mod.rs:442:20)",
+"0x55d9d977df31: <hashbrown::raw::RawTable<T,A> as core::clone::Clone>::clone (src/raw/mod.rs:1606:39)",
+"0x55d9d9779632: <hashbrown::map::HashMap<K,V,S,A> as core::clone::Clone>::clone (hashbrown-0.12.3/src/map.rs:197:20)",
+"0x55d9d9784f7c: <hashbrown::set::HashSet<T,S,A> as core::clone::Clone>::clone (hashbrown-0.12.3/src/set.rs:122:18)",
+"0x55d9d99ee710: cedar_policy_core::transitive_closure::compute_tc (cedar-policy-core/src/transitive_closure.rs:59:15)",
+"0x55d9d982ac2d: hashbrown::raw::RawTable<T,A>::fallible_with_capacity (src/raw/mod.rs:460:20)",
+"0x55d9d982a5e3: hashbrown::raw::RawTable<T,A>::with_capacity_in (src/raw/mod.rs:481:15)",
+"0x55d9d98269e7: hashbrown::raw::RawTable<T>::with_capacity (src/raw/mod.rs:411:9)",
+"0x55d9d9829534: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d9829534: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d9829534: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d982cca8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d99c2da4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d99c2da4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d99c2da4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d99d57d8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9acd8fb: <alloc::vec::Vec<T,A> as core::iter::traits::collect::Extend<&T>>::extend_one (src/vec/mod.rs:2981:9)",
+"0x55d9d9bdbabb: core::iter::traits::iterator::Iterator::partition::extend::{{closure}} (iter/traits/iterator.rs:2094:21)",
+"0x55d9d9b1c82e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d988c5e8: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d988c5e8: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d988c5e8: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9854e08: <serde::de::impls::<impl serde::de::Deserialize for alloc::vec::Vec<T>>::deserialize::VecVisitor<T> as serde::de::Visitor>::visit_seq (src/de/impls.rs:1032:34)",
+"0x55d9d9815bbd: serde_json::value::de::visit_array (src/value/de.rs:178:20)",
+"0x55d9d98c9624: serde_json::value::de::<impl serde::de::Deserializer for serde_json::value::Value>::deserialize_seq (src/value/de.rs:392:32)",
+"0x55d9d988ffd2: serde::de::impls::<impl serde::de::Deserialize for alloc::vec::Vec<T>>::deserialize (src/de/impls.rs:1045:9)",
+"0x55d9d9bcf9bb: <serde::__private::de::missing_field::MissingFieldDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:40:17)",
+"0x55d9d9bcfacb: serde::de::Deserializer::__deserialize_content (src/de/mod.rs:1231:9)",
+"0x55d9d9cbd33c: <serde::__private::de::content::Content as serde::de::Deserialize>::deserialize (src/private/de.rs:301:13)",
+"0x55d9da18a954: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9da18a954: regex_syntax::hir::Properties::look (src/hir/mod.rs:2421:20)",
+"0x55d9da183fa4: regex_syntax::hir::Hir::look (src/hir/mod.rs:356:21)",
+"0x55d9da171959: regex_syntax::hir::translate::TranslatorI::hir_assertion (src/hir/translate.rs:937:46)",
+"0x55d9da16ad80: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_post (src/hir/translate.rs:409:42)",
+"0x55d9d9d15478: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce7 (src/parser/grammar.rs:28095:20)",
+"0x55d9d9d0dc28: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26640:17)",
+"0x55d9d9a28f99: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:992:30)",
+"0x55d9d9f279cc: regex_automata::dfa::onepass::InternalBuilder::add_start_state (src/dfa/onepass.rs:822:9)",
+"0x55d9d9f260c6: regex_automata::dfa::onepass::InternalBuilder::build (src/dfa/onepass.rs:610:9)",
+"0x55d9d9867668: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d986486f: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d999ebae: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d993b927: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d993b927: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d993b927: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d993b927: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
+"0x55d9d9948f9e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9948557: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9a3e7ce: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a41a58: cedar_policy_core::ast::expr::ExprBuilder<T>::record (src/ast/expr.rs:1060:29)",
+"0x55d9d9c86fd9: cedar_policy_core::est::head_constraints::<impl core::convert::TryFrom<cedar_policy_core::est::head_constraints::ResourceConstraint> for cedar_policy_core::ast::policy::PrincipalOrResourceConstraint>::try_from (src/est/head_constraints.rs:333:83)",
+"0x55d9d9c59d1e: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
+"0x55d9d9c866fc: cedar_policy_core::est::head_constraints::<impl core::convert::TryFrom<cedar_policy_core::est::head_constraints::ResourceConstraint> for cedar_policy_core::ast::policy::ResourceConstraint>::try_from (src/est/head_constraints.rs:226:9)",
+"0x55d9d9c59d7e: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
+"0x55d9d9b7970d: cedar_policy_core::est::Policy::try_into_ast_template (cedar-policy-core/src/est.rs:236:13)",
+"0x55d9d9c9ac5a: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:565:55)",
+"0x55d9d9ccd4eb: cedar_policy_core::parser::text_to_cst::grammar::__action155 (src/parser/grammar.rs:59816:5)",
+"0x55d9d9cd4feb: cedar_policy_core::parser::text_to_cst::grammar::__action231 (src/parser/grammar.rs:61835:5)",
+"0x55d9d9d1b238: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce48 (src/parser/grammar.rs:28943:20)",
+"0x55d9d9d0e453: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26763:17)",
+"0x55d9d997135e: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d997135e: cedar_policy_validator::schema_file_format::SchemaTypeVisitor::build_schema_type (cedar-policy-validator/src/schema_file_format.rs:398:34)",
+"0x55d9d996c37e: <cedar_policy_validator::schema_file_format::SchemaTypeVisitor as serde::de::Visitor>::visit_map (cedar-policy-validator/src/schema_file_format.rs:330:9)",
+"0x55d9d99f1ac0: serde::__private::de::content::visit_content_map_ref (src/private/de.rs:1708:26)",
+"0x55d9d99f0c3c: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:1749:40)",
+"0x55d9d996aa37: <cedar_policy_validator::schema_file_format::SchemaType as serde::de::Deserialize>::deserialize (cedar-policy-validator/src/schema_file_format.rs:206:9)",
+"0x55d9d98e9c47: <core::marker::PhantomData<T> as serde::de::DeserializeSeed>::deserialize (src/de/mod.rs:794:9)",
+"0x55d9d9b70d77: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:319:62)",
+"0x55d9d9d4c1ec: lalrpop_util::state_machine::Parser<D,I>::drive (lalrpop-util-0.20.0/src/state_machine.rs:221:21)",
+"0x55d9d9d0d502: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::PoliciesParser::parse (src/parser/grammar.rs:26558:13)",
+"0x55d9d9bb5b6a: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9b3fe83: cedar_policy_core::parser::text_to_cst::parse_collect_errors (src/parser/text_to_cst.rs:49:18)",
+"0x55d9d9d074a6: cedar_policy_core::parser::text_to_cst::parse_policies (src/parser/text_to_cst.rs:84:5)",
+"0x55d9d9c708ec: cedar_policy_core::parser::parse_policyset_and_also_return_policy_text (cedar-policy-core/src/parser.rs:66:15)",
+"0x55d9d98d94c0: cedar_policy_validator::Validator::validate_policy (cedar-policy-validator/src/lib.rs:107:20)",
+"0x55d9d992383f: cedar_policy_validator::typecheck::Typechecker::typecheck_extension::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:2152:21)",
+"0x55d9d99dea0f: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
+"0x55d9d9863dc6: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9867954: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9a2d52d: cedar_policy_validator::typecheck::Typechecker::typecheck_extension (cedar-policy-validator/src/typecheck.rs:2182:21)",
+"0x55d9d9ad14eb: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9ad14eb: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
+"0x55d9d9c83d3d: cedar_policy_core::ast::policy::Template::link_static_policy (src/ast/policy.rs:211:17)",
+"0x55d9d9c84af4: <cedar_policy_core::ast::policy::Policy as core::convert::From<cedar_policy_core::ast::policy::StaticPolicy>>::from (src/ast/policy.rs:778:27)",
+"0x55d9d9c5a60e: <T as core::convert::Into<U>>::into (src/convert/mod.rs:727:9)",
+"0x55d9d9bb3d80: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9c61ceb: core::result::Result<T,E>::map (core/src/result.rs:759:25)",
+"0x55d9d9b57874: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d9b57874: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d9b57874: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d9b65768: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d988c548: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d988c548: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d988c548: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9855288: <serde::de::impls::<impl serde::de::Deserialize for alloc::vec::Vec<T>>::deserialize::VecVisitor<T> as serde::de::Visitor>::visit_seq (src/de/impls.rs:1032:34)",
+"0x55d9d984af00: serde::__private::de::content::visit_content_seq_ref (src/private/de.rs:1688:26)",
+"0x55d9d983d103: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_seq (src/private/de.rs:1936:40)",
+"0x55d9d988fff6: serde::de::impls::<impl serde::de::Deserialize for alloc::vec::Vec<T>>::deserialize (src/de/impls.rs:1045:9)",
+"0x55d9d9cb97a6: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9cb97a6: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9cb97a6: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:139:27)",
+"0x55d9d9d53fa3: <serde::__private::de::content::Content as core::clone::Clone>::clone (src/private/de.rs:250:13)",
+"0x55d9d9a27fbe: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9a27fbe: cedar_policy_validator::typecheck::Typechecker::possible_slot_instantiations (cedar-policy-validator/src/typecheck.rs:493:13)",
+"0x55d9d991513a: cedar_policy_validator::typecheck::Typechecker::link_request_env::{{closure}} (cedar-policy-validator/src/typecheck.rs:437:13)",
+"0x55d9d990d4df: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
+"0x55d9d99e566a: core::option::Option<T>::map (core/src/option.rs:1099:29)",
+"0x55d9d99d86fc: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::next (iter/adapters/map.rs:103:9)",
+"0x55d9d98ed39b: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9da14b273: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9da152cc9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9da1022e3: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9da11201f: regex_syntax::ast::visitor::HeapVisitor::visit (src/ast/visitor.rs:218:17)",
+"0x55d9d9868d04: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9da1d6248: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
+"0x55d9da1d6248: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9da1d6248: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9da1d6248: alloc::raw_vec::RawVec<T>::with_capacity (alloc/src/raw_vec.rs:92:9)",
+"0x55d9da1d6248: <alloc::boxed::Box<[T]> as core::convert::From<&[T]>>::from (alloc/src/boxed.rs:1485:19)",
+"0x55d9da1d6248: <T as core::convert::Into<U>>::into (src/convert/mod.rs:727:9)",
+"0x55d9da1d6248: alloc::ffi::c_str::<impl alloc::borrow::ToOwned for core::ffi::c_str::CStr>::to_owned (src/ffi/c_str.rs:1015:51)",
+"0x55d9da1d6248: <alloc::ffi::c_str::CString as core::convert::From<&core::ffi::c_str::CStr>>::from (src/ffi/c_str.rs:1028:9)",
+"0x55d9da1ba8d5: <std::sys::unix::fs::ReadDir as core::iter::traits::iterator::Iterator>::next (sys/unix/fs.rs:722:27)",
+"0x55d9da1b1423: <std::fs::ReadDir as core::iter::traits::iterator::Iterator>::next (std/src/fs.rs:1625:9)",
+"0x55d9d9782a5d: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2303:29)",
+"0x55d9d975638c: <core::iter::adapters::filter::Filter<I,P> as core::iter::traits::iterator::Iterator>::next (iter/adapters/filter.rs:56:9)",
+"0x55d9d9a75160: serde::de::Visitor::visit_str (src/de/mod.rs:1491:13)",
+"0x55d9d9cb78db: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:1738:43)",
+"0x55d9d984ef14: <serde::__private::de::content::TaggedContentVisitor<T> as serde::de::Visitor>::visit_map (src/private/de.rs:865:27)",
+"0x55d9d981726f: serde_json::value::de::visit_object (src/value/de.rs:196:20)",
+"0x55d9d98c92a6: serde_json::value::de::<impl serde::de::Deserializer for serde_json::value::Value>::deserialize_any (src/value/de.rs:223:33)",
+"0x55d9d98977f4: cedar_policy_core::est::head_constraints::_::<impl serde::de::Deserialize for cedar_policy_core::est::head_constraints::ResourceConstraint>::deserialize (src/est/head_constraints.rs:55:46)",
+"0x55d9d9863bb1: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9a32006: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9a32006: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
+"0x55d9d9a41a6b: cedar_policy_core::ast::expr::ExprBuilder<T>::record (src/ast/expr.rs:1060:20)",
+"0x55d9d991a74e: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:1186:37)",
+"0x55d9d99139e9: cedar_policy_validator::typecheck::TypecheckAnswer::sequence_all_then_typecheck (cedar-policy-validator/src/typecheck.rs:217:19)",
+"0x55d9d9939d2e: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9939d2e: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9939d2e: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9939d2e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9948f7e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9948297: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d99e3972: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d99e3972: <core::option::Option<V> as core::iter::traits::collect::FromIterator<core::option::Option<A>>>::from_iter::{{closure}} (core/src/option.rs:2505:51)",
+"0x55d9d98e77fe: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d99a2d93: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d99a7389: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d99442aa: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9914e31: cedar_policy_validator::typecheck::Typechecker::apply_typecheck_fn_by_request_env (cedar-policy-validator/src/typecheck.rs:350:13)",
+"0x55d9d9a27d05: cedar_policy_validator::typecheck::Typechecker::typecheck_by_request_env (cedar-policy-validator/src/typecheck.rs:307:9)",
+"0x55d9d9932c04: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9932c04: <cedar_policy_validator::schema::EntityTypeDescription as cedar_policy_core::entities::json::schema::EntityTypeDescription>::required_attrs (cedar-policy-validator/src/schema.rs:1361:9)",
+"0x55d9d9850c32: cedar_policy_core::entities::json::entities::EntityJsonParser<S>::parse_ejson (entities/json/entities.rs:218:38)",
+"0x55d9d985427a: cedar_policy_core::entities::json::entities::EntityJsonParser<S>::parse_ejsons::{{closure}} (entities/json/entities.rs:163:26)",
+"0x55d9d9831872: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
+"0x55d9d9884c73: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
+"0x55d9d982e330: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
+"0x55d9d9f0217f: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9f0217f: regex_syntax::hir::Properties::union (src/hir/mod.rs:2313:20)",
+"0x55d9d9f7976d: regex_automata::meta::regex::RegexInfo::new (src/meta/regex.rs:1930:27)",
+"0x55d9d9ebe440: serde_json::read::parse_escape (serde_json-1.0.107/src/read.rs:855:17)",
+"0x55d9d9a9a83b: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a9a83b: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a9a83b: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9a9a83b: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9acddbe: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9accfd7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c2a48e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a71ac7: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Name>>>::to_ident (src/parser/cst_to_ast.rs:1729:28)",
+"0x55d9d99232dc: cedar_policy_validator::typecheck::Typechecker::least_upper_bound_or_error::{{closure}} (cedar-policy-validator/src/typecheck.rs:2085:21)",
+"0x55d9d99ebd15: core::option::Option<T>::and_then (core/src/option.rs:1440:24)",
+"0x55d9d9922e6f: cedar_policy_validator::typecheck::Typechecker::expect_one_of_types::{{closure}} (cedar-policy-validator/src/typecheck.rs:2023:21)",
+"0x55d9d99102a5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
+"0x55d9d9c862a0: cedar_policy_core::ast::policy::ActionConstraint::as_expr (src/ast/policy.rs:1351:17)",
+"0x55d9d9c84ce4: cedar_policy_core::ast::policy::TemplateBody::condition (src/ast/policy.rs:903:21)",
+"0x55d9d9c8610f: cedar_policy_core::ast::policy::ActionConstraint::is_eq (src/ast/policy.rs:1335:30)",
+"0x55d9d9a666bf: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::VariableDef>>>::to_action_constraint (src/parser/cst_to_ast.rs:571:26)",
+"0x55d9d9d33682: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::cst::Policy>::extract_head (src/parser/cst_to_ast.rs:277:13)",
+"0x55d9d9b77298: <cedar_policy_core::est::Policy as core::convert::TryFrom<cedar_policy_core::parser::cst::Policy>>::try_from (cedar-policy-core/src/est.rs:111:45)",
+"0x55d9d9d3c2fe: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
+"0x55d9d9d05eb9: alloc::boxed::Box<T,A>::try_new_uninit_in (alloc/src/boxed.rs:483:19)",
+"0x55d9d9d0475a: alloc::boxed::Box<T,A>::new_uninit_in (alloc/src/boxed.rs:448:15)",
+"0x55d9d9adde7d: alloc::collections::btree::node::LeafNode<K,V>::new (collections/btree/node.rs:83:28)",
+"0x55d9d9ad555a: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::Leaf>::new_leaf (collections/btree/node.rs:217:29)",
+"0x55d9d9ad79fa: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::LeafOrInternal>::new (collections/btree/node.rs:584:9)",
+"0x55d9d9a83aa8: alloc::collections::btree::map::BTreeMap<K,V,A>::bulk_build_from_sorted_iter (collections/btree/map.rs:1508:24)",
+"0x55d9d97586f0: cedar_policy::integration_testing::resolve_integration_test_path (cedar-policy/src/integration_testing.rs:112:24)",
+"0x55d9d9c85627: cedar_policy_core::ast::policy::EntityReference::euid (src/ast/policy.rs:1140:20)",
+"0x55d9d9c87872: <cedar_policy_core::ast::policy::EntityReference as cedar_policy_core::parser::cst_to_ast::RefKind>::create_single_ref (src/parser/cst_to_ast.rs:905:14)",
+"0x55d9d9c7717e: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_ref_or_refs (src/parser/cst_to_ast.rs:1603:40)",
+"0x55d9d9c76a53: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_ref_or_refs (src/parser/cst_to_ast.rs:1342:18)",
+"0x55d9d9c76614: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Unary>>>::to_ref_or_refs (src/parser/cst_to_ast.rs:1239:21)",
+"0x55d9d9c93135: cedar_policy_core::parser::cst_to_ast::construct_expr_add (src/parser/cst_to_ast.rs:2009:33)",
+"0x55d9d9c82e5d: cedar_policy_core::parser::cst_to_ast::construct_expr_like (src/parser/cst_to_ast.rs:2036:5)",
+"0x55d9d9a69520: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Relation>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1085:50)",
+"0x55d9d98fffa5: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
+"0x55d9d99d92d7: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
+"0x55d9da16b456: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_post (src/hir/translate.rs:472:21)",
+"0x55d9d990016f: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
+"0x55d9d9f27b2e: regex_automata::dfa::onepass::InternalBuilder::add_dfa_state_for_nfa_state (src/dfa/onepass.rs:853:9)",
+"0x55d9d9f2793c: regex_automata::dfa::onepass::InternalBuilder::add_start_state (src/dfa/onepass.rs:821:22)",
+"0x55d9d99efd23: cedar_policy_core::transitive_closure::enforce_dag_from_tc (cedar-policy-core/src/transitive_closure.rs:177:12)",
+"0x55d9d99ee581: cedar_policy_core::transitive_closure::compute_tc (cedar-policy-core/src/transitive_closure.rs:61:16)",
+"0x55d9d9969ffe: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
+"0x55d9d9b6929c: cedar_policy_core::extensions::partial_evaluation::extension (src/extensions/partial_evaluation.rs:45:9)",
+"0x55d9d9a5d3cc: cedar_policy_validator::extensions::partial_evaluation::extension_schema (src/extensions/partial_evaluation.rs:42:18)",
+"0x55d9d9a5b6c8: cedar_policy_validator::extensions::all_available_extension_schemas (cedar-policy-validator/src/extensions.rs:36:9)",
+"0x55d9d9edd147: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
+"0x55d9d9edd147: alloc::sync::Arc<[T]>::allocate_for_slice::{{closure}} (alloc/src/sync.rs:1380:33)",
+"0x55d9d9edc9d1: alloc::sync::Arc<T>::try_allocate_for_layout (alloc/src/sync.rs:1322:19)",
+"0x55d9d9edc86b: alloc::sync::Arc<T>::allocate_for_layout (alloc/src/sync.rs:1304:13)",
+"0x55d9d9edd116: alloc::sync::Arc<[T]>::allocate_for_slice (alloc/src/sync.rs:1378:13)",
+"0x55d9d9edcd37: alloc::sync::Arc<[T]>::from_iter_exact (alloc/src/sync.rs:1427:23)",
+"0x55d9d9edd3cd: <alloc::sync::Arc<[T]> as alloc::sync::ArcFromSlice<T>>::from_slice (alloc/src/sync.rs:1460:18)",
+"0x55d9d9edd3f7: <alloc::sync::Arc<[T]> as core::convert::From<&[T]>>::from (alloc/src/sync.rs:2672:9)",
+"0x55d9da14bbd1: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9da153678: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
+"0x55d9da103c80: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
+"0x55d9da103c80: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
+"0x55d9da0ffc1d: alloc::vec::Vec<T,A>::append_elements (src/vec/mod.rs:1940:9)",
+"0x55d9da0fc52b: <alloc::vec::Vec<T,A> as alloc::vec::spec_extend::SpecExtend<&T,core::slice::iter::Iter<T>>>::spec_extend (src/vec/spec_extend.rs:55:18)",
+"0x55d9da1849b7: regex_syntax::hir::Hir::concat (src/hir/mod.rs:470:25)",
+"0x55d9d986881a: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d982aecd: hashbrown::raw::RawTable<T,A>::fallible_with_capacity (src/raw/mod.rs:460:20)",
+"0x55d9d982a463: hashbrown::raw::RawTable<T,A>::with_capacity_in (src/raw/mod.rs:481:15)",
+"0x55d9d9826a17: hashbrown::raw::RawTable<T>::with_capacity (src/raw/mod.rs:411:9)",
+"0x55d9d9865b8d: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9b0dc2a: cedar_policy_core::extensions::decimal::extension (src/extensions/decimal.rs:267:13)",
+"0x55d9d9dc0c07: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
+"0x55d9d9dc0c07: alloc::sync::Arc<[T]>::allocate_for_slice::{{closure}} (alloc/src/sync.rs:1380:33)",
+"0x55d9d9dc0541: alloc::sync::Arc<T>::try_allocate_for_layout (alloc/src/sync.rs:1322:19)",
+"0x55d9d9dc03db: alloc::sync::Arc<T>::allocate_for_layout (alloc/src/sync.rs:1304:13)",
+"0x55d9d9dc0b84: alloc::sync::Arc<[T]>::allocate_for_slice (alloc/src/sync.rs:1378:13)",
+"0x55d9d9dc0ace: alloc::sync::Arc<[T]>::copy_from_slice (alloc/src/sync.rs:1392:23)",
+"0x55d9d9dc0db1: <alloc::sync::Arc<[T]> as alloc::sync::ArcFromSlice<T>>::from_slice (alloc/src/sync.rs:1468:18)",
+"0x55d9d9dc0db1: <alloc::sync::Arc<[T]> as core::convert::From<&[T]>>::from (alloc/src/sync.rs:2672:9)",
+"0x55d9d9dc0db1: <alloc::sync::Arc<str> as core::convert::From<&str>>::from (alloc/src/sync.rs:2690:19)",
+"0x55d9d9dbfc93: <T as core::convert::Into<U>>::into (src/convert/mod.rs:727:9)",
+"0x55d9d9d5c347: cedar_policy_core::evaluator::err::pretty_type_error (src/evaluator/err.rs:274:14)",
+"0x55d9da1df50f: core::fmt::write (src/fmt/mod.rs:1254:17)",
+"0x55d9da1e0213: core::fmt::Formatter::write_fmt (src/fmt/mod.rs:1708:9)",
+"0x55d9da1d5e1a: alloc::raw_vec::finish_grow (alloc/src/raw_vec.rs:0:0)",
+"0x55d9d9755512: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9755512: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
+"0x55d9da1d5d06: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
+"0x55d9da1d5d06: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
+"0x55d9da1d5d06: alloc::vec::Vec<T,A>::append_elements (src/vec/mod.rs:1940:9)",
+"0x55d9da1d5d06: <alloc::vec::Vec<T,A> as alloc::vec::spec_extend::SpecExtend<&T,core::slice::iter::Iter<T>>>::spec_extend (src/vec/spec_extend.rs:55:18)",
+"0x55d9da1d5d06: alloc::vec::Vec<T,A>::extend_from_slice (src/vec/mod.rs:2386:9)",
+"0x55d9da1d5d06: alloc::string::String::push_str (alloc/src/string.rs:926:9)",
+"0x55d9da1d5d06: <alloc::string::String as core::fmt::Write>::write_str (alloc/src/string.rs:2862:14)",
+"0x55d9da1d5d06: <&mut W as core::fmt::Write>::write_str (src/fmt/mod.rs:204:9)",
+"0x55d9da1e0c60: core::fmt::Formatter::write_str (src/fmt/mod.rs:1685:9)",
+"0x55d9da1e0c60: core::fmt::builders::debug_list_new (src/fmt/builders.rs:569:18)",
+"0x55d9da1e0c60: core::fmt::Formatter::debug_list (src/fmt/mod.rs:2301:9)",
+"0x55d9d9784ad5: <[T] as core::fmt::Debug>::fmt (src/fmt/mod.rs:2644:9)",
+"0x55d9d9785744: <alloc::vec::Vec<T,A> as core::fmt::Debug>::fmt (src/vec/mod.rs:3038:9)",
+"0x55d9da1d6409: core::fmt::Write::write_fmt (src/fmt/mod.rs:197:9)",
+"0x55d9da1d6409: alloc::fmt::format::format_inner (alloc/src/fmt.rs:612:9)",
+"0x55d9d9868b37: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9da113689: regex_syntax::ast::visitor::HeapVisitor::visit_class (src/ast/visitor.rs:322:17)",
+"0x55d9da112d8f: regex_syntax::ast::visitor::HeapVisitor::induct (src/ast/visitor.rs:268:17)",
+"0x55d9d993bf9b: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d993bf9b: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d993bf9b: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d993bf9b: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9948dfe: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9948727: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d990cdee: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a39e35: cedar_policy_validator::types::EntityRecordKind::all_attrs (cedar-policy-validator/src/types.rs:1103:55)",
+"0x55d9d99388af: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d99388af: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d99388af: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d99388af: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d994903e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9948a27: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d99dc29e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d98d884c: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::validate_action_ids (cedar-policy-validator/src/rbac.rs:103:32)",
+"0x55d9d9824f13: alloc::alloc::exchange_malloc (alloc/src/alloc.rs:324:18)",
+"0x55d9d9820fd6: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9820fd6: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d985e7c3: core::result::Result<T,E>::map (core/src/result.rs:759:25)",
+"0x55d9d98927bb: serde::de::impls::<impl serde::de::Deserialize for alloc::boxed::Box<T>>::deserialize (src/de/impls.rs:740:17)",
+"0x55d9d985708e: serde::de::impls::<impl serde::de::Deserialize for alloc::sync::Arc<T>>::deserialize (src/de/impls.rs:1863:17)",
+"0x55d9d989fa32: <core::marker::PhantomData<T> as serde::de::DeserializeSeed>::deserialize (src/de/mod.rs:794:9)",
+"0x55d9d984e202: <serde::__private::de::content::MapRefDeserializer<E> as serde::de::MapAccess>::next_value_seed (src/private/de.rs:2315:32)",
+"0x55d9d999cb5e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9937ea4: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9937ea4: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9937ea4: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9937ea4: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d994913e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d99488ec: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d99806de: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d98d8678: cedar_policy_validator::validation_result::ValidationResult::new (cedar-policy-validator/src/validation_result.rs:34:32)",
+"0x55d9d9918a7b: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:983:25)",
+"0x55d9d9912255: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d9c87192: cedar_policy_core::est::head_constraints::<impl core::convert::TryFrom<cedar_policy_core::est::head_constraints::ActionConstraint> for cedar_policy_core::ast::policy::ActionConstraint>::try_from (src/est/head_constraints.rs:396:46)",
+"0x55d9d9c59d5e: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
+"0x55d9d9b794c0: cedar_policy_core::est::Policy::try_into_ast_template (cedar-policy-core/src/est.rs:235:13)",
+"0x55d9d9b789d7: cedar_policy_core::est::Policy::try_into_ast_policy (cedar-policy-core/src/est.rs:203:39)",
+"0x55d9d98c58a1: cedar_policy::api::Policy::from_json (cedar-policy/src/api.rs:2343:18)",
+"0x55d9d975be50: cedar_policy::integration_testing::perform_integration_test_from_json_custom::{{closure}} (cedar-policy/src/integration_testing.rs:337:13)",
+"0x55d9d9938ec8: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9938ec8: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9938ec8: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9938ec8: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9948fbe: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9948359: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d99dc1de: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d992d269: cedar_policy_validator::extensions::decimal::extension_schema (src/extensions/decimal.rs:60:47)",
+"0x55d9d9c9d3c9: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:514:17)",
+"0x55d9d9918893: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:972:33)",
+"0x55d9da184980: regex_syntax::hir::Hir::concat (src/hir/mod.rs:470:34)",
+"0x55d9d9d4cabc: lalrpop_util::state_machine::Parser<D,I>::drive (lalrpop-util-0.20.0/src/state_machine.rs:221:21)",
+"0x55d9d9d8a412: cedar_policy_core::parser::text_to_cst::grammar::__parse__Name::NameParser::parse (src/parser/grammar.rs:17799:13)",
+"0x55d9d9bb5d3a: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9b3f783: cedar_policy_core::parser::text_to_cst::parse_collect_errors (src/parser/text_to_cst.rs:49:18)",
+"0x55d9d9d07596: cedar_policy_core::parser::text_to_cst::parse_name (src/parser/text_to_cst.rs:109:5)",
+"0x55d9d9c7178c: cedar_policy_core::parser::parse_name (cedar-policy-core/src/parser.rs:270:15)",
+"0x55d9d9eedd5d: regex_automata::nfa::thompson::compiler::Compiler::c::{{closure}} (nfa/thompson/compiler.rs:1006:63)",
+"0x55d9d9eead8f: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
+"0x55d9d9a5d101: cedar_policy_validator::extensions::partial_evaluation::get_argument_types (src/extensions/partial_evaluation.rs:26:20)",
+"0x55d9d9781929: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
+"0x55d9d97648d8: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d97850d9: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d97850d9: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d97850d9: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d97850d9: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
+"0x55d9d97859ba: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9785975: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d977cb5a: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d97594a5: cedar_policy::integration_testing::perform_integration_test_from_json_custom (cedar-policy/src/integration_testing.rs:244:17)",
+"0x55d9d9c3025b: cedar_policy_core::parser::text_to_cst::grammar::__parse__Ident::IdentParser::new (src/parser/grammar.rs:10146:29)",
+"0x55d9d9bb3b41: <cedar_policy_core::parser::text_to_cst::IDENT_PARSER as core::ops::deref::Deref>::deref::__static_ref_initialize (src/parser/text_to_cst.rs:77:53)",
+"0x55d9d9bb3b41: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d99bd164: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d99bd164: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d99bd164: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d99d59e8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d99c44b4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d99c44b4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d99c44b4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d99d5678: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9cf42ec: cedar_policy_core::est::expr::Expr::_in (src/est/expr.rs:305:19)",
+"0x55d9d9c81f0e: cedar_policy_core::parser::cst_to_ast::construct_expr_not (src/parser/cst_to_ast.rs:1953:5)",
+"0x55d9d9c91159: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Unary>>>::to_expr_or_special::{{closure}} (src/parser/cst_to_ast.rs:1269:54)",
+"0x55d9d9c1c8fd: core::option::Option<T>::map (core/src/option.rs:1099:29)",
+"0x55d9d9a6c5e8: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Unary>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1269:21)",
+"0x55d9d9f7b1af: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3442:5)",
+"0x55d9d9758e5e: cedar_policy::integration_testing::perform_integration_test_from_json_custom (cedar-policy/src/integration_testing.rs:190:25)",
+"0x55d9d9864eca: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9da1bac83: alloc::alloc::exchange_malloc (alloc/src/alloc.rs:324:18)",
+"0x55d9da1bac83: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9da1bac83: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
+"0x55d9da1bac83: std::sys::unix::fs::ReadDir::new (sys/unix/fs.rs:269:23)",
+"0x55d9da1bac83: std::sys::unix::fs::readdir (sys/unix/fs.rs:1429:12)",
+"0x55d9d99a1173: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d99a73b9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9944154: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d997954b: <cedar_policy_validator::schema_file_format::_::<impl serde::de::Deserialize for cedar_policy_validator::schema_file_format::TypeOfAttribute>::deserialize::__Visitor as serde::de::Visitor>::visit_map (cedar-policy-validator/src/schema_file_format.rs:588:46)",
+"0x55d9d9a02965: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_map (serde_json-1.0.107/src/de.rs:1791:31)",
+"0x55d9d985691e: serde::de::Error::unknown_variant (src/de/mod.rs:256:21)",
+"0x55d9d986b11b: <cedar_policy_core::est::expr::_::<impl serde::de::Deserialize for cedar_policy_core::est::expr::ExprNoExt>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str (src/est/expr.rs:46:46)",
+"0x55d9d98413cf: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_identifier (src/private/de.rs:2037:43)",
+"0x55d9d9869c37: <cedar_policy_core::est::expr::_::<impl serde::de::Deserialize for cedar_policy_core::est::expr::ExprNoExt>::deserialize::__Field as serde::de::Deserialize>::deserialize (src/est/expr.rs:46:46)",
+"0x55d9d9bb5c95: <cedar_policy_core::extensions::decimal::names::DECIMAL_FROM_STR_NAME as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/decimal.rs:47:55)",
+"0x55d9d9bb5c95: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9bdc271: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
+"0x55d9d9b68bf8: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
+"0x55d9d9d56e0d: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
+"0x55d9d9c2c364: cedar_policy_core::ast::policy_set::PolicySet::add_static (src/ast/policy_set.rs:153:22)",
+"0x55d9d9a62e3c: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Policies>>>::to_policyset (src/parser/cst_to_ast.rs:116:37)",
+"0x55d9d9c709af: cedar_policy_core::parser::parse_policyset_and_also_return_policy_text (cedar-policy-core/src/parser.rs:67:22)",
+"0x55d9d98c4dee: <cedar_policy::api::PolicySet as core::str::traits::FromStr>::from_str (cedar-policy/src/api.rs:1640:29)",
+"0x55d9d9cf4acc: cedar_policy_core::est::expr::Expr::or (src/est/expr.rs:353:19)",
+"0x55d9d984e7f4: <serde::__private::de::content::TaggedContentVisitor<T> as serde::de::Visitor>::visit_map (src/private/de.rs:865:27)",
+"0x55d9d9816f1f: serde_json::value::de::visit_object (src/value/de.rs:196:20)",
+"0x55d9d98c9406: serde_json::value::de::<impl serde::de::Deserializer for serde_json::value::Value>::deserialize_any (src/value/de.rs:223:33)",
+"0x55d9d9898054: cedar_policy_core::est::head_constraints::_::<impl serde::de::Deserialize for cedar_policy_core::est::head_constraints::PrincipalConstraint>::deserialize (src/est/head_constraints.rs:25:46)",
+"0x55d9d9a6382e: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Policy>>>::to_policy_template (src/parser/cst_to_ast.rs:216:63)",
+"0x55d9d9a632e7: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Policy>>>::to_policy_or_template (src/parser/cst_to_ast.rs:146:17)",
+"0x55d9d9cb823c: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_bool (src/private/de.rs:1759:26)",
+"0x55d9d9b7cdd7: serde::de::impls::<impl serde::de::Deserialize for bool>::deserialize (src/de/impls.rs:75:9)",
+"0x55d9d9c83716: cedar_policy_core::parser::cst_to_ast::construct_ext_meth (src/parser/cst_to_ast.rs:2064:5)",
+"0x55d9d9d93fff: cedar_policy_core::parser::text_to_cst::grammar::__parse__Name::__reduce19 (src/parser/grammar.rs:19582:20)",
+"0x55d9d9d8ad9c: cedar_policy_core::parser::text_to_cst::grammar::__parse__Name::__reduce (src/parser/grammar.rs:17917:17)",
+"0x55d9d9d87503: <cedar_policy_core::parser::text_to_cst::grammar::__parse__Name::__StateMachine as lalrpop_util::state_machine::ParserDefinition>::reduce (src/parser/grammar.rs:16360:13)",
+"0x55d9d9d5068c: lalrpop_util::state_machine::Parser<D,I>::reduce (lalrpop-util-0.20.0/src/state_machine.rs:594:9)",
+"0x55d9d9c9ee75: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:490:17)",
+"0x55d9d9863f1b: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9c91e80: cedar_policy_core::parser::cst_to_ast::construct_template_policy::{{closure}} (src/parser/cst_to_ast.rs:1893:9)",
+"0x55d9d9d1929d: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce33 (src/parser/grammar.rs:28640:20)",
+"0x55d9d9d0e156: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26718:17)",
+"0x55d9d9ad427f: <cedar_policy_core::ast::literal::Literal as core::convert::From<cedar_policy_core::ast::entity::EntityUID>>::from (src/ast/literal.rs:118:25)",
+"0x55d9d9d02c5e: <T as core::convert::Into<U>>::into (src/convert/mod.rs:727:9)",
+"0x55d9d9be0a80: cedar_policy_core::ast::expr::ExprBuilder<T>::val (src/ast/expr.rs:875:43)",
+"0x55d9d9c81a96: cedar_policy_core::parser::cst_to_ast::construct_expr_ref (src/parser/cst_to_ast.rs:1938:5)",
+"0x55d9d9c91d43: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Ref>>>::to_expr::{{closure}} (src/parser/cst_to_ast.rs:1833:25)",
+"0x55d9d9c874ce: cedar_policy_core::est::head_constraints::<impl core::convert::TryFrom<cedar_policy_core::est::head_constraints::ActionConstraint> for cedar_policy_core::ast::policy::ActionConstraint>::try_from (src/est/head_constraints.rs:396:51)",
+"0x55d9d9cf555b: cedar_policy_core::est::expr::Expr::ite (src/est/expr.rs:434:24)",
+"0x55d9da125f32: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9da125f32: regex_syntax::ast::parse::ParserI<P>::parse_group (src/ast/parse.rs:1252:22)",
+"0x55d9d9bb4da5: <cedar_policy_core::extensions::ipaddr::names::EXTENSION_NAME as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/ipaddr.rs:33:48)",
+"0x55d9d9bb4da5: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9bdbee1: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
+"0x55d9d9b681d8: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
+"0x55d9d9d56a1d: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
+"0x55d9d993af2e: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d993af2e: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d993af2e: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d993af2e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d99491ce: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d99483d9: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d99e39d2: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d99e39d2: <core::option::Option<V> as core::iter::traits::collect::FromIterator<core::option::Option<A>>>::from_iter::{{closure}} (core/src/option.rs:2505:51)",
+"0x55d9d98e7c25: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d9ebe494: serde_json::read::parse_escape (serde_json-1.0.107/src/read.rs:859:17)",
+"0x55d9d9b1e29e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9aa609e: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa609e: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa609e: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9aa609e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9acdc6e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acc947: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c2a30e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a825dc: <alloc::collections::btree::map::BTreeMap<K,V> as core::iter::traits::collect::FromIterator<(K,V)>>::from_iter (collections/btree/map.rs:2229:34)",
+"0x55d9d990dbf5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
+"0x55d9d99821de: cedar_policy_validator::extensions::ipaddr::get_argument_types (src/extensions/ipaddr.rs:29:17)",
+"0x55d9d99439fc: alloc::vec::Vec<T,A>::extend_desugared (src/vec/mod.rs:2812:35)",
+"0x55d9d9a63b3f: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Policy>>>::to_policy_template (src/parser/cst_to_ast.rs:226:26)",
+"0x55d9d9a62dca: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Policies>>>::to_policyset (src/parser/cst_to_ast.rs:103:19)",
+"0x55d9d9865ce2: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9ef51e6: regex_automata::nfa::thompson::compiler::Utf8Compiler::finish (nfa/thompson/compiler.rs:1766:21)",
+"0x55d9d9ef326c: regex_automata::nfa::thompson::compiler::Compiler::c_unicode_class (nfa/thompson/compiler.rs:1444:13)",
+"0x55d9d9ad0b9b: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9ad0b9b: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
+"0x55d9d9998680: cedar_policy_validator::schema::CoreSchema::new::{{closure}} (cedar-policy-validator/src/schema.rs:1267:36)",
+"0x55d9d99e11b9: core::iter::adapters::map::map_fold::{{closure}} (iter/adapters/map.rs:84:28)",
+"0x55d9d99e13c7: core::iter::adapters::map::map_fold::{{closure}} (iter/adapters/map.rs:84:21)",
+"0x55d9d9959e54: core::iter::traits::iterator::Iterator::fold (iter/traits/iterator.rs:2482:21)",
+"0x55d9d99d71c1: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::fold (iter/adapters/map.rs:124:9)",
+"0x55d9d98d8ad6: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_in_fixes_principal (cedar-policy-validator/src/rbac.rs:172:14)",
+"0x55d9d9c9e79f: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:499:17)",
+"0x55d9d9aa49b0: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa49b0: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa49b0: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9aa49b0: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9ac152c: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
+"0x55d9d9accc67: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c5f922: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9c5f922: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
+"0x55d9d9a927b7: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d9c9caf8: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:522:17)",
+"0x55d9d9a74cd7: serde::de::Visitor::visit_i64 (src/de/mod.rs:1359:13)",
+"0x55d9d9cb65db: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:1734:36)",
+"0x55d9d9a5ee85: cedar_policy_core::ast::name::Name::new (src/ast/name.rs:52:19)",
+"0x55d9d9cbe22c: cedar_policy_core::ast::name::Name::type_in_namespace (src/ast/name.rs:78:9)",
+"0x55d9d9991d03: cedar_policy_validator::schema::ValidatorNamespaceDef::build_action_ids::{{closure}} (cedar-policy-validator/src/schema.rs:437:37)",
+"0x55d9d9bad2ac: cedar_policy_core::extensions::ipaddr::extension (src/extensions/ipaddr.rs:288:13)",
+"0x55d9d9b2a403: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9b3e638: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
+"0x55d9d9abd270: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
+"0x55d9d9abd270: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
+"0x55d9d9acb5b4: <alloc::vec::Vec<T,A> as core::iter::traits::collect::Extend<T>>::extend_reserve (src/vec/mod.rs:2796:9)",
+"0x55d9d9a9929c: <(ExtendA,ExtendB) as core::iter::traits::collect::Extend<(A,B)>>::extend (iter/traits/collect.rs:436:13)",
+"0x55d9d9867fbc: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9c5b6d5: cedar_policy_core::evaluator::Evaluator::partial_interpret::{{closure}} (cedar-policy-core/src/evaluator.rs:545:33)",
+"0x55d9d9af3e1f: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
+"0x55d9d9b9e538: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
+"0x55d9d9a9ef65: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a9ef65: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a9ef65: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9a9ef65: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9ace01e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acbd67: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c5fa42: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9c5fa42: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
+"0x55d9d9a92e30: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d9a2b6ea: cedar_policy_validator::typecheck::Typechecker::typecheck_in (cedar-policy-validator/src/typecheck.rs:1531:22)",
+"0x55d9d999d42c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9938bd6: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9938bd6: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9938bd6: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9938bd6: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d994915e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9948619: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d99f51ce: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a2ca14: cedar_policy_validator::typecheck::Typechecker::lookup_extension_function (cedar-policy-validator/src/typecheck.rs:2117:60)",
+"0x55d9d9867aa9: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9cfd447: cedar_policy_core::est::expr::interpret_primary (src/est/expr.rs:1062:34)",
+"0x55d9d9cffae4: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Member>>::try_from (src/est/expr.rs:1184:66)",
+"0x55d9d9eaad23: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9eaafe9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9eca837: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9ebb58b: <serde_json::value::de::<impl serde::de::Deserialize for serde_json::value::Value>::deserialize::ValueVisitor as serde::de::Visitor>::visit_seq (src/value/de.rs:98:21)",
+"0x55d9d9ec6743: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_any (serde_json-1.0.107/src/de.rs:1427:31)",
+"0x55d9d9b9f468: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
+"0x55d9d9aef1ff: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
+"0x55d9d9bdeadf: cedar_policy_core::ast::expr::Expr::val (src/ast/expr.rs:300:9)",
+"0x55d9d9a2c956: cedar_policy_validator::typecheck::Typechecker::replace_action_var_with_euid (cedar-policy-validator/src/typecheck.rs:2102:54)",
+"0x55d9d99822cd: cedar_policy_validator::extensions::ipaddr::get_argument_types (src/extensions/ipaddr.rs:30:63)",
+"0x55d9d982a6dd: hashbrown::raw::RawTable<T,A>::new_uninitialized (src/raw/mod.rs:442:20)",
+"0x55d9d9825615: <hashbrown::raw::RawTable<T,A> as core::clone::Clone>::clone (src/raw/mod.rs:1606:39)",
+"0x55d9d98a1e06: <hashbrown::map::HashMap<K,V,S,A> as core::clone::Clone>::clone (hashbrown-0.12.3/src/map.rs:197:20)",
+"0x55d9d988307d: <std::collections::hash::map::HashMap<K,V,S> as core::clone::Clone>::clone (collections/hash/map.rs:1267:22)",
+"0x55d9d98c7e92: alloc::str::<impl alloc::borrow::ToOwned for str>::to_owned (alloc/src/str.rs:209:46)",
+"0x55d9d98c7e92: <alloc::string::String as core::convert::From<&str>>::from (alloc/src/string.rs:2650:11)",
+"0x55d9d98c7e92: <str as alloc::string::ToString>::to_string (alloc/src/string.rs:2596:9)",
+"0x55d9d986b677: <cedar_policy_core::est::expr::_::<impl serde::de::Deserialize for cedar_policy_core::est::expr::ExtFuncCall>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str (src/est/expr.rs:241:46)",
+"0x55d9d98425bf: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_identifier (src/private/de.rs:2037:43)",
+"0x55d9d9ef5d35: regex_automata::nfa::thompson::compiler::Utf8Compiler::pop_freeze (nfa/thompson/compiler.rs:1836:9)",
+"0x55d9d9933f7b: cedar_policy_validator::fuzzy_match::fuzzy_search::{{closure}} (cedar-policy-validator/src/fuzzy_match.rs:23:21)",
+"0x55d9d9930884: cedar_policy_validator::schema::ValidatorNamespaceDef::parse_action_id_with_namespace (cedar-policy-validator/src/schema.rs:655:25)",
+"0x55d9d9865460: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9c718be: cedar_policy_core::parser::parse_name (cedar-policy-core/src/parser.rs:271:21)",
+"0x55d9d9cbe4ba: <cedar_policy_core::ast::name::Name as core::str::traits::FromStr>::from_str (src/ast/name.rs:117:9)",
+"0x55d9d9c8f77b: core::str::<impl str>::parse (src/str/mod.rs:2353:9)",
+"0x55d9da0bca3c: <alloc::alloc::Global as core::alloc::Allocator>::allocate_zeroed (alloc/src/alloc.rs:240:9)",
+"0x55d9d9fe4c1c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:185:38)",
+"0x55d9da0bfd97: alloc::raw_vec::RawVec<T,A>::with_capacity_zeroed_in (alloc/src/raw_vec.rs:138:9)",
+"0x55d9da0bfd97: <T as alloc::vec::spec_from_elem::SpecFromElem>::from_elem (src/vec/spec_from_elem.rs:25:31)",
+"0x55d9da0a2f4b: alloc::vec::from_elem (src/vec/mod.rs:2550:5)",
+"0x55d9d9f31f70: regex_automata::util::search::PatternSet::new (src/util/search.rs:1192:20)",
+"0x55d9d9d3db8a: regex::regexset::string::RegexSet::matches_at (src/regexset/string.rs:327:26)",
+"0x55d9d9990432: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9990432: cedar_policy_validator::schema::WithUnresolvedTypeDefs<T>::new (cedar-policy-validator/src/schema.rs:167:30)",
+"0x55d9d999072d: cedar_policy_validator::schema::WithUnresolvedTypeDefs<T>::map (cedar-policy-validator/src/schema.rs:173:17)",
+"0x55d9d9f66e98: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:459:30)",
+"0x55d9d9ec959c: serde::de::Visitor::visit_borrowed_str (src/de/mod.rs:1508:9)",
+"0x55d9d977fe0d: hashbrown::raw::RawTable<T,A>::new_uninitialized (src/raw/mod.rs:442:20)",
+"0x55d9d977d8f1: <hashbrown::raw::RawTable<T,A> as core::clone::Clone>::clone (src/raw/mod.rs:1606:39)",
+"0x55d9d97796e2: <hashbrown::map::HashMap<K,V,S,A> as core::clone::Clone>::clone (hashbrown-0.12.3/src/map.rs:197:20)",
+"0x55d9d9763dcc: <std::collections::hash::map::HashMap<K,V,S> as core::clone::Clone>::clone (collections/hash/map.rs:1267:22)",
+"0x55d9d9a31d84: core::iter::traits::iterator::Iterator::partition::extend::{{closure}} (iter/traits/iterator.rs:2096:21)",
+"0x55d9d9f6f616: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9f6f616: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
+"0x55d9d9f7b7a6: regex_automata::meta::regex::Builder::build_many_from_hir (src/meta/regex.rs:3559:25)",
+"0x55d9d9865fce: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d999e8be: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d993abb9: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d993abb9: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d993abb9: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d993abb9: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9948f3e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9948b67: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d99e39a2: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d99e39a2: <core::option::Option<V> as core::iter::traits::collect::FromIterator<core::option::Option<A>>>::from_iter::{{closure}} (core/src/option.rs:2505:51)",
+"0x55d9d98e92eb: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d9bfb2d8: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce48 (src/parser/grammar.rs:37685:20)",
+"0x55d9d9bee4e3: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35505:17)",
+"0x55d9d9cfcf9a: cedar_policy_core::est::expr::interpret_primary (src/est/expr.rs:1092:72)",
+"0x55d9d9cf515c: cedar_policy_core::est::expr::Expr::contains_any (src/est/expr.rs:402:20)",
+"0x55d9d9cff0d4: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Member>>::try_from (src/est/expr.rs:1235:64)",
+"0x55d9d9c87770: cedar_policy_core::est::head_constraints::<impl core::convert::TryFrom<cedar_policy_core::est::head_constraints::ActionConstraint> for cedar_policy_core::ast::policy::ActionConstraint>::try_from (src/est/head_constraints.rs:392:17)",
+"0x55d9d97ee10a: alloc::fmt::format::{{closure}} (alloc/src/fmt.rs:616:34)",
+"0x55d9d97ee10a: core::option::Option<T>::map_or_else (core/src/option.rs:1193:21)",
+"0x55d9d97ee10a: alloc::fmt::format (alloc/src/fmt.rs:616:5)",
+"0x55d9d97ee10a: <test::formatters::pretty::PrettyFormatter<T> as test::formatters::OutputFormatter>::write_timeout (alloc/src/macros.rs:120:19)",
+"0x55d9d97e3b0b: test::console::on_test_event (test/src/console.rs:275:43)",
+"0x55d9d97e3b0b: test::console::run_tests_console::{{closure}} (test/src/console.rs:329:32)",
+"0x55d9d97e2173: test::run_tests (test/src/lib.rs:419:25)",
+"0x55d9d97e2173: test::console::run_tests_console (test/src/console.rs:329:5)",
+"0x55d9da18ac5b: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9da18ac5b: regex_syntax::hir::Properties::repetition (src/hir/mod.rs:2475:20)",
+"0x55d9da184255: regex_syntax::hir::Hir::repetition (src/hir/mod.rs:379:21)",
+"0x55d9da1720c5: regex_syntax::hir::translate::TranslatorI::hir_repetition (src/hir/translate.rs:1001:9)",
+"0x55d9d9f3c2c1: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9f45538: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
+"0x55d9d9ee52d0: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
+"0x55d9d9ee52d0: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
+"0x55d9d9edf167: alloc::vec::Vec<T,A>::extend_with (src/vec/mod.rs:2492:9)",
+"0x55d9d9ee4fa0: alloc::vec::Vec<T,A>::resize (src/vec/mod.rs:2358:13)",
+"0x55d9da122f59: regex_syntax::ast::parse::ParserI<P>::parse_with_comments (src/ast/parse.rs:1002:22)",
+"0x55d9d9923b53: cedar_policy_validator::typecheck::Typechecker::typecheck_extension::{{closure}} (cedar-policy-validator/src/typecheck.rs:2205:33)",
+"0x55d9d99133df: cedar_policy_validator::typecheck::TypecheckAnswer::sequence_all_then_typecheck (cedar-policy-validator/src/typecheck.rs:217:19)",
+"0x55d9d9a2d608: cedar_policy_validator::typecheck::Typechecker::typecheck_extension (cedar-policy-validator/src/typecheck.rs:2199:21)",
+"0x55d9d991a0a6: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:1143:29)",
+"0x55d9d9b7049d: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:332:33)",
+"0x55d9d9b0d359: cedar_policy_core::extensions::decimal::extension (src/extensions/decimal.rs:252:9)",
+"0x55d9d9868e7e: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9da152f99: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9da101f1a: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9782df3: <serde::de::impls::<impl serde::de::Deserialize for alloc::vec::Vec<T>>::deserialize::VecVisitor<T> as serde::de::Visitor>::visit_seq (src/de/impls.rs:1035:21)",
+"0x55d9d9773d1d: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_seq (serde_json-1.0.107/src/de.rs:1740:31)",
+"0x55d9d9cc67f6: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9cc67f6: cedar_policy_core::parser::text_to_cst::grammar::__action34 (src/parser/grammar.rs:57882:37)",
+"0x55d9d9cd9841: cedar_policy_core::parser::text_to_cst::grammar::__action268 (src/parser/grammar.rs:63025:5)",
+"0x55d9d9ce5087: cedar_policy_core::parser::text_to_cst::grammar::__action358 (src/parser/grammar.rs:65918:5)",
+"0x55d9d9c01fda: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce103 (src/parser/grammar.rs:38768:20)",
+"0x55d9d9beefd8: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35670:17)",
+"0x55d9d9ed0ade: <smol_str::SmolStr as core::fmt::Display>::fmt (smol_str-0.2.0/src/lib.rs:240:9)",
+"0x55d9d9b08877: <&T as core::fmt::Display>::fmt (src/fmt/mod.rs:2418:62)",
+"0x55d9d9d3709b: cedar_policy_core::parser::fmt::<impl core::fmt::Display for cedar_policy_core::parser::cst::Ident>::fmt (src/parser/fmt.rs:396:32)",
+"0x55d9d9f41273: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9f43849: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9ee360a: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9f67b3f: regex_automata::nfa::thompson::builder::Builder::add_capture_start (nfa/thompson/builder.rs:1007:17)",
+"0x55d9d9ef4c12: regex_automata::nfa::thompson::compiler::Compiler::add_capture_start (nfa/thompson/compiler.rs:1659:9)",
+"0x55d9d98a52bd: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d98a52bd: cedar_policy_core::entities::json::jsonvalue::ValueParser::type_of_rexpr (entities/json/jsonvalue.rs:462:70)",
+"0x55d9d98ab847: cedar_policy_core::entities::json::jsonvalue::ValueParser::type_of_rexpr::{{closure}} (entities/json/jsonvalue.rs:453:21)",
+"0x55d9d98c2340: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
+"0x55d9d98598a4: core::option::Option<T>::map (core/src/option.rs:1099:29)",
+"0x55d9d982de4d: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::next (iter/adapters/map.rs:103:9)",
+"0x55d9d98a50cd: cedar_policy_core::entities::json::jsonvalue::ValueParser::type_of_rexpr (entities/json/jsonvalue.rs:455:23)",
+"0x55d9d9b7a389: cedar_policy_core::ast::restricted_expr::RestrictedExpr::val (src/ast/restricted_expr.rs:90:29)",
+"0x55d9d992297e: cedar_policy_validator::typecheck::Typechecker::typecheck_unary::{{closure}} (cedar-policy-validator/src/typecheck.rs:1968:25)",
+"0x55d9d990e5fc: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d991fad2: cedar_policy_validator::typecheck::Typechecker::type_of_var_in_entity_literals (cedar-policy-validator/src/typecheck.rs:1771:51)",
+"0x55d9d991d9a9: cedar_policy_validator::typecheck::Typechecker::typecheck_in::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1583:30)",
+"0x55d9d98638c8: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9b32743: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9889969: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d988e74f: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9783476: <serde::de::impls::<impl serde::de::Deserialize for alloc::vec::Vec<T>>::deserialize::VecVisitor<T> as serde::de::Visitor>::visit_seq (src/de/impls.rs:1035:21)",
+"0x55d9d9774405: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_seq (serde_json-1.0.107/src/de.rs:1740:31)",
+"0x55d9d98b7f90: cedar_policy_core::entities::json::jsonvalue::ValueParser::val_into_rexpr::{{closure}} (entities/json/jsonvalue.rs:317:40)",
+"0x55d9d98200f6: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d98200f6: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d98200f6: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:139:27)",
+"0x55d9d9890178: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
+"0x55d9d9890178: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
+"0x55d9d9890178: <alloc::vec::Vec<T,A> as core::clone::Clone>::clone (src/vec/mod.rs:2643:9)",
+"0x55d9d98574e4: <cedar_policy_core::est::Policy as core::clone::Clone>::clone (cedar-policy-core/src/est.rs:49:5)",
+"0x55d9d98c572d: cedar_policy::api::Policy::from_json (cedar-policy/src/api.rs:2343:18)",
+"0x55d9d9bb3d15: <cedar_policy_core::extensions::ipaddr::names::IS_IPV6 as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/ipaddr.rs:36:41)",
+"0x55d9d9bb3d15: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9bdbe21: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
+"0x55d9d9b68388: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
+"0x55d9d9d585ad: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
+"0x55d9d9aa20f0: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa20f0: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa20f0: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9aa20f0: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9ac11ec: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
+"0x55d9d9acc9c7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c5fbc2: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9c5fbc2: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
+"0x55d9d9a94687: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d99bba54: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d99bba54: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d99bba54: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d99d5728: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9da151033: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9da153059: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9da101ccd: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9da11e9fa: regex_syntax::ast::parse::ParserI<P>::push_group (src/ast/parse.rs:703:17)",
+"0x55d9d9b22c0e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9a9e3b2: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a9e3b2: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a9e3b2: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9a9e3b2: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9acdd9e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acc1d7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c2a2ee: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a6a5f7: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Add>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1117:42)",
+"0x55d9d99a1ad3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d99a79d8: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
+"0x55d9d9944e20: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
+"0x55d9d9944e20: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
+"0x55d9d99481d4: <alloc::vec::Vec<T,A> as core::iter::traits::collect::Extend<T>>::extend_reserve (src/vec/mod.rs:2796:9)",
+"0x55d9d99370e7: <(ExtendA,ExtendB) as core::iter::traits::collect::Extend<(A,B)>>::extend (iter/traits/collect.rs:435:13)",
+"0x55d9d9f39d41: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9f45508: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
+"0x55d9d9ee51b0: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
+"0x55d9d9ee51b0: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
+"0x55d9d9ee0957: alloc::vec::Vec<T,A>::extend_trusted (src/vec/mod.rs:2840:13)",
+"0x55d9d9ee9f47: <alloc::vec::Vec<T,A> as alloc::vec::spec_extend::SpecExtend<T,I>>::spec_extend (src/vec/spec_extend.rs:26:9)",
+"0x55d9d97824fd: alloc::fmt::format (alloc/src/fmt.rs:616:5)",
+"0x55d9d975bc9f: cedar_policy::integration_testing::perform_integration_test_from_json_custom::{{closure}} (cedar-policy/src/integration_testing.rs:336:42)",
+"0x55d9d976157e: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
+"0x55d9d978435a: core::option::Option<T>::map (core/src/option.rs:1099:29)",
+"0x55d9d9763418: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::next (iter/adapters/map.rs:103:9)",
+"0x55d9d9d5c230: cedar_policy_core::evaluator::err::pretty_type_error (src/evaluator/err.rs:277:13)",
+"0x55d9d9bdcb57: <&T as core::fmt::Display>::fmt (src/fmt/mod.rs:2418:62)",
+"0x55d9d992ccfd: cedar_policy_validator::extensions::decimal::get_argument_types (src/extensions/decimal.rs:31:13)",
+"0x55d9d9912a05: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
+"0x55d9da18936d: <regex_syntax::hir::Hir as core::ops::drop::Drop>::drop (src/hir/mod.rs:1861:57)",
+"0x55d9d9c86384: cedar_policy_core::ast::policy::ActionConstraint::as_expr (src/ast/policy.rs:1346:44)",
+"0x55d9d9864207: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9f3ecf3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9f43999: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9ee25f7: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9f28118: regex_automata::dfa::onepass::InternalBuilder::stack_push (src/dfa/onepass.rs:919:9)",
+"0x55d9d9f26600: regex_automata::dfa::onepass::InternalBuilder::build (src/dfa/onepass.rs:638:13)",
+"0x55d9d99bff84: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d99bff84: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d99bff84: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d99d55c8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9867d95: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9b52b94: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d9b52b94: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d9b52b94: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d9b65ce8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9ebe4d3: serde_json::read::parse_escape (serde_json-1.0.107/src/read.rs:862:17)",
+"0x55d9d9bb47f5: <cedar_policy_core::evaluator::names::ANY_ENTITY_TYPE as core::ops::deref::Deref>::deref::__static_ref_initialize (cedar-policy-core/src/evaluator.rs:39:49)",
+"0x55d9d9bb47f5: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9bdc2d1: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
+"0x55d9d9b689b8: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
+"0x55d9d9d5899d: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
+"0x55d9d99ecc18: <core::option::Option<T> as core::clone::Clone>::clone (core/src/option.rs:2041:29)",
+"0x55d9d9c82b1d: cedar_policy_core::parser::cst_to_ast::construct_expr_has (src/parser/cst_to_ast.rs:2030:5)",
+"0x55d9d9a69a0e: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Relation>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1074:50)",
+"0x55d9d9a67b23: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Or>>>::to_expr_or_special (src/parser/cst_to_ast.rs:946:27)",
+"0x55d9d99228a3: cedar_policy_validator::typecheck::Typechecker::typecheck_unary::{{closure}} (cedar-policy-validator/src/typecheck.rs:1962:29)",
+"0x55d9da152ed9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9da101df1: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d97624df: serde_json::read::IoRead<R>::parse_str_bytes (serde_json-1.0.107/src/read.rs:223:17)",
+"0x55d9d97630e7: <serde_json::read::IoRead<R> as serde_json::read::Read>::parse_str (serde_json-1.0.107/src/read.rs:328:9)",
+"0x55d9d990f9b3: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
+"0x55d9d9926b49: alloc::boxed::Box<T,A>::try_new_uninit_in (alloc/src/boxed.rs:483:19)",
+"0x55d9d992671a: alloc::boxed::Box<T,A>::new_uninit_in (alloc/src/boxed.rs:448:15)",
+"0x55d9d9a175bd: alloc::collections::btree::node::LeafNode<K,V>::new (collections/btree/node.rs:83:28)",
+"0x55d9d9a0b9fa: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::Leaf>::new_leaf (collections/btree/node.rs:217:29)",
+"0x55d9d9a0f6ca: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::LeafOrInternal>::new (collections/btree/node.rs:584:9)",
+"0x55d9d9900af8: alloc::collections::btree::map::BTreeMap<K,V,A>::bulk_build_from_sorted_iter (collections/btree/map.rs:1508:24)",
+"0x55d9d9c82fcd: cedar_policy_core::parser::cst_to_ast::construct_ext_func (src/parser/cst_to_ast.rs:2040:5)",
+"0x55d9d9cbf6ff: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::ast::name::Name>::into_func (src/parser/cst_to_ast.rs:1786:18)",
+"0x55d9d9bdbc82: alloc::str::<impl alloc::borrow::ToOwned for str>::to_owned (alloc/src/str.rs:209:46)",
+"0x55d9d9a60f4a: <serde_json::value::ser::Serializer as serde::ser::Serializer>::serialize_str (src/value/ser.rs:167:26)",
+"0x55d9d9c6cebb: serde::ser::impls::<impl serde::ser::Serialize for str>::serialize (src/ser/impls.rs:46:9)",
+"0x55d9d9aed3cf: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
+"0x55d9d9d4befc: lalrpop_util::state_machine::Parser<D,I>::drive (lalrpop-util-0.20.0/src/state_machine.rs:221:21)",
+"0x55d9d9c30332: cedar_policy_core::parser::text_to_cst::grammar::__parse__Ident::IdentParser::parse (src/parser/grammar.rs:10164:13)",
+"0x55d9d9bb563a: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9b40bf3: cedar_policy_core::parser::text_to_cst::parse_collect_errors (src/parser/text_to_cst.rs:49:18)",
+"0x55d9d9d075e6: cedar_policy_core::parser::text_to_cst::parse_ident (src/parser/text_to_cst.rs:114:5)",
+"0x55d9d9c71c5c: cedar_policy_core::parser::parse_ident (cedar-policy-core/src/parser.rs:336:15)",
+"0x55d9d9c86b29: cedar_policy_core::est::head_constraints::<impl core::convert::TryFrom<cedar_policy_core::est::head_constraints::PrincipalConstraint> for cedar_policy_core::ast::policy::PrincipalOrResourceConstraint>::try_from (src/est/head_constraints.rs:294:83)",
+"0x55d9d9c59d3e: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
+"0x55d9d9c866bc: cedar_policy_core::est::head_constraints::<impl core::convert::TryFrom<cedar_policy_core::est::head_constraints::PrincipalConstraint> for cedar_policy_core::ast::policy::PrincipalConstraint>::try_from (src/est/head_constraints.rs:213:9)",
+"0x55d9d9c59d9e: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
+"0x55d9d9b793a1: cedar_policy_core::est::Policy::try_into_ast_template (cedar-policy-core/src/est.rs:234:13)",
+"0x55d9d9c9cf6e: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:518:17)",
+"0x55d9d9b6d237: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:525:21)",
+"0x55d9d98cda4f: <serde_json::value::ser::Serializer as serde::ser::Serializer>::serialize_newtype_variant (src/value/ser.rs:214:23)",
+"0x55d9d9862f82: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9918746: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:974:37)",
+"0x55d9da1bb88c: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
+"0x55d9da1bb88c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9da1bb88c: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9da1bb88c: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9da1bb88c: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:162:25)",
+"0x55d9da1bb88c: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
+"0x55d9da1bb88c: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
+"0x55d9da1bb88c: alloc::slice::<impl [T]>::to_vec (alloc/src/slice.rs:416:14)",
+"0x55d9da1bb88c: std::sys::unix::os_str::Slice::to_owned (sys/unix/os_str.rs:213:33)",
+"0x55d9d9de66df: std::ffi::os_str::OsStr::to_os_string (src/ffi/os_str.rs:775:27)",
+"0x55d9d9de66df: <std::path::PathBuf as core::convert::From<&T>>::from (std/src/path.rs:1696:34)",
+"0x55d9d9de3a9b: <T as core::convert::Into<U>>::into (src/convert/mod.rs:727:9)",
+"0x55d9d975859e: cedar_policy::integration_testing::resolve_integration_test_path (cedar-policy/src/integration_testing.rs:123:9)",
+"0x55d9d9758c31: cedar_policy::integration_testing::perform_integration_test_from_json_custom (cedar-policy/src/integration_testing.rs:183:20)",
+"0x55d9d9bf716f: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce19 (src/parser/grammar.rs:37083:20)",
+"0x55d9d9bedf1c: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35418:17)",
+"0x55d9d9a6fb29: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1537:38)",
+"0x55d9d9a2c85c: cedar_policy_validator::typecheck::Typechecker::expect_type (cedar-policy-validator/src/typecheck.rs:2058:9)",
+"0x55d9da16b1bf: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_post (src/hir/translate.rs:462:25)",
+"0x55d9d993cae7: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d993cae7: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d993cae7: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d993cae7: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
+"0x55d9d9948fde: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d99485dc: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9909fae: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a353ab: <alloc::collections::btree::set::BTreeSet<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (collections/btree/set.rs:1202:34)",
+"0x55d9d98cd81f: <serde_json::value::ser::Serializer as serde::ser::Serializer>::serialize_newtype_variant (src/value/ser.rs:214:23)",
+"0x55d9d98637d2: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d999c28e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d993a581: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d993a581: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d993a581: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d993a581: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
+"0x55d9d99491ab: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9948676: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d99dc35b: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d991861d: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:970:37)",
+"0x55d9d99f020c: cedar_policy_core::transitive_closure::add_ancestors_to_set (cedar-policy-core/src/transitive_closure.rs:158:17)",
+"0x55d9d9b1d3ec: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9aa3408: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa3408: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa3408: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9aa3408: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9ace06b: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acc916: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c8f7db: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a44db0: cedar_policy_validator::fuzzy_match::levenshtein_distance (cedar-policy-validator/src/fuzzy_match.rs:34:14)",
+"0x55d9d9bb4ff5: <cedar_policy_core::extensions::ipaddr::names::IS_IPV4 as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/ipaddr.rs:35:41)",
+"0x55d9d9bb4ff5: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9bdc061: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
+"0x55d9d9b686e8: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
+"0x55d9d9d571fd: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
+"0x55d9d993987f: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:26:32)",
+"0x55d9d9a9e7a5: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a9e7a5: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a9e7a5: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9a9e7a5: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9acda2e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acc6f9: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c5fc52: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9c5fc52: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
+"0x55d9d9a92c20: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d9d05139: alloc::boxed::Box<T,A>::try_new_uninit_in (alloc/src/boxed.rs:483:19)",
+"0x55d9d9d04b6a: alloc::boxed::Box<T,A>::new_uninit_in (alloc/src/boxed.rs:448:15)",
+"0x55d9d9addded: alloc::collections::btree::node::LeafNode<K,V>::new (collections/btree/node.rs:83:28)",
+"0x55d9d9ad553a: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::Leaf>::new_leaf (collections/btree/node.rs:217:29)",
+"0x55d9d9ad79da: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::LeafOrInternal>::new (collections/btree/node.rs:584:9)",
+"0x55d9d9a83e48: alloc::collections::btree::map::BTreeMap<K,V,A>::bulk_build_from_sorted_iter (collections/btree/map.rs:1508:24)",
+"0x55d9d9bb3c15: <cedar_policy_core::extensions::ipaddr::names::IS_MULTICAST as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/ipaddr.rs:38:46)",
+"0x55d9d9bb3c15: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9bdbe81: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
+"0x55d9d9b68538: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
+"0x55d9d9d5a13d: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
+"0x55d9d9f66f3c: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:560:28)",
+"0x55d9d97589fd: cedar_policy::integration_testing::resolve_integration_test_path (cedar-policy/src/integration_testing.rs:112:9)",
+"0x55d9d9868754: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9a9fa35: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a9fa35: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a9fa35: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9a9fa35: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9acd97e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acc677: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c2a4ce: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a639ec: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Policy>>>::to_policy_template (src/parser/cst_to_ast.rs:219:29)",
+"0x55d9d9f3fb03: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9f43759: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9ee396b: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9f07c24: regex_automata::hybrid::dfa::Lazy::add_state (src/hybrid/dfa.rs:2270:9)",
+"0x55d9d9f09af3: regex_automata::hybrid::dfa::Lazy::init_cache (src/hybrid/dfa.rs:2496:13)",
+"0x55d9d9866636: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d999d71e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d993d047: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d993d047: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d993d047: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d993d047: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
+"0x55d9d994909e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9948829: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d990a00e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a34feb: <alloc::collections::btree::set::BTreeSet<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (collections/btree/set.rs:1202:34)",
+"0x55d9d9778a37: <serde_json::value::de::<impl serde::de::Deserialize for serde_json::value::Value>::deserialize::ValueVisitor as serde::de::Visitor>::visit_seq (src/value/de.rs:98:21)",
+"0x55d9d9771adb: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_any (serde_json-1.0.107/src/de.rs:1427:31)",
+"0x55d9da1129a8: regex_syntax::ast::visitor::HeapVisitor::visit (src/ast/visitor.rs:218:17)",
+"0x55d9da1115e1: regex_syntax::ast::visitor::visit (src/ast/visitor.rs:119:5)",
+"0x55d9d9c5ae7b: cedar_policy_core::ast::request::Request::new (src/ast/request.rs:90:23)",
+"0x55d9d9f353de: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9f24137: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9f24137: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9f24137: <T as alloc::vec::spec_from_elem::SpecFromElem>::from_elem (src/vec/spec_from_elem.rs:15:21)",
+"0x55d9d9ee5b77: alloc::vec::from_elem (src/vec/mod.rs:2550:5)",
+"0x55d9d9f2ffaf: regex_automata::nfa::thompson::map::Utf8BoundedMap::clear (nfa/thompson/map.rs:130:24)",
+"0x55d9d9ef4fb3: regex_automata::nfa::thompson::compiler::Utf8State::clear (nfa/thompson/compiler.rs:1746:9)",
+"0x55d9d9ef5050: regex_automata::nfa::thompson::compiler::Utf8Compiler::new (nfa/thompson/compiler.rs:1757:9)",
+"0x55d9d9866123: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9a40c2c: cedar_policy_core::ast::expr::ExprBuilder<T>::mul (src/ast/expr.rs:1000:18)",
+"0x55d9d991cb33: cedar_policy_validator::typecheck::Typechecker::typecheck_mul::{{closure}} (cedar-policy-validator/src/typecheck.rs:1446:17)",
+"0x55d9d9911805: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
+"0x55d9d9a2ae27: cedar_policy_validator::typecheck::Typechecker::typecheck_mul (cedar-policy-validator/src/typecheck.rs:1444:9)",
+"0x55d9d9a28a92: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:923:17)",
+"0x55d9d9cf4c9d: cedar_policy_core::est::expr::Expr::add (src/est/expr.rs:362:20)",
+"0x55d9d9cfa1d4: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Add>>::try_from (src/est/expr.rs:884:28)",
+"0x55d9d9ef539f: regex_automata::nfa::thompson::compiler::Utf8Compiler::add (nfa/thompson/compiler.rs:1781:9)",
+"0x55d9d9867b7b: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d99c4c64: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d99c4c64: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d99c4c64: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d99d4e38: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9c041ef: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce120 (src/parser/grammar.rs:39086:20)",
+"0x55d9d9bef3cb: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35730:17)",
+"0x55d9d99306c9: cedar_policy_validator::schema::ValidatorNamespaceDef::parse_possibly_qualified_name_with_default_namespace (cedar-policy-validator/src/schema.rs:612:21)",
+"0x55d9da14b723: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9da152e49: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9da10139f: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9da17fb06: regex_syntax::ast::ClassSetUnion::push (src/ast/mod.rs:1176:9)",
+"0x55d9da12a492: regex_syntax::ast::parse::ParserI<P>::parse_set_class (src/ast/parse.rs:1798:21)",
+"0x55d9d9b73018: cedar_policy_core::evaluator::Evaluator::get_attr (cedar-policy-core/src/evaluator.rs:635:15)",
+"0x55d9d9c76d5f: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_ref_or_refs (src/parser/cst_to_ast.rs:1603:61)",
+"0x55d9d9864bde: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d98826e5: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
+"0x55d9d986530b: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9bac473: cedar_policy_core::extensions::ipaddr::is_multicast (src/extensions/ipaddr.rs:246:18)",
+"0x55d9d9bb18d4: core::ops::function::Fn::call (src/ops/function.rs:79:5)",
+"0x55d9d9b231ee: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9aa56e7: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa56e7: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa56e7: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9aa56e7: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
+"0x55d9d9ace03e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acc319: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c17fee: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9ccb7de: cedar_policy_core::parser::text_to_cst::grammar::__action101 (src/parser/grammar.rs:59024:5)",
+"0x55d9d9865db4: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9991478: cedar_policy_validator::schema::ValidatorNamespaceDef::build_entity_types::{{closure}} (cedar-policy-validator/src/schema.rs:305:32)",
+"0x55d9d9bac193: cedar_policy_core::extensions::ipaddr::is_ipv6 (src/extensions/ipaddr.rs:232:18)",
+"0x55d9d9bb1894: core::ops::function::Fn::call (src/ops/function.rs:79:5)",
+"0x55d9da185894: regex_syntax::hir::Hir::alternation (src/hir/mod.rs:562:33)",
+"0x55d9d9be7d76: <serde_json::value::Value as core::clone::Clone>::clone (src/value/mod.rs:150:12)",
+"0x55d9d9b542a4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d9b542a4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d9b542a4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d9b65c38: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9ed7e1c: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3439:13)",
+"0x55d9d98658a1: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9f6fabb: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9f6fabb: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
+"0x55d9d9f85e24: regex_automata::meta::strategy::new (src/meta/strategy.rs:185:8)",
+"0x55d9d9f7b4df: regex_automata::meta::regex::Builder::build_many_from_hir (src/meta/regex.rs:3553:21)",
+"0x55d9d99c6b24: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d99c6b24: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d99c6b24: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d99d5a98: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9f711cb: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9f711cb: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
+"0x55d9d9ef6747: regex_automata::nfa::thompson::nfa::Inner::into_nfa (nfa/thompson/nfa.rs:1341:13)",
+"0x55d9d9f8af53: regex_automata::meta::strategy::Core::new (src/meta/strategy.rs:501:30)",
+"0x55d9d9cf40cd: cedar_policy_core::est::expr::Expr::eq (src/est/expr.rs:290:20)",
+"0x55d9d9cf9920: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Relation>>::try_from (src/est/expr.rs:795:36)",
+"0x55d9d9a44e24: cedar_policy_validator::fuzzy_match::levenshtein_distance (cedar-policy-validator/src/fuzzy_match.rs:35:14)",
+"0x55d9d9a9bcd2: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a9bcd2: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a9bcd2: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9a9bcd2: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9acdc4e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acc299: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c5fa12: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9c5fa12: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
+"0x55d9d9a94890: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d9a9db09: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a9db09: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a9db09: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9a9db09: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9acdffe: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acc569: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9b053be: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a8277b: <alloc::collections::btree::map::BTreeMap<K,V> as core::iter::traits::collect::FromIterator<(K,V)>>::from_iter (collections/btree/map.rs:2229:34)",
+"0x55d9d9a87347: <alloc::collections::btree::map::BTreeMap<K,V,A> as core::clone::Clone>::clone::clone_subtree (collections/btree/map.rs:219:36)",
+"0x55d9d9a27e67: cedar_policy_validator::typecheck::Typechecker::link_request_env (cedar-policy-validator/src/typecheck.rs:430:9)",
+"0x55d9d9914ed0: cedar_policy_validator::typecheck::Typechecker::apply_typecheck_fn_by_request_env::{{closure}} (cedar-policy-validator/src/typecheck.rs:347:29)",
+"0x55d9d990d53c: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
+"0x55d9d99e8809: core::option::Option<T>::map (core/src/option.rs:1099:29)",
+"0x55d9d99d8885: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::next (iter/adapters/map.rs:103:9)",
+"0x55d9da11f906: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9da11f906: regex_syntax::ast::parse::ParserI<P>::pop_group (src/ast/parse.rs:761:29)",
+"0x55d9d9c81dce: cedar_policy_core::parser::cst_to_ast::construct_expr_neg (src/parser/cst_to_ast.rs:1950:5)",
+"0x55d9d9c912e7: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Unary>>>::to_expr_or_special::{{closure}}::{{closure}} (src/parser/cst_to_ast.rs:1300:50)",
+"0x55d9d9c1a14d: core::option::Option<T>::map (core/src/option.rs:1099:29)",
+"0x55d9d9c91223: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Unary>>>::to_expr_or_special::{{closure}} (src/parser/cst_to_ast.rs:1300:40)",
+"0x55d9d9cf4c1c: cedar_policy_core::est::expr::Expr::add (src/est/expr.rs:361:19)",
+"0x55d9d9bb3915: <cedar_policy_core::extensions::ipaddr::names::IS_IN_RANGE as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/ipaddr.rs:39:45)",
+"0x55d9d9bb3915: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9bdbfa1: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
+"0x55d9d9b68658: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
+"0x55d9d9d5ad0d: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
+"0x55d9d9aa0fe1: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa0fe1: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa0fe1: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9aa0fe1: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
+"0x55d9d9acda9b: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9accae6: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9af0edb: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9be2df5: cedar_policy_core::ast::expr::ExprBuilder<T>::set (src/ast/expr.rs:1054:52)",
+"0x55d9d986435c: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9f39891: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9f43a29: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9ee2806: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9f797bb: regex_automata::meta::regex::RegexInfo::new (src/meta/regex.rs:1928:13)",
+"0x55d9d99792ac: <cedar_policy_validator::schema_file_format::_::<impl serde::de::Deserialize for cedar_policy_validator::schema_file_format::TypeOfAttribute>::deserialize::__Visitor as serde::de::Visitor>::visit_map (cedar-policy-validator/src/schema_file_format.rs:588:46)",
+"0x55d9d999371f: cedar_policy_validator::schema::ValidatorNamespaceDef::parse_apply_spec_type_list::{{closure}}::{{closure}} (cedar-policy-validator/src/schema.rs:582:29)",
+"0x55d9d99ddaa5: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
+"0x55d9d9b53af4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d9b53af4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d9b53af4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d9b65b88: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9aa3781: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa3781: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa3781: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9aa3781: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
+"0x55d9d9acdb0b: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9acc536: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9af151b: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9c8b64c: cedar_policy_core::parser::err::ParseErrors::errors_as_strings (src/parser/err.rs:513:9)",
+"0x55d9d9bb223b: core::ops::function::FnMut::call_mut (src/ops/function.rs:166:5)",
+"0x55d9d9afa917: core::iter::adapters::map::map_fold::{{closure}} (iter/adapters/map.rs:84:28)",
+"0x55d9d9b93091: core::iter::traits::iterator::Iterator::fold (iter/traits/iterator.rs:2482:21)",
+"0x55d9d9aeb262: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::fold (iter/adapters/map.rs:124:9)",
+"0x55d9d9af1cd6: core::iter::traits::iterator::Iterator::for_each (iter/traits/iterator.rs:857:9)",
+"0x55d9d993c4af: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d993c4af: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d993c4af: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d993c4af: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d99490fe: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9948517: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d98ff48e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d98fdb7c: <alloc::collections::btree::map::BTreeMap<K,V> as core::iter::traits::collect::FromIterator<(K,V)>>::from_iter (collections/btree/map.rs:2229:34)",
+"0x55d9d9ea9d28: alloc::raw_vec::RawVec<T,A>::reserve_exact (alloc/src/raw_vec.rs:333:24)",
+"0x55d9d9eca2fb: alloc::vec::Vec<T,A>::reserve_exact (src/vec/mod.rs:938:9)",
+"0x55d9d9eafc7c: indexmap::map::core::IndexMapCore<K,V>::reserve_entries (src/map/core.rs:213:9)",
+"0x55d9d9ccc7e0: cedar_policy_core::parser::text_to_cst::grammar::__action142 (src/parser/grammar.rs:59627:5)",
+"0x55d9d9d1d68f: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce65 (src/parser/grammar.rs:29283:20)",
+"0x55d9d9d0e7b6: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26814:17)",
+"0x55d9da151e43: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9da152c99: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9da10206f: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9da120c00: regex_syntax::ast::parse::ParserI<P>::push_class_open (src/ast/parse.rs:828:9)",
+"0x55d9da12a80c: regex_syntax::ast::parse::ParserI<P>::parse_set_class (src/ast/parse.rs:1768:29)",
+"0x55d9d9913f21: cedar_policy_validator::typecheck::TypecheckAnswer::sequence_all_then_typecheck (cedar-policy-validator/src/typecheck.rs:202:13)",
+"0x55d9d9bb3685: <cedar_policy_core::extensions::ipaddr::names::IP_FROM_STR_NAME as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/ipaddr.rs:34:50)",
+"0x55d9d9bb3685: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9bdc381: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
+"0x55d9d9b68898: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
+"0x55d9d9d5b4ed: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
+"0x55d9d9ef0dc9: regex_automata::nfa::thompson::compiler::Compiler::c_at_least (nfa/thompson/compiler.rs:1277:28)",
+"0x55d9d99132d5: cedar_policy_validator::typecheck::TypecheckAnswer::sequence_all_then_typecheck (cedar-policy-validator/src/typecheck.rs:202:13)",
+"0x55d9d9b0bca3: cedar_policy_core::extensions::decimal::decimal_from_str (src/extensions/decimal.rs:177:15)",
+"0x55d9d9bb1a34: core::ops::function::Fn::call (src/ops/function.rs:79:5)",
+"0x55d9d98cca44: serde::ser::Serializer::collect_seq (src/ser/mod.rs:1277:35)",
+"0x55d9d98900c6: serde::ser::impls::<impl serde::ser::Serialize for alloc::vec::Vec<T>>::serialize (src/ser/impls.rs:194:17)",
+"0x55d9d9890019: serde::ser::impls::<impl serde::ser::Serialize for &T>::serialize (src/ser/impls.rs:456:17)",
+"0x55d9d9bdba9f: core::iter::traits::iterator::Iterator::partition::extend::{{closure}} (iter/traits/iterator.rs:2096:21)",
+"0x55d9d9b6db4f: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:501:23)",
+"0x55d9d9f3d0d3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9f43699: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9ee325b: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9f67dc3: regex_automata::nfa::thompson::builder::Builder::add_capture_start (nfa/thompson/builder.rs:1023:13)",
+"0x55d9d9c82885: cedar_policy_core::parser::cst_to_ast::construct_expr_rel (src/parser/cst_to_ast.rs:1995:27)",
+"0x55d9d9bed4bb: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::PolicyParser::new (src/parser/grammar.rs:35282:29)",
+"0x55d9d9bb44a1: <cedar_policy_core::parser::text_to_cst::POLICY_PARSER as core::ops::deref::Deref>::deref::__static_ref_initialize (src/parser/text_to_cst.rs:72:55)",
+"0x55d9d9bb44a1: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9cf4d6c: cedar_policy_core::est::expr::Expr::sub (src/est/expr.rs:369:19)",
+"0x55d9d9926999: alloc::boxed::Box<T,A>::try_new_uninit_in (alloc/src/boxed.rs:483:19)",
+"0x55d9d992609a: alloc::boxed::Box<T,A>::new_uninit_in (alloc/src/boxed.rs:448:15)",
+"0x55d9d9a1764d: alloc::collections::btree::node::LeafNode<K,V>::new (collections/btree/node.rs:83:28)",
+"0x55d9d9a0b97a: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::Leaf>::new_leaf (collections/btree/node.rs:217:29)",
+"0x55d9d9a0f6ea: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::LeafOrInternal>::new (collections/btree/node.rs:584:9)",
+"0x55d9d9900cc8: alloc::collections::btree::map::BTreeMap<K,V,A>::bulk_build_from_sorted_iter (collections/btree/map.rs:1508:24)",
+"0x55d9d9991bd3: cedar_policy_validator::schema::ValidatorNamespaceDef::build_entity_types::{{closure}}::{{closure}} (cedar-policy-validator/src/schema.rs:315:29)",
+"0x55d9d99decf5: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
+"0x55d9d9b6fa81: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:367:34)",
+"0x55d9d9b2d2e3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9b3d2a9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9abb53d: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9c6bfb1: cedar_policy_core::authorizer::Authorizer::evaluate_policies (cedar-policy-core/src/authorizer.rs:313:21)",
+"0x55d9d975894f: cedar_policy::integration_testing::resolve_integration_test_path (cedar-policy/src/integration_testing.rs:110:28)",
+"0x55d9da14c9e3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9da152de9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9da101791: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9da16f487: regex_syntax::hir::translate::TranslatorI::push (src/hir/translate.rs:705:9)",
+"0x55d9da16a83d: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_pre (src/hir/translate.rs:359:17)",
+"0x55d9d9ed1b77: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
+"0x55d9d9ed1b77: alloc::sync::Arc<[T]>::allocate_for_slice::{{closure}} (alloc/src/sync.rs:1380:33)",
+"0x55d9d9ed1501: alloc::sync::Arc<T>::try_allocate_for_layout (alloc/src/sync.rs:1322:19)",
+"0x55d9d9ed139b: alloc::sync::Arc<T>::allocate_for_layout (alloc/src/sync.rs:1304:13)",
+"0x55d9d9ed1b44: alloc::sync::Arc<[T]>::allocate_for_slice (alloc/src/sync.rs:1378:13)",
+"0x55d9d9ed1a8e: alloc::sync::Arc<[T]>::copy_from_slice (alloc/src/sync.rs:1392:23)",
+"0x55d9d9ed1d91: <alloc::sync::Arc<[T]> as alloc::sync::ArcFromSlice<T>>::from_slice (alloc/src/sync.rs:1468:18)",
+"0x55d9d9ed1d91: <alloc::sync::Arc<[T]> as core::convert::From<&[T]>>::from (alloc/src/sync.rs:2672:9)",
+"0x55d9d9ed1d91: <alloc::sync::Arc<str> as core::convert::From<&str>>::from (alloc/src/sync.rs:2690:19)",
+"0x55d9d9ed20b3: <T as core::convert::Into<U>>::into (src/convert/mod.rs:727:9)",
+"0x55d9d9b6ae71: cedar_policy_core::evaluator::Evaluator::new (cedar-policy-core/src/evaluator.rs:175:35)",
+"0x55d9d9c6a71b: cedar_policy_core::authorizer::Authorizer::is_authorized_core (cedar-policy-core/src/authorizer.rs:168:26)",
+"0x55d9d9c6a016: cedar_policy_core::authorizer::Authorizer::is_authorized (cedar-policy-core/src/authorizer.rs:97:15)",
+"0x55d9d98c3bc3: cedar_policy::api::Authorizer::is_authorized (cedar-policy/src/api.rs:605:9)",
+"0x55d9d9c5ad76: cedar_policy_core::ast::request::Request::new (src/ast/request.rs:88:24)",
+"0x55d9d9a9b60a: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a9b60a: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a9b60a: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9a9b60a: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9ac083c: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
+"0x55d9d9acbda7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c5f952: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9c5f952: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
+"0x55d9d9a93a58: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d9d052e9: alloc::boxed::Box<T,A>::try_new_uninit_in (alloc/src/boxed.rs:483:19)",
+"0x55d9d9d0482a: alloc::boxed::Box<T,A>::new_uninit_in (alloc/src/boxed.rs:448:15)",
+"0x55d9d9addf0d: alloc::collections::btree::node::LeafNode<K,V>::new (collections/btree/node.rs:83:28)",
+"0x55d9d9ad551a: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::Leaf>::new_leaf (collections/btree/node.rs:217:29)",
+"0x55d9d9ad7a1a: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::LeafOrInternal>::new (collections/btree/node.rs:584:9)",
+"0x55d9d9a83c78: alloc::collections::btree::map::BTreeMap<K,V,A>::bulk_build_from_sorted_iter (collections/btree/map.rs:1508:24)",
+"0x55d9d999dcfe: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9938543: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9938543: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9938543: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9938543: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d994917e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9948ba9: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9961922: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9961922: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
+"0x55d9d98e6ddd: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d986640f: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9da18a267: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9da18a267: regex_syntax::hir::Properties::union (src/hir/mod.rs:2313:20)",
+"0x55d9da18bc6c: regex_syntax::hir::Properties::alternation (src/hir/mod.rs:2578:9)",
+"0x55d9da185f4e: regex_syntax::hir::Hir::alternation (src/hir/mod.rs:614:21)",
+"0x55d9d9a61081: <serde_json::value::ser::MapKeySerializer as serde::ser::Serializer>::serialize_str (src/value/ser.rs:549:12)",
+"0x55d9d9c6ce8b: serde::ser::impls::<impl serde::ser::Serialize for str>::serialize (src/ser/impls.rs:46:9)",
+"0x55d9d985280e: cedar_policy_core::entities::json::entities::EntityJsonParser<S>::parse_ejson::{{closure}} (entities/json/entities.rs:272:37)",
+"0x55d9d982e7fb: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
+"0x55d9d98095cd: <core::iter::adapters::GenericShunt<I,R> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/mod.rs:195:9)",
+"0x55d9d9a5b64f: cedar_policy_validator::extensions::all_available_extension_schemas (cedar-policy-validator/src/extensions.rs:31:5)",
+"0x55d9d9cf53cb: cedar_policy_core::est::expr::Expr::like (src/est/expr.rs:425:19)",
+"0x55d9d9cf820f: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Relation>>::try_from (src/est/expr.rs:862:24)",
+"0x55d9d99be0c4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d99be0c4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d99be0c4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d99d4d88: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d990ff95: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
+"0x55d9d9c9f73d: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:482:17)",
+"0x55d9d9ad0895: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d9ad0895: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
+"0x55d9d9932899: cedar_policy_validator::schema::EntityTypeDescription::new (cedar-policy-validator/src/schema.rs:1334:17)",
+"0x55d9d9932403: <cedar_policy_validator::schema::CoreSchema as cedar_policy_core::entities::json::schema::Schema>::entity_type (cedar-policy-validator/src/schema.rs:1284:17)",
+"0x55d9d9850809: cedar_policy_core::entities::json::entities::EntityJsonParser<S>::parse_ejson (entities/json/entities.rs:183:53)",
+"0x55d9d99056bd: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9d99056bd: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_entities_satisfying_constraint (cedar-policy-validator/src/rbac.rs:390:17)",
+"0x55d9da1514e3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9da152f39: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9da101a24: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9da161be5: regex_syntax::utf8::Utf8Sequences::push (regex-syntax-0.7.5/src/utf8.rs:321:9)",
+"0x55d9da161b92: regex_syntax::utf8::Utf8Sequences::new (regex-syntax-0.7.5/src/utf8.rs:306:9)",
+"0x55d9d992266d: cedar_policy_validator::typecheck::Typechecker::typecheck_unary::{{closure}} (cedar-policy-validator/src/typecheck.rs:1954:29)",
+"0x55d9d9b0c3e1: cedar_policy_core::extensions::decimal::as_decimal (src/extensions/decimal.rs:198:13)",
+"0x55d9d9b0cf98: cedar_policy_core::extensions::decimal::decimal_ge (src/extensions/decimal.rs:240:16)",
+"0x55d9d9bb1938: core::ops::function::Fn::call (src/ops/function.rs:79:5)",
+"0x55d9d9b570c4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d9b570c4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d9b570c4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d9b658c8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9c9a410: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:574:17)",
+"0x55d9da18bab5: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9da18bab5: regex_syntax::hir::Properties::concat (src/hir/mod.rs:2573:20)",
+"0x55d9da185531: regex_syntax::hir::Hir::concat (src/hir/mod.rs:484:21)",
+"0x55d9d9b6c847: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:547:23)",
+"0x55d9d9b1c53e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d988a182: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d988a182: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d988a182: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d988a182: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9890ffe: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9890d99: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d985b302: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d985b302: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
+"0x55d9d9811738: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d9903b56: <alloc::collections::btree::map::BTreeMap<K,V,A> as core::clone::Clone>::clone::clone_subtree (collections/btree/map.rs:219:36)",
+"0x55d9d9927059: alloc::boxed::Box<T,A>::try_new_uninit_in (alloc/src/boxed.rs:483:19)",
+"0x55d9d99268ba: alloc::boxed::Box<T,A>::new_uninit_in (alloc/src/boxed.rs:448:15)",
+"0x55d9d9a1752d: alloc::collections::btree::node::LeafNode<K,V>::new (collections/btree/node.rs:83:28)",
+"0x55d9d9a0b99a: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::Leaf>::new_leaf (collections/btree/node.rs:217:29)",
+"0x55d9d9a32e3c: alloc::collections::btree::map::entry::VacantEntry<K,V,A>::insert (btree/map/entry.rs:355:32)",
+"0x55d9d9901df4: alloc::collections::btree::map::BTreeMap<K,V,A>::insert (collections/btree/map.rs:1006:17)",
+"0x55d9d9c92897: cedar_policy_core::parser::cst_to_ast::construct_expr_and (src/parser/cst_to_ast.rs:1978:17)",
+"0x55d9d9c9079e: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::And>>>::to_expr_or_special::{{closure}} (src/parser/cst_to_ast.rs:1007:46)",
+"0x55d9d9c1cf0d: core::option::Option<T>::map (core/src/option.rs:1099:29)",
+"0x55d9d9a68be1: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::And>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1005:55)",
+"0x55d9d9bb4c11: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9c62b6f: core::result::Result<T,E>::map (core/src/result.rs:759:25)",
+"0x55d9d9c59eb1: cedar_policy_core::est::head_constraints::<impl core::convert::TryFrom<cedar_policy_core::est::head_constraints::ActionConstraint> for cedar_policy_core::ast::policy::ActionConstraint>::try_from::{{closure}} (src/est/head_constraints.rs:405:29)",
+"0x55d9d9af6293: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
+"0x55d9d9b94a11: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
+"0x55d9d9cf55e8: cedar_policy_core::est::expr::Expr::ite (src/est/expr.rs:435:24)",
+"0x55d9d9f8a727: regex_automata::meta::strategy::Core::new (src/meta/strategy.rs:463:19)",
+"0x55d9d9bb58f5: <cedar_policy_core::extensions::decimal::names::LESS_THAN_OR_EQUAL as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/decimal.rs:49:52)",
+"0x55d9d9bb58f5: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
+"0x55d9d9bdc111: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
+"0x55d9d9b682f8: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
+"0x55d9d9d5a91d: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
+"0x55d9d9bf9db8: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce38 (src/parser/grammar.rs:37483:20)",
+"0x55d9d9bee2e5: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35475:17)",
+"0x55d9d9b389b3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9889999: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d988e8a7: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9783043: <serde::de::impls::<impl serde::de::Deserialize for alloc::vec::Vec<T>>::deserialize::VecVisitor<T> as serde::de::Visitor>::visit_seq (src/de/impls.rs:1035:21)",
+"0x55d9d97751f5: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_seq (serde_json-1.0.107/src/de.rs:1740:31)",
+"0x55d9d9be3467: cedar_policy_core::ast::expr::ExprBuilder<T>::record (src/ast/expr.rs:1060:20)",
+"0x55d9d9c8394b: cedar_policy_core::parser::cst_to_ast::construct_expr_record (src/parser/cst_to_ast.rs:2072:5)",
+"0x55d9d9a70fa4: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1657:46)",
+"0x55d9d986501f: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9865973: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9d21f3a: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce103 (src/parser/grammar.rs:30026:20)",
+"0x55d9d9d0ef48: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26928:17)",
+"0x55d9d9b587d4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d9b587d4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d9b587d4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d9b656b8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9911953: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
+"0x55d9d9b330a3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9b3d3f9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9aba744: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d97839e4: <serde::__private::de::content::ContentVisitor as serde::de::Visitor>::visit_map (src/private/de.rs:508:17)",
+"0x55d9d9772720: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_any (serde_json-1.0.107/src/de.rs:1438:31)",
+"0x55d9d9b1ce0e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d988a5b0: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d988a5b0: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d988a5b0: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d988a5b0: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d988f60b: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
+"0x55d9d9890e29: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d985b4b2: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d985b4b2: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
+"0x55d9d98114a8: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d99c72d4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d99c72d4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d99c72d4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d99d5ca8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9830d13: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
+"0x55d9d98941fb: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
+"0x55d9d982e93b: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
+"0x55d9d982fa0b: core::iter::traits::iterator::Iterator::find (iter/traits/iterator.rs:2773:9)",
+"0x55d9d9a9fde6: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9a9fde6: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9a9fde6: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9a9fde6: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9ac186c: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
+"0x55d9d9acd1a7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c5fce2: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9c5fce2: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
+"0x55d9d9a95978: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d9999353: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:146:32)",
+"0x55d9d9f45478: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
+"0x55d9d9ee5150: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
+"0x55d9d9ee5150: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
+"0x55d9d9edee86: alloc::vec::Vec<T,A>::extend_with (src/vec/mod.rs:2492:9)",
+"0x55d9d9ee4ede: alloc::vec::Vec<T,A>::resize (src/vec/mod.rs:2358:13)",
+"0x55d9d9a712d1: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1639:41)",
+"0x55d9d9c8e0d1: <cedar_policy_core::parser::err::ToASTError as core::fmt::Display>::fmt (src/parser/err.rs:93:29)",
+"0x55d9d9c8ba62: <cedar_policy_core::parser::err::ParseError as core::fmt::Display>::fmt (src/parser/err.rs:49:36)",
+"0x55d9d9cf1767: <&T as core::fmt::Display>::fmt (src/fmt/mod.rs:2418:62)",
+"0x55d9d9b2233e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9aa4ef2: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9aa4ef2: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9aa4ef2: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9aa4ef2: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9acd90e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9accc27: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9c2a44e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9a6ad38: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Mult>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1157:43)",
+"0x55d9d9a2d2d6: cedar_policy_validator::typecheck::Typechecker::typecheck_extension (cedar-policy-validator/src/typecheck.rs:2164:21)",
+"0x55d9d9782946: std::fs::read_to_string (std/src/fs.rs:297:5)",
+"0x55d9d9758d14: cedar_policy::integration_testing::perform_integration_test_from_json_custom (cedar-policy/src/integration_testing.rs:185:19)",
+"0x55d9d9f41723: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9f438d9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9ee3e74: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9f65e9f: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:451:21)",
+"0x55d9d9efd844: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d9efd844: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d9efd844: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d9efef88: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9b3e6c8: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
+"0x55d9d9abd210: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
+"0x55d9d9abd210: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
+"0x55d9d9acb594: <alloc::vec::Vec<T,A> as core::iter::traits::collect::Extend<T>>::extend_reserve (src/vec/mod.rs:2796:9)",
+"0x55d9d9a99287: <(ExtendA,ExtendB) as core::iter::traits::collect::Extend<(A,B)>>::extend (iter/traits/collect.rs:435:13)",
+"0x55d9d999823a: cedar_policy_validator::schema::ValidatorSchema::get_entities_in_set::{{closure}} (cedar-policy-validator/src/schema.rs:1187:32)",
+"0x55d9d99900d9: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
+"0x55d9d99e5a9a: core::option::Option<T>::map (core/src/option.rs:1099:29)",
+"0x55d9d99d8daa: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::next (iter/adapters/map.rs:103:9)",
+"0x55d9d98d84e2: alloc::str::<impl alloc::borrow::ToOwned for str>::to_owned (alloc/src/str.rs:209:46)",
+"0x55d9d989f7da: <serde_json::value::ser::Serializer as serde::ser::Serializer>::serialize_str (src/value/ser.rs:167:26)",
+"0x55d9d989f863: <serde_json::value::ser::Serializer as serde::ser::Serializer>::serialize_unit_variant (src/value/ser.rs:192:9)",
+"0x55d9d9867513: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d986a0ab: <cedar_policy_core::est::expr::_::<impl serde::de::Deserialize for cedar_policy_core::est::expr::ExtFuncCall>::deserialize::__Visitor as serde::de::Visitor>::visit_map (src/est/expr.rs:241:46)",
+"0x55d9d9849fe0: serde::__private::de::content::visit_content_map_ref (src/private/de.rs:1708:26)",
+"0x55d9d9b5d0bd: hashbrown::raw::RawTable<T,A>::new_uninitialized (src/raw/mod.rs:442:20)",
+"0x55d9d9b43695: <hashbrown::raw::RawTable<T,A> as core::clone::Clone>::clone (src/raw/mod.rs:1606:39)",
+"0x55d9d9cad936: <hashbrown::map::HashMap<K,V,S,A> as core::clone::Clone>::clone (hashbrown-0.12.3/src/map.rs:197:20)",
+"0x55d9d9b06bbd: <std::collections::hash::map::HashMap<K,V,S> as core::clone::Clone>::clone (collections/hash/map.rs:1267:22)",
+"0x55d9d9b0ccf8: cedar_policy_core::extensions::decimal::decimal_gt (src/extensions/decimal.rs:232:16)",
+"0x55d9d9bb19a8: core::ops::function::Fn::call (src/ops/function.rs:79:5)",
+"0x55d9da11fa70: regex_syntax::ast::parse::ParserI<P>::pop_group (src/ast/parse.rs:767:9)",
+"0x55d9d9a2abe8: cedar_policy_validator::typecheck::Typechecker::enforce_strict_equality (cedar-policy-validator/src/typecheck.rs:1409:21)",
+"0x55d9d991b0e1: cedar_policy_validator::typecheck::Typechecker::typecheck_binary::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1241:29)",
+"0x55d9d9cf404c: cedar_policy_core::est::expr::Expr::eq (src/est/expr.rs:289:19)",
+"0x55d9d9b6a48d: cedar_policy_core::evaluator::RestrictedEvaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:107:23)",
+"0x55d9d986479d: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9bfd72f: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce65 (src/parser/grammar.rs:38025:20)",
+"0x55d9d9bee846: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35556:17)",
+"0x55d9d9cf443c: cedar_policy_core::est::expr::Expr::less (src/est/expr.rs:313:19)",
+"0x55d9d9ec6c3a: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_any (serde_json-1.0.107/src/de.rs:1421:45)",
+"0x55d9d9c86931: cedar_policy_core::est::head_constraints::<impl core::convert::TryFrom<cedar_policy_core::est::head_constraints::PrincipalConstraint> for cedar_policy_core::ast::policy::PrincipalOrResourceConstraint>::try_from (src/est/head_constraints.rs:308:83)",
+"0x55d9d98650f1: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9ebad9c: serde::de::Visitor::visit_borrowed_str (src/de/mod.rs:1508:9)",
+"0x55d9d9f67512: regex_automata::nfa::thompson::builder::Builder::start_pattern (nfa/thompson/builder.rs:630:9)",
+"0x55d9d9ef4454: regex_automata::nfa::thompson::compiler::Compiler::start_pattern (nfa/thompson/compiler.rs:1609:9)",
+"0x55d9d9a3c031: <cedar_policy_validator::types::AttributeType as core::clone::Clone>::clone (cedar-policy-validator/src/types.rs:1293:5)",
+"0x55d9d9b523e4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d9b523e4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d9b523e4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d9b65978: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9b33553: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9b3e788: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
+"0x55d9d9abd4b0: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
+"0x55d9d9abd4b0: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
+"0x55d9d9abc4b0: alloc::vec::Vec<T,A>::insert (src/vec/mod.rs:1446:13)",
+"0x55d9d9cff269: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Member>>::try_from (src/est/expr.rs:1243:37)",
+"0x55d9d99c0734: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d99c0734: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d99c0734: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d99d4cd8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9866564: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9da1234be: regex_syntax::ast::parse::ParserI<P>::parse_with_comments (src/ast/parse.rs:979:21)",
+"0x55d9d9f429e1: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9f453b8: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
+"0x55d9d9ee5570: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
+"0x55d9d9ee5570: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
+"0x55d9d9ee0ad8: alloc::vec::Vec<T,A>::extend_trusted (src/vec/mod.rs:2840:13)",
+"0x55d9d9eea028: <alloc::vec::Vec<T,A> as alloc::vec::spec_extend::SpecExtend<T,I>>::spec_extend (src/vec/spec_extend.rs:26:9)",
+"0x55d9d9ed72b2: alloc::str::<impl alloc::borrow::ToOwned for str>::to_owned (alloc/src/str.rs:209:46)",
+"0x55d9d9ed72b2: <alloc::string::String as core::convert::From<&str>>::from (alloc/src/string.rs:2650:11)",
+"0x55d9d9ed72b2: <str as alloc::string::ToString>::to_string (alloc/src/string.rs:2596:9)",
+"0x55d9d9edb8d5: regex::builders::Builder::new::{{closure}} (regex-1.9.5/src/builders.rs:66:52)",
+"0x55d9d9ed8bd4: core::iter::adapters::map::map_fold::{{closure}} (iter/adapters/map.rs:84:28)",
+"0x55d9d9fc0246: regex_automata::util::captures::GroupInfoInner::add_first_group (src/util/captures.rs:2203:9)",
+"0x55d9d988c290: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d988c290: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d988c290: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d988c290: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d988ec3b: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
+"0x55d9d9890c99: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d985b3f2: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d985b3f2: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
+"0x55d9d98102a8: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9da14ce93: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9da152f09: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9da1021a4: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9da166bab: regex_syntax::hir::interval::IntervalSet<I>::push (src/hir/interval.rs:86:9)",
+"0x55d9da187436: regex_syntax::hir::ClassUnicode::push (src/hir/mod.rs:1061:9)",
+"0x55d9d9f40913: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
+"0x55d9d9f43ab9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
+"0x55d9d9ee3d46: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
+"0x55d9d9ef5cc6: regex_automata::nfa::thompson::compiler::Utf8Compiler::add_empty (nfa/thompson/compiler.rs:1831:9)",
+"0x55d9d9ef5082: regex_automata::nfa::thompson::compiler::Utf8Compiler::new (nfa/thompson/compiler.rs:1759:9)",
+"0x55d9d993c1d7: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d993c1d7: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d993c1d7: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d993c1d7: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
+"0x55d9d994905e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d99482d7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d99dc42e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d98fe08c: <alloc::collections::btree::map::BTreeMap<K,V> as core::iter::traits::collect::FromIterator<(K,V)>>::from_iter (collections/btree/map.rs:2229:34)",
+"0x55d9d9cf50ac: cedar_policy_core::est::expr::Expr::contains_all (src/est/expr.rs:394:20)",
+"0x55d9d9cfee87: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Member>>::try_from (src/est/expr.rs:1231:64)",
+"0x55d9d9b56164: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d9b56164: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d9b56164: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d9b65d98: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d98cd5ef: <serde_json::value::ser::Serializer as serde::ser::Serializer>::serialize_newtype_variant (src/value/ser.rs:214:23)",
+"0x55d9d986378c: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9d3da34: cedar_policy_core::parser::unescape::to_pattern::{{closure}} (src/parser/unescape.rs:47:18)",
+"0x55d9d99bf024: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d99bf024: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d99bf024: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d99d5048: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9f35cac: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
+"0x55d9d9eddbe1: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d9eddbe1: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d9eddbe1: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d9eddbe1: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
+"0x55d9d9eea22b: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9ee9e46: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d9f166db: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d9f7b329: regex_automata::meta::regex::Builder::build_many_from_hir (src/meta/regex.rs:3551:31)",
+"0x55d9d9cf4f3d: cedar_policy_core::est::expr::Expr::mul (src/est/expr.rs:378:20)",
+"0x55d9d9f684a9: regex_automata::nfa::thompson::builder::Builder::patch (nfa/thompson/builder.rs:1163:17)",
+"0x55d9d9ef439c: regex_automata::nfa::thompson::compiler::Compiler::patch (nfa/thompson/compiler.rs:1605:9)",
+"0x55d9d9bc828b: core::clone::Clone::clone (core/src/clone.rs:123:5)",
+"0x55d9d9b5b4f3: hashbrown::raw::RawTable<T,A>::clone_from_impl (src/raw/mod.rs:1735:22)",
+"0x55d9d9b43ab4: <hashbrown::raw::RawTable<T,A> as hashbrown::raw::RawTableClone>::clone_from_spec (src/raw/mod.rs:1685:13)",
+"0x55d9d98d870c: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::validate_entity_types (cedar-policy-validator/src/rbac.rs:62:34)",
+"0x55d9d9edc2ef: core::option::Option<&T>::cloned (core/src/option.rs:1931:29)",
+"0x55d9d9edc3b4: <core::iter::adapters::cloned::Cloned<I> as core::iter::traits::iterator::Iterator>::next (iter/adapters/cloned.rs:40:9)",
+"0x55d9d9eda669: <core::iter::adapters::enumerate::Enumerate<I> as core::iter::traits::iterator::Iterator>::next (iter/adapters/enumerate.rs:47:17)",
+"0x55d9d9edcf3c: alloc::sync::Arc<[T]>::from_iter_exact (alloc/src/sync.rs:1437:30)",
+"0x55d9d9edbeb8: regex::builders::Builder::build_many_string (regex-1.9.5/src/builders.rs:112:24)",
+"0x55d9d9b53344: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
+"0x55d9d9b53344: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
+"0x55d9d9b53344: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
+"0x55d9d9b653f8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
+"0x55d9d9b0660a: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
+"0x55d9d9aeef7b: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
+"0x55d9da18a7c6: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
+"0x55d9da18a7c6: regex_syntax::hir::Properties::class (src/hir/mod.rs:2389:20)",
+"0x55d9da183ee7: regex_syntax::hir::Hir::class (src/hir/mod.rs:349:21)",
+"0x55d9da16ba7d: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_post (src/hir/translate.rs:434:32)",
+"0x55d9d99f256c: <serde::__private::de::content::ContentVisitor as serde::de::Visitor>::visit_map (src/private/de.rs:508:17)",
+"0x55d9d9a01304: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_any (serde_json-1.0.107/src/de.rs:1438:31)",
+"0x55d9d9bd70b6: alloc::collections::btree::map::entry::VacantEntry<K,V,A>::insert (btree/map/entry.rs:355:32)",
+"0x55d9d9a84e80: alloc::collections::btree::map::BTreeMap<K,V,A>::insert (collections/btree/map.rs:1006:17)",
+"0x55d9d988b382: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d988b382: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d988b382: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d988b382: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
+"0x55d9d9890fde: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
+"0x55d9d9890c59: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
+"0x55d9d985b212: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
+"0x55d9d985b212: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
+"0x55d9d9811c54: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
+"0x55d9d9c86de1: cedar_policy_core::est::head_constraints::<impl core::convert::TryFrom<cedar_policy_core::est::head_constraints::ResourceConstraint> for cedar_policy_core::ast::policy::PrincipalOrResourceConstraint>::try_from (src/est/head_constraints.rs:347:83)",
+"0x55d9d988c4f8: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
+"0x55d9d988c4f8: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
+"0x55d9d988c4f8: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
+"0x55d9d985504a: <serde::de::impls::<impl serde::de::Deserialize for alloc::vec::Vec<T>>::deserialize::VecVisitor<T> as serde::de::Visitor>::visit_seq (src/de/impls.rs:1032:34)",
+"0x55d9d984ac50: serde::__private::de::content::visit_content_seq_ref (src/private/de.rs:1688:26)",
+"0x55d9d983d013: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_seq (src/private/de.rs:1936:40)",
+"0x55d9d988ff86: serde::de::impls::<impl serde::de::Deserialize for alloc::vec::Vec<T>>::deserialize (src/de/impls.rs:1045:9)",
+"0x55d9d9906aa1: core::iter::traits::iterator::Iterator::fold (iter/traits/iterator.rs:2482:21)",
+"0x55d9d9ebe4a9: serde_json::read::parse_escape (serde_json-1.0.107/src/read.rs:860:17)",
+"0x55d9d9979b93: <cedar_policy_validator::schema_file_format::_::<impl serde::de::Deserialize for cedar_policy_validator::schema_file_format::TypeOfAttribute>::deserialize::__Visitor as serde::de::Visitor>::visit_map (cedar-policy-validator/src/schema_file_format.rs:588:46)",
+"0x55d9d99f1d80: serde::__private::de::content::visit_content_map_ref (src/private/de.rs:1708:26)",
+"0x55d9d999826a: cedar_policy_validator::schema::ValidatorSchema::get_entities_in_set::{{closure}} (cedar-policy-validator/src/schema.rs:1187:32)",
+"0x55d9d99df0a8: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
+"0x55d9d98de64f: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
+"0x55d9d99d912b: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
+"0x55d9d9993ab6: cedar_policy_validator::schema::ValidatorNamespaceDef::parse_unqualified_name_with_namespace (cedar-policy-validator/src/schema.rs:631:24)",
+"0x55d9d9cf3f91: cedar_policy_core::est::expr::Expr::not (src/est/expr.rs:278:47)",
+"0x55d9d9cfbccf: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Unary>>::try_from (src/est/expr.rs:993:45)",
+"0x55d9d98cdc7f: <serde_json::value::ser::Serializer as serde::ser::Serializer>::serialize_newtype_variant (src/value/ser.rs:214:23)",
+"0x55d9d9862f39: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
+"0x55d9d9cf458c: cedar_policy_core::est::expr::Expr::lesseq (src/est/expr.rs:321:19)",
+"0x55d9d9919ea7: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:1132:33)",
+"0x55d9d99e2742: alloc::str::<impl alloc::borrow::ToOwned for str>::to_owned (alloc/src/str.rs:209:46)",
+"0x55d9d9933e1c: cedar_policy_validator::fuzzy_match::fuzzy_search (cedar-policy-validator/src/fuzzy_match.rs:30:14)",
+"0x55d9d999b08f: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::validate_entity_types::{{closure}} (cedar-policy-validator/src/rbac.rs:81:29)",
+"0x55d9d9a5efb3: cedar_policy_core::from_normalized_str::FromNormalizedStr::from_normalized_str (cedar-policy-core/src/from_normalized_str.rs:22:22)",
+"0x55d9d9c143e2: alloc::string::String::push (alloc/src/string.rs:1225:18)",
+"0x55d9d9d3d7b5: cedar_policy_core::parser::unescape::to_unescaped_string::{{closure}} (src/parser/unescape.rs:27:18)",
+"0x55d9d9cf52eb: cedar_policy_core::est::expr::Expr::has_attr (src/est/expr.rs:417:19)",
+"0x55d9d9cf8c03: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Relation>>::try_from (src/est/expr.rs:834:32)"
+]
+}
\ No newline at end of file
diff --git a/panic_safety.sh b/panic_safety.sh
index b5802c41f..f6354f4bc 100755
--- a/panic_safety.sh
+++ b/panic_safety.sh
@@ -25,7 +25,7 @@ total_panics=0
 failed=0
 
 crates=($(cargo metadata --no-deps --format-version 1 | jq -r '.packages | map(.name) | join(" ")'))
-panic_markers=("panic unwrap_used expect_used fallible_impl_from unreachable indexing_slicing")
+panic_markers=("unwrap_used expect_used fallible_impl_from unreachable indexing_slicing panic")
 
 for crate in ${crates[@]}; do
     crate_panics=0

From f52e09a5fff8e4799713a417281146897ef3294a Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Fri, 6 Oct 2023 19:36:17 +0000
Subject: [PATCH 14/28] Keeping result a result

---
 cedar-policy-cli/tests/integration_tests/main.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cedar-policy-cli/tests/integration_tests/main.rs b/cedar-policy-cli/tests/integration_tests/main.rs
index 66f49ab5b..1344ebaf0 100644
--- a/cedar-policy-cli/tests/integration_tests/main.rs
+++ b/cedar-policy-cli/tests/integration_tests/main.rs
@@ -79,8 +79,8 @@ struct JsonRequest {
     errors: Vec<String>,
 }
 
-fn value_to_euid_string(v: serde_json::Value) -> Option<String> {
-    EntityUid::from_json(v).ok().map(|euid| euid.to_string())
+fn value_to_euid_string(v: serde_json::Value) -> Result<String, impl std::error::Error> {
+    EntityUid::from_json(v).map(|euid| euid.to_string())
 }
 
 /// For relative paths, return the absolute path, assuming that the path

From f46343f9e8034af771a9659f9c099638b58d1804 Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Mon, 9 Oct 2023 16:17:26 +0000
Subject: [PATCH 15/28] Ensure `__expr` is an error

---
 cedar-policy-core/src/entities.rs            | 164 +++++++++++++++++++
 cedar-policy-core/src/entities/json/err.rs   |   3 +
 cedar-policy-core/src/entities/json/value.rs |   8 +
 cedar-policy-validator/src/err.rs            |   2 +
 cedar-policy/src/api.rs                      |   5 +
 5 files changed, 182 insertions(+)

diff --git a/cedar-policy-core/src/entities.rs b/cedar-policy-core/src/entities.rs
index 69e258e64..ecda4df0e 100644
--- a/cedar-policy-core/src/entities.rs
+++ b/cedar-policy-core/src/entities.rs
@@ -484,6 +484,8 @@ pub enum TCComputation {
 // PANIC SAFETY: Unit Test Code
 #[allow(clippy::panic)]
 #[cfg(test)]
+// PANIC SAFETY unit tests
+#[allow(clippy::panic)]
 mod json_parsing_tests {
 
     use super::*;
@@ -1008,6 +1010,164 @@ mod json_parsing_tests {
         )
     }
 
+    #[test]
+    fn no_expr_escapes1() {
+        let json = serde_json::json!(
+        [
+        {
+            "uid" : r#"test_entity_type::"Alice""#,
+            "attrs": {
+                "bacon": "eggs",
+                "pancakes": [1, 2, 3],
+                "waffles": { "key": "value" },
+                "toast" : { "__extn" : { "fn" : "decimal", "arg" : "33.47" }},
+                "12345": { "__entity": { "type": "test_entity_type", "id": "bob" } },
+                "a b c": { "__extn": { "fn": "ip", "arg": "222.222.222.0/24" } }
+            },
+            "parents": [
+                { "__entity": { "type" : "test_entity_type", "id" : "bob"} },
+                { "__entity": { "type": "test_entity_type", "id": "catherine" } }
+            ]
+        },
+        ]);
+        let eparser: EntityJsonParser<'_> =
+            EntityJsonParser::new(None, Extensions::all_available(), TCComputation::ComputeNow);
+        let error = eparser.from_json_value(json).err().unwrap().to_string();
+        assert!(
+            error.contains("in uid field of <unknown entity>, expected a literal entity reference"),
+            "{}",
+            error
+        );
+    }
+
+    #[test]
+    fn no_expr_escapes2() {
+        let json = serde_json::json!(
+        [
+        {
+            "uid" : {
+                "__expr" :
+                    r#"test_entity_type::"Alice""#
+            },
+            "attrs": {
+                "bacon": "eggs",
+                "pancakes": [1, 2, 3],
+                "waffles": { "key": "value" },
+                "toast" : { "__extn" : { "fn" : "decimal", "arg" : "33.47" }},
+                "12345": { "__entity": { "type": "test_entity_type", "id": "bob" } },
+                "a b c": { "__extn": { "fn": "ip", "arg": "222.222.222.0/24" } }
+            },
+            "parents": [
+                { "__entity": { "type" : "test_entity_type", "id" : "bob"} },
+                { "__entity": { "type": "test_entity_type", "id": "catherine" } }
+            ]
+        }
+        ]);
+        let eparser: EntityJsonParser<'_> =
+            EntityJsonParser::new(None, Extensions::all_available(), TCComputation::ComputeNow);
+        let error = eparser.from_json_value(json).err().unwrap().to_string();
+        assert!(
+            error.contains("in uid field of <unknown entity>, expected a literal entity reference"),
+            "{}",
+            error
+        );
+    }
+
+    #[test]
+    fn no_expr_escapes3() {
+        let json = serde_json::json!(
+        [
+        {
+            "uid" : {
+                "type" : "test_entity_type",
+                "id" : "Alice"
+            },
+            "attrs": {
+                "bacon": "eggs",
+                "pancakes": { "__expr" : "[1,2,3]" },
+                "waffles": { "key": "value" },
+                "toast" : { "__extn" : { "fn" : "decimal", "arg" : "33.47" }},
+                "12345": { "__entity": { "type": "test_entity_type", "id": "bob" } },
+                "a b c": { "__extn": { "fn": "ip", "arg": "222.222.222.0/24" } }
+            },
+            "parents": [
+                { "__entity": { "type" : "test_entity_type", "id" : "bob"} },
+                { "__entity": { "type": "test_entity_type", "id": "catherine" } }
+            ]
+        }
+        ]);
+        let eparser: EntityJsonParser<'_> =
+            EntityJsonParser::new(None, Extensions::all_available(), TCComputation::ComputeNow);
+        let error = eparser.from_json_value(json).err().unwrap().to_string();
+        assert!(
+            error.contains("`__expr` tag is no longer supported"),
+            "Actual error message was: {}",
+            error
+        );
+    }
+
+    #[test]
+    fn no_expr_escapes4() {
+        let json = serde_json::json!(
+        [
+        {
+            "uid" : {
+                "type" : "test_entity_type",
+                "id" : "Alice"
+            },
+            "attrs": {
+                "bacon": "eggs",
+                "waffles": { "key": "value" },
+                "12345": { "__entity": { "type": "test_entity_type", "id": "bob" } },
+                "a b c": { "__extn": { "fn": "ip", "arg": "222.222.222.0/24" } }
+            },
+            "parents": [
+                { "__expr": { "type" : "test_entity_type", "id" : "bob"} },
+                { "__entity": { "type": "test_entity_type", "id": "catherine" } }
+            ]
+        }
+        ]);
+        let eparser: EntityJsonParser<'_> =
+            EntityJsonParser::new(None, Extensions::all_available(), TCComputation::ComputeNow);
+        let error = eparser.from_json_value(json).err().unwrap().to_string();
+        assert!(
+            error.contains(r#"in parents field of `test_entity_type::"Alice"`, expected a literal entity reference"#),
+            "Actual error message was: {}",
+            error
+        );
+    }
+
+    #[test]
+    fn no_expr_escapes5() {
+        let json = serde_json::json!(
+        [
+        {
+            "uid" : {
+                "type" : "test_entity_type",
+                "id" : "Alice"
+            },
+            "attrs": {
+                "bacon": "eggs",
+                "waffles": { "key": "value" },
+                "12345": { "__entity": { "type": "test_entity_type", "id": "bob" } },
+                "a b c": { "__extn": { "fn": "ip", "arg": "222.222.222.0/24" } }
+            },
+            "parents": [
+                "test_entity_type::\"bob\"",
+                { "__entity": { "type": "test_entity_type", "id": "catherine" } }
+            ]
+        }
+        ]);
+        let eparser: EntityJsonParser<'_> =
+            EntityJsonParser::new(None, Extensions::all_available(), TCComputation::ComputeNow);
+        let error = eparser.from_json_value(json).err().unwrap().to_string();
+        assert!(
+            error.contains(r#"in parents field of `test_entity_type::"Alice"`, expected a literal entity reference"#),
+            "Actual error message was: {}",
+            error
+        );
+    }
+
     #[cfg(feature = "ipaddr")]
     /// this one uses `__entity` and `__extn` escapes, in various positions
     #[test]
@@ -1493,6 +1653,8 @@ mod json_parsing_tests {
 // PANIC SAFETY: Unit Test Code
 #[allow(clippy::panic)]
 #[cfg(test)]
+// PANIC SAFETY unit tests
+#[allow(clippy::panic)]
 mod entities_tests {
     use super::*;
 
@@ -1567,6 +1729,8 @@ mod entities_tests {
 // PANIC SAFETY: Unit Test Code
 #[allow(clippy::panic)]
 #[cfg(test)]
+// PANIC SAFETY unit tests
+#[allow(clippy::panic)]
 mod schema_based_parsing_tests {
     use super::*;
     use crate::extensions::Extensions;
diff --git a/cedar-policy-core/src/entities/json/err.rs b/cedar-policy-core/src/entities/json/err.rs
index 7bda38e60..d13daa48f 100644
--- a/cedar-policy-core/src/entities/json/err.rs
+++ b/cedar-policy-core/src/entities/json/err.rs
@@ -217,6 +217,9 @@ pub enum JsonDeserializationError {
         /// Parent type which was invalid
         parent_ty: Box<EntityType>, // boxed to avoid this variant being very large (and thus all JsonDeserializationErrors being large)
     },
+    #[error("{0}, Invalid tag. The `__expr` tag is no longer supported")]
+    /// Raised when a JsonValue contains the no longer support `__expr` tag
+    ExprTag(Box<JsonDeserializationErrorContext>),
 }
 
 /// Errors thrown during serialization to JSON
diff --git a/cedar-policy-core/src/entities/json/value.rs b/cedar-policy-core/src/entities/json/value.rs
index 9809739da..3a391faa5 100644
--- a/cedar-policy-core/src/entities/json/value.rs
+++ b/cedar-policy-core/src/entities/json/value.rs
@@ -42,6 +42,11 @@ use std::collections::{BTreeMap, HashMap, HashSet};
 #[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
 #[serde(untagged)]
 pub enum CedarValueJson {
+    /// `__expr` is deprecated, but still throws an error was present.
+    ExprEscape {
+        /// Contents, will be ignored and an error is thrown are attempting to parse this
+        __expr: SmolStr,
+    },
     /// Special JSON object with single reserved "__entity" key:
     /// the following item should be a JSON object of the form
     /// `{ "type": "xxx", "id": "yyy" }`.
@@ -229,6 +234,9 @@ impl CedarValueJson {
                 })?,
             )),
             Self::ExtnEscape { __extn: extn } => extn.into_expr(ctx),
+            Self::ExprEscape { .. } => Err(JsonDeserializationError::ExprTag(Box::new(
+                JsonDeserializationErrorContext::Context,
+            ))),
         }
     }
 
diff --git a/cedar-policy-validator/src/err.rs b/cedar-policy-validator/src/err.rs
index 4ec641522..38ec6539c 100644
--- a/cedar-policy-validator/src/err.rs
+++ b/cedar-policy-validator/src/err.rs
@@ -97,6 +97,8 @@ pub enum SchemaError {
     /// This error variant should only be used when `PermitAttributes` is enabled.
     #[error("action `{0}` has an attribute with unsupported JSON representation: {1}")]
     UnsupportedActionAttribute(EntityUID, String),
+    #[error("uses the `__expr` escape, which is no longer supported")]
+    ExprEscapeUsed,
 }
 
 impl From<transitive_closure::TcError<EntityUID>> for SchemaError {
diff --git a/cedar-policy/src/api.rs b/cedar-policy/src/api.rs
index 0b30ed870..7bb0ba751 100644
--- a/cedar-policy/src/api.rs
+++ b/cedar-policy/src/api.rs
@@ -1114,6 +1114,10 @@ pub enum SchemaError {
     /// This error variant should only be used when `PermitAttributes` is enabled.
     #[error("action `{0}` has an attribute with unsupported JSON representation: {1}")]
     UnsupportedActionAttribute(EntityUid, String),
+    /// Error thrown when the schema contains the `__expr` escape.
+    /// Support for this escape form has been dropped.
+    #[error("schema contained the non-supported `__expr` escape.")]
+    ExprEscapeUsed,
 }
 
 /// Describes in what action context or entity type shape a schema parsing error
@@ -1201,6 +1205,7 @@ impl From<cedar_policy_validator::SchemaError> for SchemaError {
             cedar_policy_validator::SchemaError::UnsupportedActionAttribute(uid, escape_type) => {
                 Self::UnsupportedActionAttribute(EntityUid(uid), escape_type)
             }
+            cedar_policy_validator::SchemaError::ExprEscapeUsed => Self::ExprEscapeUsed,
         }
     }
 }

From 95f178a3faf217a4975c928bd0a5cc5e7b5ba983 Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Mon, 9 Oct 2023 17:18:27 +0000
Subject: [PATCH 16/28] Fixing some mis-merges

---
 cedar-policy-core/src/ast/request.rs    | 15 ++++++++++-----
 cedar-policy-validator/src/typecheck.rs |  5 ++++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/cedar-policy-core/src/ast/request.rs b/cedar-policy-core/src/ast/request.rs
index 6107e85e5..034022af7 100644
--- a/cedar-policy-core/src/ast/request.rs
+++ b/cedar-policy-core/src/ast/request.rs
@@ -169,11 +169,16 @@ impl Context {
         Self::from_pairs([]).expect("empty set of keys cannot contain a duplicate key")
     }
 
-    /// Create a `Context` from a `RestrictedExpr`, which must be a `Record`
-    /// INVARIANT: It is only legal to call this function with the `Record` variant
-    pub fn from_expr(expr: RestrictedExpr) -> Self {
-        debug_assert!(matches!(expr.expr_kind(), ExprKind::Record { .. }));
-        Self { context: expr }
+    /// Create a `Context` from a `RestrictedExpr`, which must be a `Record`.
+    /// If it is not a `Record`, then this function returns `Err` (returning
+    /// ownership of the non-record expression), otherwise it returns `Ok` of
+    /// a context for that record.
+    pub fn from_expr(expr: RestrictedExpr) -> Result<Self, RestrictedExpr> {
+        match expr.expr_kind() {
+            // INVARIANT: `context` must be a `Record`, which is guaranteed by the match case.
+            ExprKind::Record { .. } => Ok(Self { context: expr }),
+            _ => Err(expr),
+        }
     }
 
     /// Create a `Context` from a map of key to `RestrictedExpr`, or a Vec of
diff --git a/cedar-policy-validator/src/typecheck.rs b/cedar-policy-validator/src/typecheck.rs
index 8dea1b3cf..4ce172c73 100644
--- a/cedar-policy-validator/src/typecheck.rs
+++ b/cedar-policy-validator/src/typecheck.rs
@@ -1942,7 +1942,10 @@ impl<'a> Typechecker<'a> {
         type_errors: &mut Vec<TypeError>,
     ) -> TypecheckAnswer<'b> {
         // PANIC SAFETY maintained by invariant on this function
-        panic!("`typecheck_unary` called with an expression kind other than `UnaryApp`");
+        #[allow(clippy::panic)]
+        let ExprKind::UnaryApp { op, arg } = unary_expr.expr_kind() else {
+            panic!("`typecheck_unary` called with an expression kind other than `UnaryApp`");
+        };
         match op {
             UnaryOp::Not => {
                 let ans_arg = self.expect_type(

From d8aa9ce79b6eab2356442f61fbd4d5b5086045a1 Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Wed, 11 Oct 2023 13:18:29 +0000
Subject: [PATCH 17/28] Fixing changelog duplicates

---
 cedar-policy/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cedar-policy/CHANGELOG.md b/cedar-policy/CHANGELOG.md
index 12743230f..a4d77fdda 100644
--- a/cedar-policy/CHANGELOG.md
+++ b/cedar-policy/CHANGELOG.md
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Removed `__expr` escape from Cedar JSON formats
+<<<<<<< HEAD
 - Rename `cedar_policy_core::est::EstToAstError` to `cedar_policy_core::est::FromJsonError`.
 - Rename `cedar_policy_core::entities::JsonDeserializationError::ExtensionsError` to `cedar_policy_core::entities::JsonDeserializationError::FailedExtensionsFunctionLookup`.
 - Rename variants in `cedar_policy::SchemaError`.

From ad8d86315d05a49414277c1ecf9e6cb1c421e109 Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Thu, 12 Oct 2023 13:30:01 -0400
Subject: [PATCH 18/28] Update cedar-policy-core/src/entities/json/err.rs

Co-authored-by: Craig Disselkoen <cdiss@amazon.com>
---
 cedar-policy-core/src/entities/json/err.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cedar-policy-core/src/entities/json/err.rs b/cedar-policy-core/src/entities/json/err.rs
index d13daa48f..e19904440 100644
--- a/cedar-policy-core/src/entities/json/err.rs
+++ b/cedar-policy-core/src/entities/json/err.rs
@@ -217,8 +217,8 @@ pub enum JsonDeserializationError {
         /// Parent type which was invalid
         parent_ty: Box<EntityType>, // boxed to avoid this variant being very large (and thus all JsonDeserializationErrors being large)
     },
-    #[error("{0}, Invalid tag. The `__expr` tag is no longer supported")]
-    /// Raised when a JsonValue contains the no longer support `__expr` tag
+    /// Raised when a JsonValue contains the no longer supported `__expr` escape
+    #[error("{0}, invalid escape. The `__expr` escape is no longer supported")]
     ExprTag(Box<JsonDeserializationErrorContext>),
 }
 

From ee422b7be58e9d32b318ba620702cc1574876db1 Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Thu, 12 Oct 2023 13:30:24 -0400
Subject: [PATCH 19/28] Update cedar-policy-core/src/entities/json/jsonvalue.rs

Co-authored-by: Craig Disselkoen <cdiss@amazon.com>
---
 cedar-policy-core/src/entities/json/value.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cedar-policy-core/src/entities/json/value.rs b/cedar-policy-core/src/entities/json/value.rs
index 3a391faa5..b6164c01c 100644
--- a/cedar-policy-core/src/entities/json/value.rs
+++ b/cedar-policy-core/src/entities/json/value.rs
@@ -42,7 +42,7 @@ use std::collections::{BTreeMap, HashMap, HashSet};
 #[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
 #[serde(untagged)]
 pub enum CedarValueJson {
-    /// `__expr` is deprecated, but still throws an error was present.
+    /// The `__expr` escape has been removed, but is still reserved in order to throw meaningful errors.
     ExprEscape {
         /// Contents, will be ignored and an error is thrown are attempting to parse this
         __expr: SmolStr,

From 82e735b27fac31f1248fc20948970f20459f417c Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Thu, 12 Oct 2023 17:44:06 +0000
Subject: [PATCH 20/28] Improving error messages

---
 cedar-policy-core/src/entities.rs            | 8 ++++----
 cedar-policy-core/src/entities/json/value.rs | 9 +++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/cedar-policy-core/src/entities.rs b/cedar-policy-core/src/entities.rs
index ecda4df0e..f1501566e 100644
--- a/cedar-policy-core/src/entities.rs
+++ b/cedar-policy-core/src/entities.rs
@@ -1067,7 +1067,7 @@ mod json_parsing_tests {
             EntityJsonParser::new(None, Extensions::all_available(), TCComputation::ComputeNow);
         let error = eparser.from_json_value(json).err().unwrap().to_string();
         assert!(
-            error.contains("in uid field of <unknown entity>, expected a literal entity reference"),
+            error.contains("in uid field of <unknown entity>, invalid escape. The `__expr` escape is no longer supported"),
             "{}",
             error
         );
@@ -1100,7 +1100,7 @@ mod json_parsing_tests {
             EntityJsonParser::new(None, Extensions::all_available(), TCComputation::ComputeNow);
         let error = eparser.from_json_value(json).err().unwrap().to_string();
         assert!(
-            error.contains("`__expr` tag is no longer supported"),
+            error.contains("`__expr` escape is no longer supported"),
             "Actual error message was: {}",
             error
         );
@@ -1122,7 +1122,7 @@ mod json_parsing_tests {
                 "a b c": { "__extn": { "fn": "ip", "arg": "222.222.222.0/24" } }
             },
             "parents": [
-                { "__expr": { "type" : "test_entity_type", "id" : "bob"} },
+                { "__expr": "test_entity_type::\"Alice\"" },
                 { "__entity": { "type": "test_entity_type", "id": "catherine" } }
             ]
         }
@@ -1131,7 +1131,7 @@ mod json_parsing_tests {
             EntityJsonParser::new(None, Extensions::all_available(), TCComputation::ComputeNow);
         let error = eparser.from_json_value(json).err().unwrap().to_string();
         assert!(
-            error.contains(r#"in parents field of `test_entity_type::"Alice"`, expected a literal entity reference"#),
+            error.contains(r#"in parents field of `test_entity_type::"Alice"`, invalid escape. The `__expr` escape is no longer supported"#),
             "Actual error message was: {}",
             error
         );
diff --git a/cedar-policy-core/src/entities/json/value.rs b/cedar-policy-core/src/entities/json/value.rs
index b6164c01c..f9ccb7da0 100644
--- a/cedar-policy-core/src/entities/json/value.rs
+++ b/cedar-policy-core/src/entities/json/value.rs
@@ -593,6 +593,12 @@ impl<'e> ValueParser<'e> {
 #[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
 #[serde(untagged)]
 pub enum EntityUidJson {
+    /// Explicit `__expr` syntax.
+    /// This is no longer supported and is only here for generating nice error messages.
+    ExplicitExprEscape {
+        /// Contents are ignored.
+        __expr: String,
+    },
     /// Explicit `__entity` escape; see notes on JSONValue::EntityEscape
     ExplicitEntityEscape {
         /// JSON object containing the entity type and ID
@@ -660,6 +666,9 @@ impl EntityUidJson {
                 ctx: Box::new(ctx()),
                 got: Box::new(Either::Left(v)),
             }),
+            Self::ExplicitExprEscape { __expr } => {
+                Err(JsonDeserializationError::ExprTag(Box::new(ctx())))
+            }
         }
     }
 }

From b7cd00993946aed5022b5ad672c402d0e9bee229 Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Thu, 12 Oct 2023 18:21:16 +0000
Subject: [PATCH 21/28] Bringing up to mainline

---
 cedar-policy/src/frontend/is_authorized.rs | 60 +++++++++++++++++-----
 1 file changed, 48 insertions(+), 12 deletions(-)

diff --git a/cedar-policy/src/frontend/is_authorized.rs b/cedar-policy/src/frontend/is_authorized.rs
index 79c2081d6..89a2dd46a 100644
--- a/cedar-policy/src/frontend/is_authorized.rs
+++ b/cedar-policy/src/frontend/is_authorized.rs
@@ -953,9 +953,18 @@ mod test {
     #[test]
     fn test_authorized_fails_on_policy_collision_with_template() {
         let call = r#"{
-            "principal" : "User::\"alice\"",
-            "action" : "Photo::\"view\"",
-            "resource" : "Photo::\"door\"",
+            "principal" : {
+                "type" : "User",
+                "id" : "alice"
+            },
+            "action" : {
+                "type" : "Action",
+                "id" : "view"
+            },
+            "resource" : {
+                "type" : "Photo",
+                "id" : "door"
+            },
             "context" : {},
             "slice" : {
                 "policies" : { "ID0": "permit(principal, action, resource);" },
@@ -974,9 +983,18 @@ mod test {
     #[test]
     fn test_authorized_fails_on_duplicate_instantiations_ids() {
         let call = r#"{
-            "principal" : "User::\"alice\"",
-            "action" : "Photo::\"view\"",
-            "resource" : "Photo::\"door\"",
+            "principal" : {
+                "type" : "User",
+                "id" : "alice"
+            },
+            "action" : {
+                "type" : "Action",
+                "id" : "view"
+            },
+            "resource" : {
+                "type" : "Photo",
+                "id" : "door"
+            },
             "context" : {},
             "slice" : {
                 "policies" : {},
@@ -1016,9 +1034,18 @@ mod test {
     #[test]
     fn test_authorized_fails_on_template_instantiation_collision_with_template() {
         let call = r#"{
-            "principal" : "User::\"alice\"",
-            "action" : "Photo::\"view\"",
-            "resource" : "Photo::\"door\"",
+            "principal" : {
+                "type" : "User",
+                "id" : "alice"
+            },
+            "action" : {
+                "type" : "Action",
+                "id" : "view"
+            },
+            "resource" : {
+                "type" : "Photo",
+                "id" : "door"
+            },
             "context" : {},
             "slice" : {
                 "policies" : {},
@@ -1048,9 +1075,18 @@ mod test {
     #[test]
     fn test_authorized_fails_on_template_instantiation_collision_with_policy() {
         let call = r#"{
-            "principal" : "User::\"alice\"",
-            "action" : "Photo::\"view\"",
-            "resource" : "Photo::\"door\"",
+            "principal" : {
+                "type" : "User",
+                "id" : "alice"
+            },
+            "action" : {
+                "type" : "Action",
+                "id" : "view"
+            },
+            "resource" : {
+                "type" : "Photo",
+                "id" : "door"
+            },
             "context" : {},
             "slice" : {
                 "policies" : { "ID1": "permit(principal, action, resource);" },

From d890c62ce3883f7e0b0d06c41d46a05d26725b12 Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Tue, 24 Oct 2023 19:41:03 +0000
Subject: [PATCH 22/28] Fixing some tests

---
 cedar-policy-core/src/entities.rs             |     2 +-
 .../src/entities/json/entities.rs             |     2 +-
 cedar-policy/dhat-heap.json                   | 35057 ----------------
 cedar-policy/src/frontend/is_authorized.rs    |    30 +-
 4 files changed, 26 insertions(+), 35065 deletions(-)
 delete mode 100644 cedar-policy/dhat-heap.json

diff --git a/cedar-policy-core/src/entities.rs b/cedar-policy-core/src/entities.rs
index f1501566e..99f19436a 100644
--- a/cedar-policy-core/src/entities.rs
+++ b/cedar-policy-core/src/entities.rs
@@ -1366,7 +1366,7 @@ mod json_parsing_tests {
         match err {
             EntitiesError::Deserialization(err) => assert!(
                 err.to_string()
-                    .contains(r#"expected a literal entity reference, but got `"hello"`"#),
+                    .contains(r#"expected a literal entity reference, but got `"\"hello\""`"#),
                 "actual error message was {err}"
             ),
             _ => panic!("expected deserialization error, got a different error: {err}"),
diff --git a/cedar-policy-core/src/entities/json/entities.rs b/cedar-policy-core/src/entities/json/entities.rs
index ddbd9dffa..476b39c3d 100644
--- a/cedar-policy-core/src/entities/json/entities.rs
+++ b/cedar-policy-core/src/entities/json/entities.rs
@@ -474,7 +474,7 @@ mod test {
             "attrs" : {},
             "parents" : []
         });
-        let x: Result<EntityJSON, _> = serde_json::from_value(test);
+        let x: Result<EntityJson, _> = serde_json::from_value(test);
         x.unwrap();
     }
 }
diff --git a/cedar-policy/dhat-heap.json b/cedar-policy/dhat-heap.json
deleted file mode 100644
index 838893b15..000000000
--- a/cedar-policy/dhat-heap.json
+++ /dev/null
@@ -1,35057 +0,0 @@
-{
-"dhatFileVersion": 2,
-"mode": "rust-heap",
-"verb": "Allocated",
-"bklt": true,
-"bkacc": false,
-"tu": "µs",
-"Mtu": "s",
-"tuth": 10,
-"cmd": "/local/home/aeline/cedar-github/cedar/target/debug/deps/corpus_tests-d070eacac1130215 --ignored",
-"pid": 4229,
-"tg": 61203296,
-"te": 64895887,
-"pps": [
-{
-"tb": 5376,
-"tbk": 48,
-"tl": 38609,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-4,
-5,
-6,
-7,
-8
-]
-},
-{
-"tb": 792020,
-"tbk": 1953,
-"tl": 468658,
-"mb": 1488,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-14,
-15,
-16,
-17
-]
-},
-{
-"tb": 48,
-"tbk": 1,
-"tl": 64597180,
-"mb": 48,
-"mbk": 1,
-"gb": 48,
-"gbk": 1,
-"eb": 48,
-"ebk": 1,
-"fs": [
-1,
-18,
-19,
-20,
-21,
-22,
-23,
-24,
-25
-]
-},
-{
-"tb": 40,
-"tbk": 1,
-"tl": 64597790,
-"mb": 40,
-"mbk": 1,
-"gb": 40,
-"gbk": 1,
-"eb": 40,
-"ebk": 1,
-"fs": [
-1,
-26,
-27,
-28,
-29,
-30,
-31,
-32,
-33
-]
-},
-{
-"tb": 8160,
-"tbk": 24,
-"tl": 468,
-"mb": 340,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-34,
-35,
-36,
-37
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 861,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-39,
-40,
-41,
-42,
-40
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 881,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-44,
-45,
-46,
-46,
-47
-]
-},
-{
-"tb": 7702560,
-"tbk": 139176,
-"tl": 74954332,
-"mb": 2012,
-"mbk": 38,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-48,
-49,
-50,
-51,
-52,
-53,
-54,
-55
-]
-},
-{
-"tb": 25088,
-"tbk": 224,
-"tl": 121640,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-4,
-5,
-6,
-7,
-56
-]
-},
-{
-"tb": 2787600,
-"tbk": 7575,
-"tl": 1338419,
-"mb": 4416,
-"mbk": 12,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-58,
-59,
-60,
-61,
-62,
-63
-]
-},
-{
-"tb": 1158656,
-"tbk": 12840,
-"tl": 819934,
-"mb": 128,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-65,
-66,
-67,
-68,
-69,
-70,
-71,
-72
-]
-},
-{
-"tb": 160896,
-"tbk": 412,
-"tl": 115890,
-"mb": 1536,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-73,
-74,
-75,
-76,
-77,
-78,
-79,
-80,
-81,
-82
-]
-},
-{
-"tb": 106344,
-"tbk": 1899,
-"tl": 6945,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-83,
-84,
-85,
-85,
-85,
-47
-]
-},
-{
-"tb": 3584,
-"tbk": 32,
-"tl": 31275,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-86,
-87,
-88,
-7,
-89
-]
-},
-{
-"tb": 37880,
-"tbk": 947,
-"tl": 26881,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-91,
-92,
-93,
-94,
-95,
-96,
-97
-]
-},
-{
-"tb": 10032,
-"tbk": 57,
-"tl": 1899,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-100,
-101,
-102,
-103,
-104
-]
-},
-{
-"tb": 22400,
-"tbk": 200,
-"tl": 109699,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-105,
-106,
-107,
-7,
-56
-]
-},
-{
-"tb": 6141696,
-"tbk": 70469,
-"tl": 56618252,
-"mb": 7872,
-"mbk": 88,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-65,
-108,
-109,
-110,
-111,
-112,
-113,
-114,
-115,
-116
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 861,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-117,
-118,
-119,
-46,
-85
-]
-},
-{
-"tb": 5760,
-"tbk": 80,
-"tl": 89049,
-"mb": 144,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-122,
-123,
-124,
-125,
-126
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 5971,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-129,
-130,
-131,
-7,
-132
-]
-},
-{
-"tb": 7680,
-"tbk": 16,
-"tl": 391,
-"mb": 480,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-133,
-134,
-135,
-136,
-137,
-138,
-139,
-140,
-141,
-142
-]
-},
-{
-"tb": 414848,
-"tbk": 3704,
-"tl": 2087253,
-"mb": 448,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-143,
-144,
-145,
-7,
-146
-]
-},
-{
-"tb": 1027200,
-"tbk": 12840,
-"tl": 22790576,
-"mb": 80,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-148,
-149,
-150,
-151,
-152,
-153,
-154,
-155
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 13630,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-156,
-157,
-158,
-7,
-159
-]
-},
-{
-"tb": 760,
-"tbk": 19,
-"tl": 699464,
-"mb": 520,
-"mbk": 13,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-160,
-161,
-162,
-163,
-164,
-165,
-166
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 3832,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-129,
-130,
-131,
-7,
-167
-]
-},
-{
-"tb": 606093,
-"tbk": 14,
-"tl": 23988380,
-"mb": 303104,
-"mbk": 1,
-"gb": 303104,
-"gbk": 1,
-"eb": 303104,
-"ebk": 1,
-"fs": [
-168,
-169,
-170,
-171,
-172,
-173,
-174,
-175,
-176,
-177,
-178,
-179,
-180,
-181,
-182,
-183,
-184,
-185,
-186,
-187,
-188
-]
-},
-{
-"tb": 187136,
-"tbk": 272,
-"tl": 110886,
-"mb": 2064,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-189,
-190,
-191,
-192,
-193,
-194
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6331,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-4,
-5,
-6,
-7,
-195
-]
-},
-{
-"tb": 2048,
-"tbk": 4,
-"tl": 258616823,
-"mb": 2048,
-"mbk": 4,
-"gb": 2048,
-"gbk": 4,
-"eb": 2048,
-"ebk": 4,
-"fs": [
-9,
-196,
-197,
-198,
-199,
-200,
-201,
-202,
-203
-]
-},
-{
-"tb": 7723200,
-"tbk": 3218,
-"tl": 62658012,
-"mb": 3200,
-"mbk": 1,
-"gb": 3200,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-206,
-207,
-208,
-209,
-210
-]
-},
-{
-"tb": 3136,
-"tbk": 196,
-"tl": 12682464116,
-"mb": 3136,
-"mbk": 196,
-"gb": 3136,
-"gbk": 196,
-"eb": 3136,
-"ebk": 196,
-"fs": [
-211,
-212,
-213,
-214,
-215,
-216,
-217,
-218
-]
-},
-{
-"tb": 1015144,
-"tbk": 6802,
-"tl": 4610678,
-"mb": 1992,
-"mbk": 9,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-219,
-220,
-221,
-222
-]
-},
-{
-"tb": 9760,
-"tbk": 244,
-"tl": 6447,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-223,
-224,
-225,
-226,
-227,
-228,
-229
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 823,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-117,
-41,
-46,
-46,
-47
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 4734,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-129,
-130,
-131,
-7,
-230
-]
-},
-{
-"tb": 77184,
-"tbk": 1072,
-"tl": 2784,
-"mb": 72,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-232,
-233,
-234,
-235,
-236,
-237,
-238
-]
-},
-{
-"tb": 4288,
-"tbk": 196,
-"tl": 1143,
-"mb": 80,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-239,
-240,
-241,
-242,
-243,
-244,
-245,
-246,
-247,
-248
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 6299,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-160,
-161,
-249,
-250,
-251,
-7,
-167
-]
-},
-{
-"tb": 2288,
-"tbk": 13,
-"tl": 3549,
-"mb": 528,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-252,
-253,
-254,
-255,
-256
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 7169,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-257,
-258,
-259,
-7,
-56
-]
-},
-{
-"tb": 2688,
-"tbk": 4,
-"tl": 996,
-"mb": 672,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-260,
-261,
-262,
-263,
-264
-]
-},
-{
-"tb": 49280,
-"tbk": 440,
-"tl": 305641,
-"mb": 336,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-156,
-157,
-158,
-7,
-230
-]
-},
-{
-"tb": 9856,
-"tbk": 88,
-"tl": 53588,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-265,
-157,
-158,
-7,
-8
-]
-},
-{
-"tb": 576,
-"tbk": 9,
-"tl": 293465,
-"mb": 192,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-266,
-267,
-268,
-269,
-270,
-271,
-272
-]
-},
-{
-"tb": 154224,
-"tbk": 1605,
-"tl": 9500,
-"mb": 120,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-273,
-274,
-275,
-276,
-277,
-278,
-279,
-280,
-281
-]
-},
-{
-"tb": 4480,
-"tbk": 40,
-"tl": 29674,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-265,
-157,
-158,
-7,
-282
-]
-},
-{
-"tb": 8176,
-"tbk": 73,
-"tl": 5299778,
-"mb": 336,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-283,
-284,
-285,
-286,
-287
-]
-},
-{
-"tb": 17280,
-"tbk": 45,
-"tl": 880510,
-"mb": 384,
-"mbk": 1,
-"gb": 384,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-288,
-289,
-290,
-291,
-292,
-293,
-294,
-295,
-296
-]
-},
-{
-"tb": 28224,
-"tbk": 392,
-"tl": 25355908407,
-"mb": 28224,
-"mbk": 392,
-"gb": 28224,
-"gbk": 392,
-"eb": 28224,
-"ebk": 392,
-"fs": [
-204,
-297,
-298,
-299,
-300,
-301,
-302
-]
-},
-{
-"tb": 91168,
-"tbk": 814,
-"tl": 592401,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-143,
-144,
-303,
-304,
-305
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 887,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-39,
-40,
-306,
-306,
-46
-]
-},
-{
-"tb": 768,
-"tbk": 8,
-"tl": 74325,
-"mb": 96,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-307,
-308,
-309,
-310,
-311,
-312,
-237,
-238
-]
-},
-{
-"tb": 10240,
-"tbk": 256,
-"tl": 35400,
-"mb": 120,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-313,
-314,
-315,
-316,
-317,
-318,
-319
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 6959,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-160,
-161,
-249,
-250,
-251,
-7,
-230
-]
-},
-{
-"tb": 56448,
-"tbk": 112,
-"tl": 183,
-"mb": 1848,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-320,
-321,
-322,
-323,
-324,
-325
-]
-},
-{
-"tb": 15360,
-"tbk": 384,
-"tl": 228958,
-"mb": 120,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-326,
-327,
-328,
-329,
-106,
-107,
-7
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 13900,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-330,
-5,
-6,
-7,
-331
-]
-},
-{
-"tb": 1760,
-"tbk": 10,
-"tl": 2170,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-252,
-332,
-333,
-334,
-335
-]
-},
-{
-"tb": 40,
-"tbk": 1,
-"tl": 64598021,
-"mb": 40,
-"mbk": 1,
-"gb": 40,
-"gbk": 1,
-"eb": 40,
-"ebk": 1,
-"fs": [
-1,
-26,
-27,
-28,
-336,
-337,
-338,
-339,
-340
-]
-},
-{
-"tb": 3520,
-"tbk": 20,
-"tl": 3928,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-341,
-342,
-343,
-344,
-345
-]
-},
-{
-"tb": 6336,
-"tbk": 88,
-"tl": 107126,
-"mb": 144,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-346,
-347,
-348,
-349,
-350
-]
-},
-{
-"tb": 768,
-"tbk": 3,
-"tl": 48,
-"mb": 256,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-351,
-352,
-353,
-354,
-355,
-356,
-357,
-358,
-359,
-360
-]
-},
-{
-"tb": 48,
-"tbk": 2,
-"tl": 5,
-"mb": 24,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-361,
-362,
-363,
-364,
-365,
-366,
-367,
-368
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 881,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-117,
-41,
-45,
-46,
-85
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 9283,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-369,
-370,
-371,
-7,
-56
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 781,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-372,
-373,
-374,
-375,
-376,
-377
-]
-},
-{
-"tb": 2120,
-"tbk": 53,
-"tl": 1157252,
-"mb": 240,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-160,
-161,
-162,
-163,
-164,
-165,
-378
-]
-},
-{
-"tb": 565120,
-"tbk": 14128,
-"tl": 24275,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-379,
-380,
-381,
-382,
-383,
-384,
-385,
-386
-]
-},
-{
-"tb": 500864,
-"tbk": 4472,
-"tl": 2381676,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-143,
-144,
-145,
-7,
-387
-]
-},
-{
-"tb": 112,
-"tbk": 1,
-"tl": 64597771,
-"mb": 112,
-"mbk": 1,
-"gb": 112,
-"gbk": 1,
-"eb": 112,
-"ebk": 1,
-"fs": [
-1,
-388,
-389,
-390,
-391,
-23,
-24,
-25
-]
-},
-{
-"tb": 1280,
-"tbk": 32,
-"tl": 3140,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-392,
-393,
-46,
-85,
-46,
-47
-]
-},
-{
-"tb": 8160,
-"tbk": 24,
-"tl": 23814,
-"mb": 680,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-394,
-395,
-396,
-397
-]
-},
-{
-"tb": 288900,
-"tbk": 1605,
-"tl": 112025,
-"mb": 180,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-398,
-399,
-400,
-401
-]
-},
-{
-"tb": 280,
-"tbk": 7,
-"tl": 97,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-313,
-314,
-402,
-46,
-46,
-47,
-403
-]
-},
-{
-"tb": 3392,
-"tbk": 1696,
-"tl": 7512873,
-"mb": 10,
-"mbk": 5,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-412,
-413,
-414,
-415
-]
-},
-{
-"tb": 77040,
-"tbk": 1605,
-"tl": 513696,
-"mb": 48,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-416,
-417,
-418,
-419,
-420,
-421,
-422
-]
-},
-{
-"tb": 3520,
-"tbk": 20,
-"tl": 327,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-423,
-424,
-425,
-103,
-426
-]
-},
-{
-"tb": 113120,
-"tbk": 505,
-"tl": 12577,
-"mb": 224,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-427,
-428,
-429,
-430,
-431,
-432,
-433,
-434,
-435,
-436
-]
-},
-{
-"tb": 23160,
-"tbk": 579,
-"tl": 59187,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-437,
-46,
-47,
-403,
-438
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5878,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-439,
-440,
-441,
-7,
-442
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 848,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-117,
-443,
-45,
-46,
-85
-]
-},
-{
-"tb": 816256,
-"tbk": 7288,
-"tl": 651952,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-143,
-144,
-444,
-304,
-445
-]
-},
-{
-"tb": 924480,
-"tbk": 12840,
-"tl": 44426544,
-"mb": 72,
-"mbk": 1,
-"gb": 72,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-446,
-447,
-448,
-449,
-450,
-451,
-452
-]
-},
-{
-"tb": 352,
-"tbk": 2,
-"tl": 786,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-252,
-453,
-454,
-455,
-456
-]
-},
-{
-"tb": 352,
-"tbk": 2,
-"tl": 139,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-457,
-458,
-459,
-460,
-461
-]
-},
-{
-"tb": 9480,
-"tbk": 237,
-"tl": 24396,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-437,
-85,
-85,
-46,
-47
-]
-},
-{
-"tb": 10752,
-"tbk": 96,
-"tl": 59317,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-86,
-87,
-88,
-7,
-56
-]
-},
-{
-"tb": 56,
-"tbk": 1,
-"tl": 64597308,
-"mb": 56,
-"mbk": 1,
-"gb": 56,
-"gbk": 1,
-"eb": 56,
-"ebk": 1,
-"fs": [
-1,
-462,
-463,
-21,
-22,
-23,
-24,
-25
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 8590,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-4,
-5,
-6,
-7,
-89
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 4907,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-105,
-106,
-107,
-7,
-464
-]
-},
-{
-"tb": 256000,
-"tbk": 16,
-"tl": 7736,
-"mb": 16000,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-465,
-466,
-467,
-468,
-469,
-470,
-471,
-472
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 854,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-473,
-474,
-475,
-476,
-477,
-377
-]
-},
-{
-"tb": 2816,
-"tbk": 87,
-"tl": 5481650076,
-"mb": 2816,
-"mbk": 87,
-"gb": 2816,
-"gbk": 87,
-"eb": 2816,
-"ebk": 87,
-"fs": [
-9,
-478,
-479,
-480,
-481,
-482,
-483,
-484,
-485
-]
-},
-{
-"tb": 71232,
-"tbk": 336,
-"tl": 362427,
-"mb": 212,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-486,
-487,
-488,
-489
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5975,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-490,
-491,
-492,
-7,
-493
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5939,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-439,
-440,
-441,
-7,
-230
-]
-},
-{
-"tb": 42000,
-"tbk": 1750,
-"tl": 627142,
-"mb": 168,
-"mbk": 7,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-494,
-495,
-496,
-497,
-498,
-499,
-500
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6394,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-501,
-502,
-503,
-7,
-230
-]
-},
-{
-"tb": 873120,
-"tbk": 1605,
-"tl": 63038,
-"mb": 544,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-504,
-505,
-506,
-507,
-508,
-509,
-510,
-511,
-512
-]
-},
-{
-"tb": 3520,
-"tbk": 20,
-"tl": 455,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-100,
-424,
-425,
-103,
-426
-]
-},
-{
-"tb": 10944,
-"tbk": 152,
-"tl": 993054,
-"mb": 1368,
-"mbk": 19,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-513,
-514,
-515,
-516,
-517,
-237,
-238
-]
-},
-{
-"tb": 16058388,
-"tbk": 396289,
-"tl": 2253235,
-"mb": 280,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-518,
-519,
-520,
-521,
-522,
-523,
-524
-]
-},
-{
-"tb": 751140,
-"tbk": 1605,
-"tl": 845444,
-"mb": 468,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-525,
-526,
-527,
-528
-]
-},
-{
-"tb": 5560,
-"tbk": 139,
-"tl": 261,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-379,
-380,
-381,
-382,
-383,
-529,
-530,
-531
-]
-},
-{
-"tb": 40,
-"tbk": 1,
-"tl": 64597694,
-"mb": 40,
-"mbk": 1,
-"gb": 40,
-"gbk": 1,
-"eb": 40,
-"ebk": 1,
-"fs": [
-1,
-26,
-27,
-28,
-532,
-533,
-534,
-535,
-536
-]
-},
-{
-"tb": 116808,
-"tbk": 471,
-"tl": 21429,
-"mb": 248,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-537,
-538,
-94,
-95,
-96,
-97,
-229
-]
-},
-{
-"tb": 11120,
-"tbk": 278,
-"tl": 72231,
-"mb": 160,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-539,
-540,
-541,
-542,
-543,
-316,
-317
-]
-},
-{
-"tb": 1856,
-"tbk": 31,
-"tl": 209,
-"mb": 160,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-544,
-545,
-546,
-547,
-548,
-549,
-550,
-551,
-552,
-553,
-554
-]
-},
-{
-"tb": 89880,
-"tbk": 1605,
-"tl": 498503,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-555,
-418,
-419,
-420,
-421,
-422
-]
-},
-{
-"tb": 6912,
-"tbk": 112,
-"tl": 43640,
-"mb": 544,
-"mbk": 7,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-556,
-557,
-558,
-559,
-560
-]
-},
-{
-"tb": 33120,
-"tbk": 8280,
-"tl": 28695430,
-"mb": 24,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-572
-]
-},
-{
-"tb": 280,
-"tbk": 7,
-"tl": 771,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-573,
-574,
-118,
-46,
-46,
-47
-]
-},
-{
-"tb": 97920,
-"tbk": 32,
-"tl": 258626451,
-"mb": 49152,
-"mbk": 4,
-"gb": 49152,
-"gbk": 4,
-"eb": 49152,
-"ebk": 4,
-"fs": [
-204,
-205,
-575,
-576,
-577,
-578,
-579
-]
-},
-{
-"tb": 2496,
-"tbk": 3,
-"tl": 79,
-"mb": 832,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-580,
-581,
-582,
-583,
-584
-]
-},
-{
-"tb": 563150,
-"tbk": 4827,
-"tl": 36727,
-"mb": 200,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-168,
-169,
-170,
-171,
-585,
-586,
-587,
-588,
-589,
-590,
-591,
-592,
-593,
-594,
-595,
-452,
-596
-]
-},
-{
-"tb": 572992,
-"tbk": 5116,
-"tl": 743391,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-265,
-157,
-597,
-598,
-599
-]
-},
-{
-"tb": 42560,
-"tbk": 1064,
-"tl": 29473,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-600,
-601,
-602,
-603,
-604,
-229,
-605
-]
-},
-{
-"tb": 6144,
-"tbk": 32,
-"tl": 138,
-"mb": 192,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-606,
-607,
-608,
-609,
-610
-]
-},
-{
-"tb": 265049,
-"tbk": 55112,
-"tl": 1177840865,
-"mb": 904,
-"mbk": 32,
-"gb": 98,
-"gbk": 28,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-412,
-413,
-611,
-612
-]
-},
-{
-"tb": 90,
-"tbk": 1,
-"tl": 64895751,
-"mb": 90,
-"mbk": 1,
-"gb": 90,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-613,
-614,
-615,
-616,
-617,
-618,
-619,
-620,
-621,
-622,
-623,
-624,
-625,
-626
-]
-},
-{
-"tb": 1120,
-"tbk": 10,
-"tl": 599341,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-627,
-628,
-629,
-630,
-631
-]
-},
-{
-"tb": 21792,
-"tbk": 350,
-"tl": 220772,
-"mb": 288,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-632,
-633,
-634,
-635,
-636,
-637
-]
-},
-{
-"tb": 394496,
-"tbk": 95864,
-"tl": 74285493,
-"mb": 519,
-"mbk": 123,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-638,
-639,
-640,
-641,
-642,
-643,
-644,
-645,
-646,
-647,
-648,
-116,
-111,
-112,
-113,
-114,
-115,
-116
-]
-},
-{
-"tb": 595036,
-"tbk": 1732,
-"tl": 68433,
-"mb": 1668,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-649,
-650,
-651,
-652
-]
-},
-{
-"tb": 55552,
-"tbk": 496,
-"tl": 332076,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-490,
-491,
-492,
-7,
-8
-]
-},
-{
-"tb": 153216,
-"tbk": 1596,
-"tl": 162993,
-"mb": 96,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-653,
-654,
-655,
-656,
-657
-]
-},
-{
-"tb": 1624,
-"tbk": 29,
-"tl": 8126,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-658,
-659,
-660,
-661,
-662,
-663,
-664
-]
-},
-{
-"tb": 1120,
-"tbk": 10,
-"tl": 612537,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-665,
-666,
-667,
-668,
-669
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 867,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-392,
-393,
-41,
-45,
-46,
-85
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 874,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-39,
-40,
-42,
-40,
-670
-]
-},
-{
-"tb": 26120,
-"tbk": 653,
-"tl": 1192,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-379,
-380,
-381,
-382,
-383,
-671,
-672,
-531
-]
-},
-{
-"tb": 188280,
-"tbk": 35120,
-"tl": 1177479,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-638,
-639,
-640,
-641,
-642,
-643,
-644,
-645,
-646,
-647,
-115,
-116,
-111,
-112,
-113,
-114,
-673,
-674
-]
-},
-{
-"tb": 768,
-"tbk": 32,
-"tl": 16422,
-"mb": 48,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-675,
-676,
-677,
-678,
-679,
-680,
-681,
-682
-]
-},
-{
-"tb": 2534136,
-"tbk": 21846,
-"tl": 28377640,
-"mb": 232,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-683,
-684,
-685,
-686
-]
-},
-{
-"tb": 25536,
-"tbk": 277,
-"tl": 273198,
-"mb": 960,
-"mbk": 5,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-687,
-688,
-689,
-690,
-636,
-637
-]
-},
-{
-"tb": 640,
-"tbk": 16,
-"tl": 1670,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-691,
-46,
-85,
-46,
-47
-]
-},
-{
-"tb": 6960,
-"tbk": 412,
-"tl": 5647,
-"mb": 48,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-692,
-693,
-694,
-695,
-696
-]
-},
-{
-"tb": 1680,
-"tbk": 15,
-"tl": 927153,
-"mb": 336,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-697,
-698,
-699,
-700,
-701
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 7994,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-702,
-258,
-259,
-7,
-8
-]
-},
-{
-"tb": 3024,
-"tbk": 32,
-"tl": 1070277,
-"mb": 928,
-"mbk": 8,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-703,
-704,
-705
-]
-},
-{
-"tb": 704,
-"tbk": 4,
-"tl": 1028,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-706,
-707,
-708,
-709,
-710
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5816,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-711,
-440,
-441,
-7,
-159
-]
-},
-{
-"tb": 3288,
-"tbk": 816,
-"tl": 1008657,
-"mb": 33,
-"mbk": 18,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-712,
-713,
-714,
-715,
-716,
-717
-]
-},
-{
-"tb": 820512,
-"tbk": 7326,
-"tl": 388612,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-143,
-144,
-303,
-718,
-719
-]
-},
-{
-"tb": 336,
-"tbk": 3,
-"tl": 216466,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-720,
-721,
-722,
-668,
-669
-]
-},
-{
-"tb": 280,
-"tbk": 7,
-"tl": 693,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-117,
-45,
-118,
-46,
-46
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 830,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-723,
-42,
-40,
-46,
-85,
-46
-]
-},
-{
-"tb": 91104,
-"tbk": 470,
-"tl": 2021,
-"mb": 336,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-724,
-725,
-726,
-727,
-728,
-729
-]
-},
-{
-"tb": 2137860,
-"tbk": 14445,
-"tl": 59863926,
-"mb": 296,
-"mbk": 2,
-"gb": 148,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-730,
-731,
-732,
-733
-]
-},
-{
-"tb": 1760,
-"tbk": 10,
-"tl": 2081,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-341,
-332,
-333,
-334,
-335
-]
-},
-{
-"tb": 1536,
-"tbk": 16,
-"tl": 238,
-"mb": 96,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-734,
-735,
-736,
-737,
-738
-]
-},
-{
-"tb": 640,
-"tbk": 8,
-"tl": 1838,
-"mb": 80,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-739,
-740,
-42,
-40,
-42,
-40
-]
-},
-{
-"tb": 56,
-"tbk": 1,
-"tl": 64598846,
-"mb": 56,
-"mbk": 1,
-"gb": 56,
-"gbk": 1,
-"eb": 56,
-"ebk": 1,
-"fs": [
-1,
-555,
-418,
-741,
-742,
-23,
-24,
-25
-]
-},
-{
-"tb": 64,
-"tbk": 4,
-"tl": 258616869,
-"mb": 64,
-"mbk": 4,
-"gb": 64,
-"gbk": 4,
-"eb": 64,
-"ebk": 4,
-"fs": [
-211,
-212,
-213,
-203,
-743,
-744,
-745,
-746
-]
-},
-{
-"tb": 565120,
-"tbk": 14128,
-"tl": 27202,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-379,
-380,
-381,
-382,
-383,
-671,
-672,
-747
-]
-},
-{
-"tb": 176,
-"tbk": 1,
-"tl": 285,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-252,
-453,
-748,
-455,
-749
-]
-},
-{
-"tb": 40,
-"tbk": 1,
-"tl": 64598549,
-"mb": 40,
-"mbk": 1,
-"gb": 40,
-"gbk": 1,
-"eb": 40,
-"ebk": 1,
-"fs": [
-1,
-26,
-27,
-28,
-750,
-751,
-752,
-753,
-754
-]
-},
-{
-"tb": 5456,
-"tbk": 31,
-"tl": 6390,
-"mb": 528,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-706,
-755,
-708,
-709,
-756
-]
-},
-{
-"tb": 256,
-"tbk": 8,
-"tl": 6663,
-"mb": 32,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-757,
-758,
-759,
-760,
-761,
-762,
-763
-]
-},
-{
-"tb": 448,
-"tbk": 8,
-"tl": 1180,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-658,
-659,
-660,
-660,
-660,
-661,
-764
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 772,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-392,
-765,
-766,
-375,
-376,
-377
-]
-},
-{
-"tb": 32,
-"tbk": 3,
-"tl": 3446,
-"mb": 16,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-518,
-519,
-767,
-768,
-769,
-770
-]
-},
-{
-"tb": 10488532,
-"tbk": 192625,
-"tl": 1196533251,
-"mb": 4160,
-"mbk": 80,
-"gb": 1092,
-"gbk": 21,
-"eb": 0,
-"ebk": 0,
-"fs": [
-48,
-49,
-50,
-51,
-771,
-772,
-773,
-774,
-775,
-776
-]
-},
-{
-"tb": 11080,
-"tbk": 277,
-"tl": 641,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-777,
-778,
-779,
-780,
-781,
-782,
-783
-]
-},
-{
-"tb": 6912,
-"tbk": 18,
-"tl": 293,
-"mb": 384,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-784,
-785,
-786,
-787,
-788
-]
-},
-{
-"tb": 38656,
-"tbk": 1208,
-"tl": 654777,
-"mb": 32,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-789,
-790,
-791,
-792,
-793,
-794,
-795,
-796,
-797,
-798
-]
-},
-{
-"tb": 596160,
-"tbk": 8280,
-"tl": 8378245,
-"mb": 432,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-799,
-800,
-126,
-801,
-802
-]
-},
-{
-"tb": 1408,
-"tbk": 8,
-"tl": 1648,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-457,
-803,
-459,
-460,
-461
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 12430,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-156,
-157,
-158,
-7,
-89
-]
-},
-{
-"tb": 4704,
-"tbk": 7,
-"tl": 181,
-"mb": 672,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-260,
-261,
-262,
-804,
-805
-]
-},
-{
-"tb": 133936,
-"tbk": 761,
-"tl": 198313,
-"mb": 528,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-423,
-806,
-102,
-103,
-426
-]
-},
-{
-"tb": 687232,
-"tbk": 6136,
-"tl": 914837,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-143,
-144,
-807,
-304,
-445
-]
-},
-{
-"tb": 816256,
-"tbk": 7288,
-"tl": 583107,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-808,
-144,
-444,
-304,
-445
-]
-},
-{
-"tb": 57408,
-"tbk": 1794,
-"tl": 257060,
-"mb": 160,
-"mbk": 5,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-809,
-810,
-811,
-812,
-813,
-814,
-815
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5804,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-156,
-157,
-158,
-7,
-442
-]
-},
-{
-"tb": 34560,
-"tbk": 144,
-"tl": 69176,
-"mb": 720,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-816,
-817,
-818,
-819,
-193,
-194
-]
-},
-{
-"tb": 116808,
-"tbk": 471,
-"tl": 111532,
-"mb": 248,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-537,
-538,
-94,
-95,
-820,
-229,
-605
-]
-},
-{
-"tb": 425152,
-"tbk": 584,
-"tl": 345770,
-"mb": 2184,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-821,
-822,
-823,
-824,
-825,
-826,
-193
-]
-},
-{
-"tb": 53144,
-"tbk": 73,
-"tl": 73100,
-"mb": 2184,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-821,
-822,
-823,
-824,
-827,
-828,
-636
-]
-},
-{
-"tb": 176,
-"tbk": 1,
-"tl": 89,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-252,
-332,
-829,
-334,
-335
-]
-},
-{
-"tb": 112,
-"tbk": 1,
-"tl": 56215,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-830,
-831,
-832,
-833,
-669
-]
-},
-{
-"tb": 1840,
-"tbk": 46,
-"tl": 9274,
-"mb": 120,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-326,
-327,
-834,
-835,
-836,
-837,
-838
-]
-},
-{
-"tb": 640,
-"tbk": 16,
-"tl": 1669,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-573,
-574,
-46,
-85,
-46,
-47
-]
-},
-{
-"tb": 56,
-"tbk": 1,
-"tl": 55,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-658,
-659,
-660,
-660,
-660,
-661,
-662
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 12335,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-839,
-840,
-841,
-7,
-331
-]
-},
-{
-"tb": 11520,
-"tbk": 24,
-"tl": 8280,
-"mb": 960,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-842,
-843,
-844,
-845,
-846,
-847,
-848,
-849,
-850
-]
-},
-{
-"tb": 112,
-"tbk": 1,
-"tl": 64598002,
-"mb": 112,
-"mbk": 1,
-"gb": 112,
-"gbk": 1,
-"eb": 112,
-"ebk": 1,
-"fs": [
-1,
-388,
-851,
-390,
-391,
-23,
-24,
-25
-]
-},
-{
-"tb": 18816,
-"tbk": 196,
-"tl": 269139,
-"mb": 96,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-852,
-853,
-854,
-855,
-856,
-857
-]
-},
-{
-"tb": 27776,
-"tbk": 124,
-"tl": 5552,
-"mb": 672,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-858,
-859,
-860,
-861,
-862,
-863,
-864
-]
-},
-{
-"tb": 2912,
-"tbk": 40,
-"tl": 2587516240,
-"mb": 2912,
-"mbk": 40,
-"gb": 2912,
-"gbk": 40,
-"eb": 2912,
-"ebk": 40,
-"fs": [
-9,
-239,
-240,
-241,
-242,
-865,
-866,
-867,
-868,
-869,
-870
-]
-},
-{
-"tb": 1232640,
-"tbk": 12840,
-"tl": 1821255,
-"mb": 96,
-"mbk": 1,
-"gb": 96,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-871,
-872,
-873,
-193,
-194,
-874
-]
-},
-{
-"tb": 97440,
-"tbk": 435,
-"tl": 11846,
-"mb": 224,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-875,
-876,
-877,
-878,
-879
-]
-},
-{
-"tb": 9680,
-"tbk": 55,
-"tl": 1609,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-100,
-424,
-102,
-103,
-426
-]
-},
-{
-"tb": 640,
-"tbk": 16,
-"tl": 435,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-539,
-540,
-880,
-881,
-46,
-46,
-47
-]
-},
-{
-"tb": 29952,
-"tbk": 416,
-"tl": 474548,
-"mb": 216,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-882,
-883,
-124,
-125,
-126
-]
-},
-{
-"tb": 280,
-"tbk": 7,
-"tl": 730,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-44,
-45,
-118,
-46,
-46
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 13707,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-884,
-885,
-886,
-7,
-887
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 1726,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-697,
-888,
-889,
-7,
-890
-]
-},
-{
-"tb": 96,
-"tbk": 1,
-"tl": 524,
-"mb": 96,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-891,
-892,
-893,
-894,
-895
-]
-},
-{
-"tb": 448,
-"tbk": 8,
-"tl": 25,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-83,
-896,
-45,
-45,
-46,
-46
-]
-},
-{
-"tb": 40,
-"tbk": 1,
-"tl": 1,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-897,
-898,
-899,
-900,
-900,
-900,
-901
-]
-},
-{
-"tb": 11812800,
-"tbk": 25680,
-"tl": 7578052,
-"mb": 736,
-"mbk": 1,
-"gb": 736,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-902,
-903,
-904,
-905,
-193,
-194
-]
-},
-{
-"tb": 672,
-"tbk": 1,
-"tl": 60,
-"mb": 672,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-260,
-261,
-262,
-906,
-907
-]
-},
-{
-"tb": 6048,
-"tbk": 54,
-"tl": 5354,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-808,
-144,
-303,
-304,
-908
-]
-},
-{
-"tb": 352,
-"tbk": 2,
-"tl": 282,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-909,
-836,
-910,
-838,
-461
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 11497,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-490,
-491,
-492,
-7,
-911
-]
-},
-{
-"tb": 5456,
-"tbk": 31,
-"tl": 6109,
-"mb": 528,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-912,
-755,
-708,
-709,
-756
-]
-},
-{
-"tb": 600,
-"tbk": 15,
-"tl": 1546,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-44,
-46,
-85,
-46,
-47
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5901,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-257,
-258,
-259,
-7,
-913
-]
-},
-{
-"tb": 70596176,
-"tbk": 192625,
-"tl": 1193124664,
-"mb": 26880,
-"mbk": 80,
-"gb": 7056,
-"gbk": 21,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-518,
-914,
-915,
-916,
-917,
-918
-]
-},
-{
-"tb": 176,
-"tbk": 1,
-"tl": 243,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-919,
-920,
-921,
-922,
-923
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 568384,
-"mb": 336,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-924,
-925,
-926,
-701,
-927
-]
-},
-{
-"tb": 27776,
-"tbk": 124,
-"tl": 5473,
-"mb": 672,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-858,
-859,
-860,
-861,
-862,
-863,
-928
-]
-},
-{
-"tb": 9600,
-"tbk": 200,
-"tl": 223319,
-"mb": 96,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-929,
-930,
-931,
-237,
-238,
-932,
-933
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6977,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-86,
-87,
-88,
-7,
-167
-]
-},
-{
-"tb": 176,
-"tbk": 1,
-"tl": 78,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-934,
-935,
-936,
-937,
-938
-]
-},
-{
-"tb": 3456,
-"tbk": 48,
-"tl": 53,
-"mb": 72,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-232,
-233,
-939,
-940,
-941,
-942,
-943
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6609,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-944,
-945,
-946,
-7,
-913
-]
-},
-{
-"tb": 31944,
-"tbk": 2183,
-"tl": 1728320,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-947,
-948,
-949,
-950,
-951,
-952
-]
-},
-{
-"tb": 192,
-"tbk": 3,
-"tl": 1831,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-953,
-954,
-955,
-956,
-957,
-958
-]
-},
-{
-"tb": 168,
-"tbk": 18,
-"tl": 314,
-"mb": 16,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-959,
-960,
-961,
-962,
-963,
-964,
-965,
-966,
-967
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5703,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-143,
-144,
-145,
-7,
-968
-]
-},
-{
-"tb": 661920,
-"tbk": 2955,
-"tl": 24741,
-"mb": 224,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-427,
-969,
-970,
-971,
-972,
-973,
-974,
-975,
-976,
-977
-]
-},
-{
-"tb": 11618048,
-"tbk": 112765,
-"tl": 67821047,
-"mb": 2432,
-"mbk": 28,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-65,
-66,
-67,
-68,
-978,
-979,
-980,
-981
-]
-},
-{
-"tb": 522368,
-"tbk": 4664,
-"tl": 707429,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-4,
-5,
-982,
-598,
-599
-]
-},
-{
-"tb": 1737720,
-"tbk": 12872,
-"tl": 42080,
-"mb": 180,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-983,
-984,
-985,
-986,
-987,
-988,
-989,
-990,
-991,
-992,
-993,
-994,
-995,
-996,
-997,
-998,
-999,
-1000,
-1001,
-1002,
-1003
-]
-},
-{
-"tb": 5760,
-"tbk": 80,
-"tl": 83339,
-"mb": 144,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-1004,
-1005,
-348,
-349,
-350
-]
-},
-{
-"tb": 1280,
-"tbk": 32,
-"tl": 3276,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-117,
-46,
-85,
-85,
-46
-]
-},
-{
-"tb": 100352,
-"tbk": 196,
-"tl": 12682461937,
-"mb": 100352,
-"mbk": 196,
-"gb": 100352,
-"gbk": 196,
-"eb": 100352,
-"ebk": 196,
-"fs": [
-9,
-196,
-197,
-198,
-199,
-200,
-201,
-202,
-214
-]
-},
-{
-"tb": 26816320,
-"tbk": 4142,
-"tl": 771071,
-"mb": 24064,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1006,
-1007,
-1008,
-1009,
-1010
-]
-},
-{
-"tb": 77040,
-"tbk": 1605,
-"tl": 281023,
-"mb": 48,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1011,
-1012,
-1013,
-1014,
-1015,
-421,
-422
-]
-},
-{
-"tb": 140,
-"tbk": 2,
-"tl": 64409161,
-"mb": 140,
-"mbk": 2,
-"gb": 88,
-"gbk": 1,
-"eb": 88,
-"ebk": 1,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-1016,
-1017,
-1018,
-1019
-]
-},
-{
-"tb": 10304,
-"tbk": 152,
-"tl": 2645,
-"mb": 128,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-351,
-1020,
-1021,
-1022,
-1023,
-1024,
-1025,
-1026,
-1027,
-1028
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 8511,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1029,
-1030,
-1031,
-7,
-89
-]
-},
-{
-"tb": 816,
-"tbk": 1,
-"tl": 641,
-"mb": 816,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1032,
-741,
-742,
-23,
-24,
-25,
-1033
-]
-},
-{
-"tb": 13464,
-"tbk": 187,
-"tl": 2587,
-"mb": 72,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1034,
-1035,
-94,
-95,
-1036,
-1037,
-229
-]
-},
-{
-"tb": 147936,
-"tbk": 292,
-"tl": 6456033,
-"mb": 3000,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-1038,
-1039,
-1040,
-1041
-]
-},
-{
-"tb": 11136,
-"tbk": 23,
-"tl": 1214200,
-"mb": 768,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-288,
-1042,
-1043,
-1044,
-1045,
-1046,
-1047,
-1048,
-1049
-]
-},
-{
-"tb": 16704,
-"tbk": 232,
-"tl": 8566,
-"mb": 144,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-513,
-514,
-515,
-1050,
-1051,
-237,
-238
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 7160,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-129,
-130,
-131,
-7,
-89
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 869,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-723,
-45,
-118,
-46,
-85,
-46
-]
-},
-{
-"tb": 7504,
-"tbk": 67,
-"tl": 5031,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-808,
-144,
-444,
-304,
-908
-]
-},
-{
-"tb": 1920,
-"tbk": 24,
-"tl": 2776,
-"mb": 80,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1052,
-896,
-46,
-85,
-46,
-47
-]
-},
-{
-"tb": 158208,
-"tbk": 2472,
-"tl": 2452866,
-"mb": 1344,
-"mbk": 21,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-65,
-108,
-109,
-110,
-111,
-112,
-113,
-114,
-1053,
-1054,
-1055,
-1056
-]
-},
-{
-"tb": 176,
-"tbk": 1,
-"tl": 276,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-341,
-453,
-748,
-455,
-749
-]
-},
-{
-"tb": 283808,
-"tbk": 196,
-"tl": 12682459750,
-"mb": 283808,
-"mbk": 196,
-"gb": 283808,
-"gbk": 196,
-"eb": 283808,
-"ebk": 196,
-"fs": [
-211,
-1057,
-1058,
-202,
-214,
-215,
-216,
-217
-]
-},
-{
-"tb": 56,
-"tbk": 1,
-"tl": 64598635,
-"mb": 56,
-"mbk": 1,
-"gb": 56,
-"gbk": 1,
-"eb": 56,
-"ebk": 1,
-"fs": [
-1,
-555,
-1059,
-741,
-742,
-23,
-24,
-25
-]
-},
-{
-"tb": 5712,
-"tbk": 51,
-"tl": 7260,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-143,
-144,
-807,
-304,
-908
-]
-},
-{
-"tb": 3696,
-"tbk": 21,
-"tl": 3462,
-"mb": 528,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-1060,
-1061,
-1062,
-922,
-923
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 12583,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-265,
-157,
-158,
-7,
-89
-]
-},
-{
-"tb": 93312,
-"tbk": 480,
-"tl": 12682580697,
-"mb": 56064,
-"mbk": 196,
-"gb": 56064,
-"gbk": 196,
-"eb": 56064,
-"ebk": 196,
-"fs": [
-204,
-205,
-575,
-576,
-577,
-578,
-1063
-]
-},
-{
-"tb": 15552,
-"tbk": 216,
-"tl": 1196361,
-"mb": 1872,
-"mbk": 26,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-513,
-514,
-515,
-1064,
-236,
-237,
-238
-]
-},
-{
-"tb": 77040,
-"tbk": 1605,
-"tl": 343502,
-"mb": 48,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1011,
-1012,
-1065,
-419,
-420,
-421,
-422
-]
-},
-{
-"tb": 10320,
-"tbk": 860,
-"tl": 2057146,
-"mb": 48,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1066,
-1067,
-1068,
-1069,
-1070,
-1071,
-1072,
-1073,
-1074
-]
-},
-{
-"tb": 824080,
-"tbk": 52600,
-"tl": 4304240,
-"mb": 64,
-"mbk": 1,
-"gb": 64,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1075,
-1076,
-1077,
-1078,
-1079,
-1080
-]
-},
-{
-"tb": 672,
-"tbk": 4,
-"tl": 258637111,
-"mb": 672,
-"mbk": 4,
-"gb": 672,
-"gbk": 4,
-"eb": 672,
-"ebk": 4,
-"fs": [
-211,
-1081,
-1082,
-1083,
-302,
-203,
-743,
-744
-]
-},
-{
-"tb": 5760,
-"tbk": 15,
-"tl": 429,
-"mb": 384,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-784,
-785,
-786,
-787,
-1084
-]
-},
-{
-"tb": 6112,
-"tbk": 196,
-"tl": 12682708791,
-"mb": 6112,
-"mbk": 196,
-"gb": 6112,
-"gbk": 196,
-"eb": 6112,
-"ebk": 196,
-"fs": [
-1085,
-1086,
-1087,
-1088,
-1089,
-1090,
-1091,
-1092,
-1093,
-1094
-]
-},
-{
-"tb": 213856768,
-"tbk": 33040,
-"tl": 5400904,
-"mb": 24064,
-"mbk": 1,
-"gb": 24064,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1095,
-1096,
-1097,
-1098,
-1099
-]
-},
-{
-"tb": 42048,
-"tbk": 584,
-"tl": 765199,
-"mb": 216,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-1100,
-1101,
-1102,
-1103,
-1104
-]
-},
-{
-"tb": 87808,
-"tbk": 784,
-"tl": 474762,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-156,
-157,
-158,
-7,
-56
-]
-},
-{
-"tb": 1170504,
-"tbk": 249272,
-"tl": 218267958,
-"mb": 240,
-"mbk": 54,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-638,
-639,
-640,
-641,
-642,
-643,
-644,
-645,
-646,
-1105,
-1106,
-1107,
-1108,
-1109,
-1110,
-1111
-]
-},
-{
-"tb": 36016,
-"tbk": 1313,
-"tl": 57214262035,
-"mb": 26416,
-"mbk": 913,
-"gb": 26416,
-"gbk": 913,
-"eb": 26416,
-"ebk": 913,
-"fs": [
-1085,
-1086,
-1087,
-1088,
-1089,
-1090,
-1112,
-1113
-]
-},
-{
-"tb": 10320,
-"tbk": 258,
-"tl": 7996,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-223,
-224,
-225,
-226,
-603,
-604,
-229
-]
-},
-{
-"tb": 6887,
-"tbk": 344,
-"tl": 1334,
-"mb": 50,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-1114,
-1115,
-1116,
-1117,
-1118,
-1119,
-1120,
-1121
-]
-},
-{
-"tb": 3808,
-"tbk": 34,
-"tl": 1920667,
-"mb": 336,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-439,
-1122,
-1123,
-1124,
-1125
-]
-},
-{
-"tb": 687232,
-"tbk": 6136,
-"tl": 868646,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-808,
-144,
-807,
-304,
-445
-]
-},
-{
-"tb": 76560,
-"tbk": 435,
-"tl": 159767,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-706,
-1126,
-1127,
-1128,
-1129
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 2284,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-143,
-144,
-145,
-7,
-132
-]
-},
-{
-"tb": 1960,
-"tbk": 1,
-"tl": 64791487,
-"mb": 1960,
-"mbk": 1,
-"gb": 1960,
-"gbk": 1,
-"eb": 1960,
-"ebk": 1,
-"fs": [
-64,
-1130,
-1131,
-1132,
-1133,
-1134,
-1135,
-1136,
-1137,
-1138
-]
-},
-{
-"tb": 19260,
-"tbk": 1605,
-"tl": 2778,
-"mb": 12,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1139,
-1140,
-1141,
-1142,
-1143,
-1144,
-1145,
-1146,
-1147,
-1148,
-1149,
-1150,
-1151,
-1152
-]
-},
-{
-"tb": 13464,
-"tbk": 187,
-"tl": 33399,
-"mb": 72,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1034,
-1035,
-94,
-95,
-820,
-229,
-605
-]
-},
-{
-"tb": 418368,
-"tbk": 21368,
-"tl": 37236,
-"mb": 128,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-947,
-948,
-1153,
-1154,
-719,
-1155
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 822,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-723,
-45,
-46,
-46,
-47,
-403
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 828,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-392,
-393,
-42,
-40,
-670,
-46
-]
-},
-{
-"tb": 1950792,
-"tbk": 3242,
-"tl": 213816,
-"mb": 2948,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-1156,
-1157,
-1158,
-1159
-]
-},
-{
-"tb": 1008,
-"tbk": 9,
-"tl": 608525,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1160,
-831,
-832,
-668,
-669
-]
-},
-{
-"tb": 1110660,
-"tbk": 1605,
-"tl": 1335439,
-"mb": 692,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-1161,
-1162,
-1163,
-1164
-]
-},
-{
-"tb": 51968,
-"tbk": 184,
-"tl": 175661,
-"mb": 448,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1165,
-1166,
-1167,
-1168,
-1169,
-1170,
-1171,
-1172,
-1173,
-1174
-]
-},
-{
-"tb": 111104,
-"tbk": 20,
-"tl": 80505,
-"mb": 14336,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1175,
-1176,
-1177,
-1178,
-743
-]
-},
-{
-"tb": 48,
-"tbk": 1,
-"tl": 64598735,
-"mb": 48,
-"mbk": 1,
-"gb": 48,
-"gbk": 1,
-"eb": 48,
-"ebk": 1,
-"fs": [
-1,
-416,
-417,
-1179,
-741,
-742,
-23,
-24,
-25
-]
-},
-{
-"tb": 588672,
-"tbk": 1513,
-"tl": 28738,
-"mb": 672,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-1180,
-1181,
-1182,
-1183,
-1184,
-1185,
-1186,
-1187,
-1188
-]
-},
-{
-"tb": 840,
-"tbk": 168,
-"tl": 642814,
-"mb": 10,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-1189
-]
-},
-{
-"tb": 80,
-"tbk": 80,
-"tl": 265263,
-"mb": 2,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-412,
-413,
-414,
-1190
-]
-},
-{
-"tb": 157464,
-"tbk": 452,
-"tl": 13325,
-"mb": 1728,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-1191,
-1192,
-1193,
-1194,
-1195,
-1196,
-1197,
-1198,
-1199
-]
-},
-{
-"tb": 65296,
-"tbk": 371,
-"tl": 27538,
-"mb": 880,
-"mbk": 5,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-100,
-1200,
-425,
-103,
-104
-]
-},
-{
-"tb": 640,
-"tbk": 16,
-"tl": 361926,
-"mb": 160,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-1201,
-1202,
-1203,
-1204,
-1205
-]
-},
-{
-"tb": 8800,
-"tbk": 220,
-"tl": 12936310,
-"mb": 120,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-26,
-27,
-1206,
-1207,
-1208,
-1209,
-1210
-]
-},
-{
-"tb": 30336,
-"tbk": 237,
-"tl": 323028,
-"mb": 128,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1211,
-1212,
-1213,
-1214,
-1215,
-1216
-]
-},
-{
-"tb": 77040,
-"tbk": 1605,
-"tl": 413079,
-"mb": 48,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-416,
-417,
-1217,
-1014,
-1015,
-421,
-422
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 4733,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-4,
-5,
-6,
-7,
-913
-]
-},
-{
-"tb": 15152,
-"tbk": 947,
-"tl": 13368,
-"mb": 16,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1218,
-1219,
-94,
-95,
-1036,
-1037,
-229
-]
-},
-{
-"tb": 85904,
-"tbk": 767,
-"tl": 586293,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-808,
-144,
-807,
-304,
-305
-]
-},
-{
-"tb": 896,
-"tbk": 16,
-"tl": 2287,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-658,
-659,
-660,
-660,
-661,
-764,
-1220
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 838,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-1221,
-119,
-46,
-46,
-47
-]
-},
-{
-"tb": 67360,
-"tbk": 1684,
-"tl": 9317407,
-"mb": 80,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-26,
-27,
-1206,
-1207,
-1208,
-1222,
-1223
-]
-},
-{
-"tb": 112,
-"tbk": 1,
-"tl": 36086,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-944,
-666,
-667,
-1224,
-1225
-]
-},
-{
-"tb": 38400,
-"tbk": 400,
-"tl": 25882343231,
-"mb": 38400,
-"mbk": 400,
-"gb": 38400,
-"gbk": 400,
-"eb": 38400,
-"ebk": 400,
-"fs": [
-211,
-1226,
-1227,
-1228,
-1229,
-1230,
-869,
-870
-]
-},
-{
-"tb": 48,
-"tbk": 1,
-"tl": 64598011,
-"mb": 48,
-"mbk": 1,
-"gb": 48,
-"gbk": 1,
-"eb": 48,
-"ebk": 1,
-"fs": [
-1,
-1011,
-1012,
-851,
-390,
-391,
-23,
-24,
-25
-]
-},
-{
-"tb": 1096,
-"tbk": 256,
-"tl": 28608,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-638,
-639,
-640,
-641,
-642,
-643,
-644,
-645,
-646,
-647,
-673,
-674,
-1231,
-1232,
-1233,
-1234
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 13864,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-265,
-157,
-158,
-7,
-159
-]
-},
-{
-"tb": 1130905,
-"tbk": 1605,
-"tl": 59216991,
-"mb": 1636,
-"mbk": 1,
-"gb": 603,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1235,
-1236,
-1237,
-1238,
-1239,
-1240,
-1241,
-1242,
-1243,
-452,
-596
-]
-},
-{
-"tb": 234240,
-"tbk": 1208,
-"tl": 3980048,
-"mb": 240,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-148,
-149,
-150,
-151,
-152,
-1244,
-1245,
-1246
-]
-},
-{
-"tb": 47040,
-"tbk": 392,
-"tl": 3977,
-"mb": 192,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-1247,
-941,
-942,
-943,
-1248,
-1249
-]
-},
-{
-"tb": 1334400,
-"tbk": 14352,
-"tl": 12124638,
-"mb": 880,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-148,
-1250,
-1251,
-1252,
-1253,
-1254,
-1255,
-1256,
-1257,
-1106
-]
-},
-{
-"tb": 232280,
-"tbk": 5807,
-"tl": 35626426,
-"mb": 240,
-"mbk": 6,
-"gb": 120,
-"gbk": 3,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-26,
-27,
-1206,
-1207,
-1208,
-1258,
-1259
-]
-},
-{
-"tb": 960,
-"tbk": 24,
-"tl": 2692,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-117,
-118,
-118,
-46,
-85
-]
-},
-{
-"tb": 1960,
-"tbk": 1,
-"tl": 64893333,
-"mb": 1960,
-"mbk": 1,
-"gb": 1960,
-"gbk": 1,
-"eb": 1960,
-"ebk": 1,
-"fs": [
-64,
-1130,
-1131,
-1132,
-1133,
-1134,
-1135,
-1260,
-1261,
-1262
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 8075,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-830,
-1263,
-1264,
-7,
-89
-]
-},
-{
-"tb": 640,
-"tbk": 16,
-"tl": 17185,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-1265,
-1266,
-1267,
-7,
-89
-]
-},
-{
-"tb": 2352,
-"tbk": 21,
-"tl": 1352359,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1029,
-1268,
-629,
-630,
-631
-]
-},
-{
-"tb": 23392,
-"tbk": 34,
-"tl": 26152,
-"mb": 2064,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-189,
-190,
-1269,
-1270,
-636,
-637
-]
-},
-{
-"tb": 448,
-"tbk": 4,
-"tl": 276774,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-944,
-666,
-667,
-833,
-669
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 817,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-39,
-40,
-306,
-42,
-40
-]
-},
-{
-"tb": 39424,
-"tbk": 224,
-"tl": 58090,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-100,
-1271,
-102,
-103,
-426
-]
-},
-{
-"tb": 48,
-"tbk": 1,
-"tl": 64597780,
-"mb": 48,
-"mbk": 1,
-"gb": 48,
-"gbk": 1,
-"eb": 48,
-"ebk": 1,
-"fs": [
-1,
-1011,
-1012,
-389,
-390,
-391,
-23,
-24,
-25
-]
-},
-{
-"tb": 12960,
-"tbk": 1504,
-"tl": 1468761,
-"mb": 162,
-"mbk": 18,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-638,
-639,
-640,
-641,
-642,
-643,
-644,
-645,
-646,
-647,
-115,
-116,
-111,
-112,
-113,
-114,
-1053,
-1054,
-1055,
-1056
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5058,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1272,
-1030,
-1031,
-7,
-132
-]
-},
-{
-"tb": 112,
-"tbk": 2,
-"tl": 92,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-658,
-659,
-660,
-660,
-661,
-662,
-663
-]
-},
-{
-"tb": 1944,
-"tbk": 27,
-"tl": 15543,
-"mb": 144,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1273,
-1274,
-1275,
-1276,
-1277,
-1278,
-1279,
-1280,
-1281
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5332,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-711,
-440,
-441,
-7,
-8
-]
-},
-{
-"tb": 3584,
-"tbk": 32,
-"tl": 21633,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1282,
-840,
-841,
-7,
-968
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 4659,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-330,
-5,
-6,
-7,
-913
-]
-},
-{
-"tb": 1012,
-"tbk": 209,
-"tl": 255773,
-"mb": 70,
-"mbk": 14,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-703,
-1283,
-1284
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 889,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-573,
-574,
-42,
-40,
-42,
-40
-]
-},
-{
-"tb": 41400,
-"tbk": 8280,
-"tl": 27055156,
-"mb": 30,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-1285
-]
-},
-{
-"tb": 208,
-"tbk": 40,
-"tl": 683557,
-"mb": 120,
-"mbk": 16,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-703,
-1283,
-1286
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 3599,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-1265,
-1266,
-1267,
-7,
-1287
-]
-},
-{
-"tb": 2224,
-"tbk": 95,
-"tl": 5740221212,
-"mb": 2160,
-"mbk": 91,
-"gb": 2160,
-"gbk": 91,
-"eb": 2160,
-"ebk": 91,
-"fs": [
-204,
-205,
-692,
-693,
-694,
-1288,
-1289
-]
-},
-{
-"tb": 1056,
-"tbk": 6,
-"tl": 1622,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-1290,
-1291,
-1292,
-1293,
-461
-]
-},
-{
-"tb": 560,
-"tbk": 7,
-"tl": 885,
-"mb": 80,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1052,
-84,
-118,
-118,
-46,
-46
-]
-},
-{
-"tb": 547840,
-"tbk": 984,
-"tl": 73564,
-"mb": 16384,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1294,
-1295,
-1296,
-1297,
-1298
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5178,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-4,
-5,
-6,
-7,
-1299
-]
-},
-{
-"tb": 1232,
-"tbk": 7,
-"tl": 1554,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-252,
-342,
-343,
-344,
-1300
-]
-},
-{
-"tb": 3808,
-"tbk": 34,
-"tl": 1920341,
-"mb": 336,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-711,
-1122,
-1123,
-1124,
-1125
-]
-},
-{
-"tb": 4480,
-"tbk": 20,
-"tl": 53258,
-"mb": 448,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-1301,
-1302,
-1303,
-862,
-863,
-864,
-215
-]
-},
-{
-"tb": 144,
-"tbk": 6,
-"tl": 1595,
-"mb": 24,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-494,
-495,
-496,
-497,
-1304,
-1305,
-1306
-]
-},
-{
-"tb": 32,
-"tbk": 2,
-"tl": 25,
-"mb": 16,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1307,
-1308,
-1309,
-1310,
-1311,
-1312,
-367
-]
-},
-{
-"tb": 15232,
-"tbk": 136,
-"tl": 67752,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-439,
-440,
-441,
-7,
-56
-]
-},
-{
-"tb": 6272,
-"tbk": 56,
-"tl": 37448,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1029,
-1030,
-1031,
-7,
-56
-]
-},
-{
-"tb": 5501940,
-"tbk": 4815,
-"tl": 4363621,
-"mb": 3428,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-1313,
-1314,
-1315,
-1316
-]
-},
-{
-"tb": 448,
-"tbk": 8,
-"tl": 14,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-83,
-84,
-443,
-45,
-46,
-85
-]
-},
-{
-"tb": 96,
-"tbk": 1,
-"tl": 103,
-"mb": 96,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1317,
-1318,
-1319,
-1320,
-1321,
-1322,
-1323,
-1324,
-1325
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 237,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-26,
-27,
-1326,
-1327,
-669,
-1328,
-1329
-]
-},
-{
-"tb": 71680,
-"tbk": 320,
-"tl": 100938,
-"mb": 224,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1165,
-1330,
-1331,
-1332,
-1333,
-1334,
-1335,
-1336,
-1337,
-1338
-]
-},
-{
-"tb": 880,
-"tbk": 22,
-"tl": 2267,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1339,
-1340,
-46,
-46,
-47,
-403
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6429,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-808,
-144,
-145,
-7,
-89
-]
-},
-{
-"tb": 12096,
-"tbk": 168,
-"tl": 200764,
-"mb": 144,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-1341,
-1342,
-124,
-125,
-126
-]
-},
-{
-"tb": 6272,
-"tbk": 196,
-"tl": 12682595603,
-"mb": 6272,
-"mbk": 196,
-"gb": 6272,
-"gbk": 196,
-"eb": 6272,
-"ebk": 196,
-"fs": [
-204,
-205,
-1343,
-1344,
-1345,
-1346,
-1347
-]
-},
-{
-"tb": 12080,
-"tbk": 200,
-"tl": 25652,
-"mb": 1116,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-239,
-1348,
-1349,
-1350,
-1351,
-1352,
-1353,
-1354
-]
-},
-{
-"tb": 175616,
-"tbk": 196,
-"tl": 239678,
-"mb": 896,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1175,
-1176,
-1177,
-1355,
-215
-]
-},
-{
-"tb": 28800,
-"tbk": 400,
-"tl": 5109,
-"mb": 72,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-297,
-298,
-299,
-1356,
-1357,
-1358
-]
-},
-{
-"tb": 5952,
-"tbk": 93,
-"tl": 2063,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-953,
-954,
-955,
-956,
-957,
-1359
-]
-},
-{
-"tb": 4096,
-"tbk": 128,
-"tl": 400,
-"mb": 32,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1360,
-1361,
-1362,
-1363,
-1364,
-1365,
-1366,
-1367,
-1368
-]
-},
-{
-"tb": 218824,
-"tbk": 1609,
-"tl": 587300,
-"mb": 136,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1369,
-1370,
-1371,
-636,
-1372,
-1373
-]
-},
-{
-"tb": 6272,
-"tbk": 56,
-"tl": 22937,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-330,
-5,
-6,
-7,
-167
-]
-},
-{
-"tb": 8280,
-"tbk": 2472,
-"tl": 2421872,
-"mb": 75,
-"mbk": 21,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-638,
-639,
-640,
-641,
-642,
-643,
-644,
-645,
-646,
-647,
-648,
-116,
-111,
-112,
-113,
-114,
-1053,
-1054,
-1055,
-1056
-]
-},
-{
-"tb": 504,
-"tbk": 168,
-"tl": 594774,
-"mb": 6,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-412,
-413,
-414,
-1374
-]
-},
-{
-"tb": 2262960,
-"tbk": 56574,
-"tl": 115446,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-379,
-380,
-381,
-382,
-1375,
-1376,
-1377,
-1378
-]
-},
-{
-"tb": 5365440,
-"tbk": 8280,
-"tl": 3020217,
-"mb": 3888,
-"mbk": 6,
-"gb": 1296,
-"gbk": 2,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1379,
-1380,
-1381,
-1382,
-193,
-194
-]
-},
-{
-"tb": 128992,
-"tbk": 292,
-"tl": 262452,
-"mb": 2616,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-1383,
-1384,
-1385,
-1386
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 9055,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-283,
-840,
-841,
-7,
-146
-]
-},
-{
-"tb": 158976,
-"tbk": 316,
-"tl": 11905369170,
-"mb": 88320,
-"mbk": 184,
-"gb": 88320,
-"gbk": 184,
-"eb": 88320,
-"ebk": 184,
-"fs": [
-204,
-205,
-575,
-576,
-577,
-578,
-1387
-]
-},
-{
-"tb": 928,
-"tbk": 1,
-"tl": 327,
-"mb": 928,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1388,
-1389,
-1390,
-1391,
-1292
-]
-},
-{
-"tb": 448,
-"tbk": 4,
-"tl": 276738,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-665,
-666,
-667,
-833,
-669
-]
-},
-{
-"tb": 960,
-"tbk": 24,
-"tl": 2627,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-372,
-1392,
-1393,
-375,
-376,
-377
-]
-},
-{
-"tb": 2160,
-"tbk": 196,
-"tl": 10776159,
-"mb": 540,
-"mbk": 49,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-1394,
-1395,
-1396,
-1397,
-1398
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 6055,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-129,
-130,
-131,
-7,
-1399
-]
-},
-{
-"tb": 896,
-"tbk": 4,
-"tl": 88575,
-"mb": 224,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-1301,
-1302,
-1400,
-862,
-863,
-928,
-743
-]
-},
-{
-"tb": 55436,
-"tbk": 371,
-"tl": 326628,
-"mb": 724,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-1401,
-1402,
-1403,
-1404
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6298,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-4,
-5,
-6,
-7,
-1405
-]
-},
-{
-"tb": 19584,
-"tbk": 272,
-"tl": 286218,
-"mb": 216,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-1406,
-1407,
-802,
-1408,
-1102
-]
-},
-{
-"tb": 2288,
-"tbk": 13,
-"tl": 3426,
-"mb": 528,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-341,
-253,
-254,
-255,
-256
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5751,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-490,
-491,
-492,
-7,
-132
-]
-},
-{
-"tb": 1152,
-"tbk": 24,
-"tl": 353527,
-"mb": 288,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-1409,
-1410,
-1411,
-237,
-238,
-932,
-1412
-]
-},
-{
-"tb": 256,
-"tbk": 32,
-"tl": 24322,
-"mb": 32,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-675,
-1413,
-1414,
-1415,
-1416,
-1417,
-1418,
-1419,
-1420,
-1421
-]
-},
-{
-"tb": 867104,
-"tbk": 3871,
-"tl": 201437,
-"mb": 224,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-427,
-1422,
-1423,
-1424,
-1425,
-1426,
-1427,
-1428,
-1429,
-1430
-]
-},
-{
-"tb": 657116,
-"tbk": 586,
-"tl": 54115,
-"mb": 5624,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-1431,
-1432,
-1433,
-1434
-]
-},
-{
-"tb": 6048,
-"tbk": 54,
-"tl": 5812,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-143,
-144,
-303,
-304,
-908
-]
-},
-{
-"tb": 27,
-"tbk": 2,
-"tl": 3,
-"mb": 18,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-1394,
-1395,
-1396,
-1435,
-1224
-]
-},
-{
-"tb": 22080,
-"tbk": 552,
-"tl": 942,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-379,
-380,
-381,
-382,
-383,
-529,
-530,
-747
-]
-},
-{
-"tb": 561750,
-"tbk": 4815,
-"tl": 45108,
-"mb": 200,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-168,
-169,
-170,
-171,
-585,
-586,
-587,
-588,
-589,
-590,
-591,
-592,
-593,
-594,
-1436,
-452,
-596
-]
-},
-{
-"tb": 704,
-"tbk": 4,
-"tl": 33,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-912,
-1437,
-708,
-709,
-710
-]
-},
-{
-"tb": 8272,
-"tbk": 47,
-"tl": 10112,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-912,
-755,
-1438,
-709,
-710
-]
-},
-{
-"tb": 200,
-"tbk": 40,
-"tl": 142392,
-"mb": 10,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-1439
-]
-},
-{
-"tb": 71760,
-"tbk": 1794,
-"tl": 8238,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1440,
-1441,
-1442,
-1443,
-1444,
-1445,
-1446
-]
-},
-{
-"tb": 3584,
-"tbk": 65,
-"tl": 4496,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1447,
-1448,
-1449,
-1450,
-1451,
-1452,
-1453,
-1454,
-1455
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 831,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-1456,
-46,
-46,
-47,
-403
-]
-},
-{
-"tb": 38400,
-"tbk": 400,
-"tl": 25219,
-"mb": 96,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-211,
-1226,
-1227,
-1457,
-1458,
-1459,
-1460,
-869
-]
-},
-{
-"tb": 4032,
-"tbk": 104,
-"tl": 6728371732,
-"mb": 4032,
-"mbk": 104,
-"gb": 4032,
-"gbk": 104,
-"eb": 4032,
-"ebk": 104,
-"fs": [
-9,
-675,
-1413,
-1414,
-1415,
-1461,
-1462,
-1463,
-1464,
-869,
-870
-]
-},
-{
-"tb": 50304,
-"tbk": 1568,
-"tl": 11038,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-1465,
-1466,
-1467,
-1468,
-1469,
-1470,
-1471,
-1472,
-1473
-]
-},
-{
-"tb": 1168,
-"tbk": 584,
-"tl": 2678945,
-"mb": 6,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-1474
-]
-},
-{
-"tb": 928,
-"tbk": 232,
-"tl": 799925,
-"mb": 12,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-1475,
-1476
-]
-},
-{
-"tb": 2688,
-"tbk": 384,
-"tl": 1386748,
-"mb": 21,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-1475,
-1477
-]
-},
-{
-"tb": 14336,
-"tbk": 128,
-"tl": 108726,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-839,
-840,
-841,
-7,
-89
-]
-},
-{
-"tb": 556324,
-"tbk": 1621,
-"tl": 1478906,
-"mb": 1004,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-1478,
-1479,
-1480,
-1481
-]
-},
-{
-"tb": 128,
-"tbk": 2,
-"tl": 51,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-266,
-267,
-1482,
-1483,
-1484,
-1485,
-1484
-]
-},
-{
-"tb": 234240,
-"tbk": 1208,
-"tl": 1051614,
-"mb": 240,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1486,
-1487,
-1488,
-1489,
-1490,
-1491,
-1492,
-1493,
-1494
-]
-},
-{
-"tb": 37632,
-"tbk": 196,
-"tl": 194125,
-"mb": 192,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1495,
-1496,
-1497,
-1498,
-215
-]
-},
-{
-"tb": 37632,
-"tbk": 196,
-"tl": 12682593421,
-"mb": 37632,
-"mbk": 196,
-"gb": 37632,
-"gbk": 196,
-"eb": 37632,
-"ebk": 196,
-"fs": [
-204,
-205,
-1499,
-1500,
-1501,
-1502,
-1347
-]
-},
-{
-"tb": 116808,
-"tbk": 471,
-"tl": 15705,
-"mb": 248,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-537,
-538,
-94,
-95,
-1036,
-1037,
-229
-]
-},
-{
-"tb": 7936,
-"tbk": 62,
-"tl": 3317,
-"mb": 128,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1503,
-936,
-937,
-1504,
-1505,
-1506
-]
-},
-{
-"tb": 620,
-"tbk": 168,
-"tl": 195996,
-"mb": 49,
-"mbk": 12,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-412,
-413,
-611,
-1507
-]
-},
-{
-"tb": 5376,
-"tbk": 48,
-"tl": 24544,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-156,
-157,
-158,
-7,
-1405
-]
-},
-{
-"tb": 179760,
-"tbk": 1605,
-"tl": 265559,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-388,
-1013,
-1014,
-1015,
-421,
-422
-]
-},
-{
-"tb": 29320,
-"tbk": 733,
-"tl": 73823,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-437,
-85,
-46,
-47,
-403
-]
-},
-{
-"tb": 89880,
-"tbk": 1605,
-"tl": 463376,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-555,
-1179,
-419,
-420,
-421,
-422
-]
-},
-{
-"tb": 3696,
-"tbk": 21,
-"tl": 3375,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-1508,
-1509,
-1510,
-1511,
-1512
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 11675,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-711,
-440,
-441,
-7,
-89
-]
-},
-{
-"tb": 144,
-"tbk": 144,
-"tl": 533703,
-"mb": 3,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-412,
-413,
-414,
-1513
-]
-},
-{
-"tb": 110360,
-"tbk": 2759,
-"tl": 3574,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-897,
-898,
-1514,
-1515,
-1516,
-1517,
-1518
-]
-},
-{
-"tb": 137000,
-"tbk": 3425,
-"tl": 5811,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-379,
-380,
-381,
-382,
-383,
-1519,
-1520,
-1521
-]
-},
-{
-"tb": 5760,
-"tbk": 144,
-"tl": 22514,
-"mb": 80,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-539,
-540,
-1522,
-542,
-543,
-1523,
-1524
-]
-},
-{
-"tb": 5936,
-"tbk": 53,
-"tl": 3219002,
-"mb": 336,
-"mbk": 3,
-"gb": 112,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-330,
-1525,
-629,
-630,
-631
-]
-},
-{
-"tb": 513600,
-"tbk": 12840,
-"tl": 44776388,
-"mb": 40,
-"mbk": 1,
-"gb": 40,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-160,
-161,
-162,
-163,
-164,
-1526,
-1527
-]
-},
-{
-"tb": 1440,
-"tbk": 3,
-"tl": 160671,
-"mb": 960,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-842,
-1528,
-1529,
-1530,
-1531,
-1532,
-1533,
-1534,
-1535
-]
-},
-{
-"tb": 39936,
-"tbk": 208,
-"tl": 258,
-"mb": 192,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1495,
-1496,
-1497,
-1536,
-236
-]
-},
-{
-"tb": 4480,
-"tbk": 8,
-"tl": 14366,
-"mb": 896,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-1537,
-1538,
-1539,
-862,
-863,
-864
-]
-},
-{
-"tb": 1116288,
-"tbk": 10686,
-"tl": 46395570,
-"mb": 1728,
-"mbk": 18,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1540,
-1541,
-1542,
-1543,
-1544,
-1545,
-1546,
-1547,
-1548
-]
-},
-{
-"tb": 24640,
-"tbk": 80,
-"tl": 14386,
-"mb": 392,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1165,
-1549,
-1550,
-1551,
-1552,
-1553,
-1554,
-1555,
-1556,
-1557
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6256,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-330,
-5,
-6,
-7,
-195
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5864,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-711,
-440,
-441,
-7,
-230
-]
-},
-{
-"tb": 64,
-"tbk": 1,
-"tl": 38,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-266,
-267,
-1482,
-1483,
-1484,
-1558,
-1484
-]
-},
-{
-"tb": 15792,
-"tbk": 329,
-"tl": 4490,
-"mb": 48,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1559,
-1560,
-227,
-228,
-229,
-605,
-1561
-]
-},
-{
-"tb": 52350592,
-"tbk": 138568,
-"tl": 90926819,
-"mb": 13216,
-"mbk": 38,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-518,
-914,
-915,
-916,
-917,
-1562
-]
-},
-{
-"tb": 89880,
-"tbk": 1605,
-"tl": 362588,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-555,
-1563,
-419,
-420,
-421,
-422
-]
-},
-{
-"tb": 8960,
-"tbk": 80,
-"tl": 47327,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-808,
-144,
-145,
-7,
-56
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 4543,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-1265,
-1266,
-1267,
-7,
-132
-]
-},
-{
-"tb": 44160,
-"tbk": 690,
-"tl": 366302,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1564,
-1565,
-1566,
-1567,
-1568,
-1569
-]
-},
-{
-"tb": 12672,
-"tbk": 132,
-"tl": 4043465,
-"mb": 288,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1570,
-1571,
-1572,
-1573,
-1574
-]
-},
-{
-"tb": 28800,
-"tbk": 400,
-"tl": 2505782,
-"mb": 3600,
-"mbk": 50,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-1575,
-1576,
-1357,
-1358,
-931,
-237,
-238
-]
-},
-{
-"tb": 1120,
-"tbk": 10,
-"tl": 612639,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-944,
-666,
-667,
-668,
-669
-]
-},
-{
-"tb": 37880,
-"tbk": 947,
-"tl": 22395,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-91,
-92,
-93,
-94,
-95,
-1036,
-1037
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 2173,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1577,
-1578,
-1579,
-7,
-56
-]
-},
-{
-"tb": 160,
-"tbk": 4,
-"tl": 4,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1580,
-1581,
-1582,
-1583,
-1584,
-1585,
-1586
-]
-},
-{
-"tb": 79552,
-"tbk": 1243,
-"tl": 1221197,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1587,
-1588,
-1589,
-1590,
-1591,
-1592
-]
-},
-{
-"tb": 1240,
-"tbk": 31,
-"tl": 3200,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-44,
-46,
-46,
-47,
-403
-]
-},
-{
-"tb": 23168,
-"tbk": 362,
-"tl": 387845,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1587,
-1588,
-1589,
-1590,
-1591,
-1593
-]
-},
-{
-"tb": 512,
-"tbk": 8,
-"tl": 26,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1594,
-1595,
-1596,
-881,
-45,
-46,
-46
-]
-},
-{
-"tb": 78760,
-"tbk": 1969,
-"tl": 3465,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-379,
-380,
-381,
-382,
-383,
-1597,
-1598,
-531
-]
-},
-{
-"tb": 376,
-"tbk": 8,
-"tl": 869,
-"mb": 47,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1599,
-1600,
-1601,
-1602,
-1603,
-1604,
-1605,
-1606,
-1607,
-1608,
-1609,
-1610,
-1611
-]
-},
-{
-"tb": 28224,
-"tbk": 392,
-"tl": 8574,
-"mb": 72,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-232,
-233,
-939,
-1612,
-941,
-942,
-943
-]
-},
-{
-"tb": 1309680,
-"tbk": 1605,
-"tl": 213860,
-"mb": 816,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-504,
-1613,
-1614,
-1615,
-1616,
-1617,
-1618,
-1619,
-1620
-]
-},
-{
-"tb": 768,
-"tbk": 8,
-"tl": 710,
-"mb": 96,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1317,
-1621,
-1622,
-1623,
-1624,
-1625,
-1626,
-1627,
-1628
-]
-},
-{
-"tb": 280,
-"tbk": 7,
-"tl": 747,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-723,
-46,
-46,
-47,
-403,
-438
-]
-},
-{
-"tb": 240,
-"tbk": 6,
-"tl": 376064,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-26,
-27,
-1326,
-1629,
-1630,
-833,
-669
-]
-},
-{
-"tb": 288,
-"tbk": 18,
-"tl": 154671,
-"mb": 32,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1631,
-1632,
-1633,
-1634,
-1635
-]
-},
-{
-"tb": 71680,
-"tbk": 320,
-"tl": 6522284,
-"mb": 17920,
-"mbk": 80,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-1636,
-1637,
-1638,
-862,
-863,
-928,
-743
-]
-},
-{
-"tb": 1280,
-"tbk": 32,
-"tl": 24099,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-160,
-161,
-249,
-250,
-251,
-7,
-56
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6912,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1577,
-1578,
-1579,
-7,
-1639
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 8612,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-944,
-945,
-946,
-7,
-1399
-]
-},
-{
-"tb": 334208,
-"tbk": 452,
-"tl": 1076,
-"mb": 2464,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-1640,
-1641,
-1642,
-1643,
-1644,
-1645
-]
-},
-{
-"tb": 424,
-"tbk": 112,
-"tl": 1932759,
-"mb": 88,
-"mbk": 8,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-703,
-704,
-1646
-]
-},
-{
-"tb": 640,
-"tbk": 16,
-"tl": 11863,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-160,
-161,
-249,
-250,
-251,
-7,
-8
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 1928,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1282,
-840,
-841,
-7,
-1647
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 845,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-44,
-443,
-46,
-85,
-85
-]
-},
-{
-"tb": 15680,
-"tbk": 392,
-"tl": 12682588891,
-"mb": 12544,
-"mbk": 196,
-"gb": 12544,
-"gbk": 196,
-"eb": 12544,
-"ebk": 196,
-"fs": [
-211,
-1648,
-1347,
-1229,
-1230,
-869,
-870
-]
-},
-{
-"tb": 80250,
-"tbk": 1605,
-"tl": 41532,
-"mb": 50,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1649,
-1650,
-1651,
-1652,
-1653,
-1654,
-1655,
-1656,
-1657,
-1658,
-1659,
-1660,
-1661,
-1662,
-1436,
-452,
-596
-]
-},
-{
-"tb": 43616,
-"tbk": 45,
-"tl": 12407,
-"mb": 1856,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1388,
-1389,
-1390,
-1663,
-1664
-]
-},
-{
-"tb": 5376,
-"tbk": 48,
-"tl": 15341,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1665,
-1666,
-1667,
-7,
-56
-]
-},
-{
-"tb": 6080,
-"tbk": 152,
-"tl": 424061,
-"mb": 80,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-1201,
-1202,
-1203,
-1668,
-1669
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 7998,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1160,
-1263,
-1264,
-7,
-89
-]
-},
-{
-"tb": 50,
-"tbk": 1,
-"tl": 30,
-"mb": 50,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-638,
-639,
-640,
-641,
-642,
-643,
-644,
-645,
-646,
-1670,
-1671
-]
-},
-{
-"tb": 24,
-"tbk": 3,
-"tl": 5383,
-"mb": 8,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-518,
-519,
-767,
-768,
-1672,
-770
-]
-},
-{
-"tb": 561750,
-"tbk": 4815,
-"tl": 19032,
-"mb": 200,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-168,
-169,
-170,
-171,
-585,
-586,
-587,
-588,
-589,
-590,
-591,
-592,
-593,
-594,
-1673,
-452,
-596
-]
-},
-{
-"tb": 14496,
-"tbk": 151,
-"tl": 4459897,
-"mb": 384,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1570,
-1571,
-1572,
-1573,
-1674
-]
-},
-{
-"tb": 29568,
-"tbk": 264,
-"tl": 190421,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1282,
-840,
-841,
-7,
-56
-]
-},
-{
-"tb": 913988,
-"tbk": 1605,
-"tl": 3294120,
-"mb": 1112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1675,
-1676,
-1677,
-1678,
-1679,
-1680,
-1681
-]
-},
-{
-"tb": 176,
-"tbk": 1,
-"tl": 93,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-1682,
-935,
-936,
-937,
-938
-]
-},
-{
-"tb": 76800,
-"tbk": 400,
-"tl": 2474756,
-"mb": 9600,
-"mbk": 50,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1495,
-1496,
-1497,
-1683,
-236
-]
-},
-{
-"tb": 4288,
-"tbk": 196,
-"tl": 3771,
-"mb": 80,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-239,
-1684,
-1685,
-1686,
-1687,
-1688,
-1689,
-1690,
-1691
-]
-},
-{
-"tb": 154576,
-"tbk": 1605,
-"tl": 59342851,
-"mb": 268,
-"mbk": 1,
-"gb": 213,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1599,
-1600,
-1601,
-1602,
-1603,
-1604,
-1605,
-1606,
-1607,
-1608,
-1609,
-1610,
-1692
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 9512,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-627,
-370,
-371,
-7,
-56
-]
-},
-{
-"tb": 22704,
-"tbk": 258,
-"tl": 5570,
-"mb": 88,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1693,
-1694,
-603,
-604,
-229,
-605,
-1561
-]
-},
-{
-"tb": 12096,
-"tbk": 168,
-"tl": 182753,
-"mb": 144,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-1695,
-1696,
-350,
-1697,
-1698
-]
-},
-{
-"tb": 40,
-"tbk": 1,
-"tl": 110,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1699,
-1700,
-1701,
-1702,
-1703,
-461,
-1704
-]
-},
-{
-"tb": 176,
-"tbk": 1,
-"tl": 85,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-1705,
-935,
-936,
-937,
-938
-]
-},
-{
-"tb": 544,
-"tbk": 1,
-"tl": 50,
-"mb": 544,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-168,
-1706,
-1707,
-1708,
-1709,
-1710,
-1711,
-1712,
-1713,
-1714,
-1715,
-1716
-]
-},
-{
-"tb": 3168,
-"tbk": 18,
-"tl": 3473,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-341,
-1717,
-1718,
-1719,
-1720
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 872,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-573,
-574,
-1721,
-1722,
-1723,
-1724
-]
-},
-{
-"tb": 331776,
-"tbk": 3448,
-"tl": 2167838,
-"mb": 672,
-"mbk": 5,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-891,
-892,
-893,
-1725,
-1726
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 829,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-39,
-40,
-443,
-118,
-46
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 10520,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1029,
-1030,
-1031,
-7,
-968
-]
-},
-{
-"tb": 224,
-"tbk": 2,
-"tl": 102278,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1665,
-1727,
-1728,
-669,
-1328
-]
-},
-{
-"tb": 2352,
-"tbk": 21,
-"tl": 1352163,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1272,
-1268,
-629,
-630,
-631
-]
-},
-{
-"tb": 17792,
-"tbk": 278,
-"tl": 68912,
-"mb": 256,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1594,
-1595,
-1729,
-542,
-543,
-316,
-317
-]
-},
-{
-"tb": 154464,
-"tbk": 1609,
-"tl": 637464,
-"mb": 96,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-871,
-1730,
-1731,
-636,
-637,
-1732
-]
-},
-{
-"tb": 1366016,
-"tbk": 3712,
-"tl": 2552833,
-"mb": 4048,
-"mbk": 11,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-58,
-59,
-60,
-61,
-62,
-1733
-]
-},
-{
-"tb": 122880,
-"tbk": 1512,
-"tl": 833954,
-"mb": 256,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1734,
-1735,
-1736,
-1737,
-1738,
-1739,
-1740,
-981
-]
-},
-{
-"tb": 340360,
-"tbk": 8509,
-"tl": 1759044,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-1741,
-1742,
-1743,
-1744,
-1745
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 11462,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1029,
-1030,
-1031,
-7,
-1639
-]
-},
-{
-"tb": 960,
-"tbk": 24,
-"tl": 659,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-539,
-540,
-880,
-881,
-46,
-85,
-85
-]
-},
-{
-"tb": 89880,
-"tbk": 1605,
-"tl": 397280,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-555,
-1217,
-1014,
-1015,
-421,
-422
-]
-},
-{
-"tb": 14336,
-"tbk": 128,
-"tl": 81414,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-265,
-157,
-158,
-7,
-968
-]
-},
-{
-"tb": 596160,
-"tbk": 8280,
-"tl": 8308183,
-"mb": 432,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-1746,
-800,
-126,
-801,
-802
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 859,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-39,
-40,
-42,
-40,
-46
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 14053,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-4,
-5,
-6,
-7,
-331
-]
-},
-{
-"tb": 240,
-"tbk": 1,
-"tl": 64599125,
-"mb": 240,
-"mbk": 1,
-"gb": 240,
-"gbk": 1,
-"eb": 240,
-"ebk": 1,
-"fs": [
-1,
-1747,
-1748,
-23,
-24,
-25,
-1033,
-1749,
-1750,
-1751
-]
-},
-{
-"tb": 1232,
-"tbk": 7,
-"tl": 1496,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-341,
-342,
-343,
-344,
-1300
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 738,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-1456,
-46,
-85,
-85,
-46
-]
-},
-{
-"tb": 46456,
-"tbk": 3871,
-"tl": 22842961,
-"mb": 48,
-"mbk": 2,
-"gb": 24,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-789,
-1752,
-1753,
-1754,
-1755,
-1756,
-1757,
-1758,
-1759
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 12037,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1282,
-840,
-841,
-7,
-331
-]
-},
-{
-"tb": 70000,
-"tbk": 1750,
-"tl": 2739,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1760,
-1761,
-1762,
-1763,
-1764,
-1765,
-1446
-]
-},
-{
-"tb": 12840,
-"tbk": 321,
-"tl": 942,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1580,
-1581,
-1582,
-1766,
-1767,
-1768,
-1769
-]
-},
-{
-"tb": 3584,
-"tbk": 16,
-"tl": 3260,
-"mb": 224,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1165,
-1549,
-1550,
-1551,
-1552,
-1553,
-1554,
-1555,
-1556,
-1770
-]
-},
-{
-"tb": 729344,
-"tbk": 6512,
-"tl": 747432,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-143,
-144,
-303,
-304,
-445
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 13069,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1282,
-840,
-841,
-7,
-132
-]
-},
-{
-"tb": 17520,
-"tbk": 438,
-"tl": 2309,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1771,
-1772,
-1773,
-1774,
-1775,
-1776,
-1777
-]
-},
-{
-"tb": 3136,
-"tbk": 400,
-"tl": 25882357127,
-"mb": 3136,
-"mbk": 400,
-"gb": 3136,
-"gbk": 400,
-"eb": 3136,
-"ebk": 400,
-"fs": [
-9,
-239,
-240,
-241,
-242,
-865,
-866,
-867,
-1778,
-1779,
-869
-]
-},
-{
-"tb": 10368,
-"tbk": 144,
-"tl": 160746,
-"mb": 216,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-1780,
-1781,
-1698,
-1782,
-1783
-]
-},
-{
-"tb": 6688,
-"tbk": 38,
-"tl": 4444,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-1784,
-1785,
-1786,
-1787,
-1512
-]
-},
-{
-"tb": 18816,
-"tbk": 44,
-"tl": 776811408,
-"mb": 9984,
-"mbk": 12,
-"gb": 9984,
-"gbk": 12,
-"eb": 9984,
-"ebk": 12,
-"fs": [
-204,
-205,
-575,
-576,
-577,
-578,
-1788
-]
-},
-{
-"tb": 16560,
-"tbk": 8280,
-"tl": 28773373,
-"mb": 12,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-412,
-413,
-414,
-1789
-]
-},
-{
-"tb": 760,
-"tbk": 19,
-"tl": 1329473,
-"mb": 80,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-129,
-1790,
-1791,
-1792,
-669
-]
-},
-{
-"tb": 1942848,
-"tbk": 26984,
-"tl": 26347462,
-"mb": 1152,
-"mbk": 16,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1793,
-1794,
-1795,
-1796,
-1797,
-1798,
-1799,
-1800
-]
-},
-{
-"tb": 440,
-"tbk": 88,
-"tl": 353466,
-"mb": 10,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-1801
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 780,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-39,
-40,
-1802,
-306,
-46
-]
-},
-{
-"tb": 336,
-"tbk": 3,
-"tl": 216438,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-501,
-721,
-722,
-668,
-669
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 8514,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-369,
-370,
-371,
-7,
-442
-]
-},
-{
-"tb": 47040,
-"tbk": 392,
-"tl": 3603,
-"mb": 192,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-1247,
-941,
-942,
-943,
-1248,
-1803
-]
-},
-{
-"tb": 12800,
-"tbk": 200,
-"tl": 67756,
-"mb": 512,
-"mbk": 8,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-953,
-954,
-955,
-956,
-957,
-1804
-]
-},
-{
-"tb": 112,
-"tbk": 1,
-"tl": 36078,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-665,
-666,
-667,
-1224,
-1225
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 7863,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-257,
-258,
-259,
-7,
-8
-]
-},
-{
-"tb": 48,
-"tbk": 1,
-"tl": 64598432,
-"mb": 48,
-"mbk": 1,
-"gb": 48,
-"gbk": 1,
-"eb": 48,
-"ebk": 1,
-"fs": [
-1,
-416,
-417,
-1563,
-741,
-742,
-23,
-24,
-25
-]
-},
-{
-"tb": 76560,
-"tbk": 435,
-"tl": 156609,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-912,
-1126,
-1127,
-1128,
-1129
-]
-},
-{
-"tb": 5376,
-"tbk": 48,
-"tl": 25007,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-265,
-157,
-158,
-7,
-1405
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 16694,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-86,
-87,
-88,
-7,
-331
-]
-},
-{
-"tb": 960,
-"tbk": 24,
-"tl": 2616,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-392,
-393,
-45,
-46,
-85,
-85
-]
-},
-{
-"tb": 64,
-"tbk": 1,
-"tl": 289,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-266,
-267,
-1805,
-1664,
-1806,
-1807,
-1808
-]
-},
-{
-"tb": 234240,
-"tbk": 1208,
-"tl": 602223,
-"mb": 240,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1486,
-1809,
-1810,
-1811,
-1812,
-1813,
-1814,
-1815,
-1816,
-1817
-]
-},
-{
-"tb": 25088,
-"tbk": 224,
-"tl": 119620,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-330,
-5,
-6,
-7,
-56
-]
-},
-{
-"tb": 4608,
-"tbk": 64,
-"tl": 83877,
-"mb": 216,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-1818,
-1819,
-1783,
-1820,
-124
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 829,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-392,
-393,
-42,
-40,
-46,
-85
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6221,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-330,
-5,
-6,
-7,
-1405
-]
-},
-{
-"tb": 176,
-"tbk": 1,
-"tl": 277,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-912,
-1821,
-1822,
-1823,
-1824
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 878,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-573,
-574,
-670,
-46,
-85,
-46
-]
-},
-{
-"tb": 17520,
-"tbk": 438,
-"tl": 203747,
-"mb": 80,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1699,
-1700,
-1825,
-1826,
-1664,
-1806,
-461
-]
-},
-{
-"tb": 2688,
-"tbk": 7,
-"tl": 454462,
-"mb": 384,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-784,
-1827,
-1828,
-1829,
-1830,
-1831
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 10365,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1272,
-1030,
-1031,
-7,
-968
-]
-},
-{
-"tb": 16192,
-"tbk": 112,
-"tl": 62118,
-"mb": 512,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1832,
-1833,
-1834,
-636,
-637,
-1732
-]
-},
-{
-"tb": 1202304,
-"tbk": 3099,
-"tl": 48496,
-"mb": 768,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1835,
-1836,
-1837,
-1838,
-1839,
-1840,
-1841,
-1842,
-1843,
-1844
-]
-},
-{
-"tb": 4320,
-"tbk": 18,
-"tl": 17163,
-"mb": 720,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-816,
-817,
-1845,
-1846,
-636,
-637
-]
-},
-{
-"tb": 727320,
-"tbk": 6270,
-"tl": 33920383,
-"mb": 232,
-"mbk": 2,
-"gb": 232,
-"gbk": 2,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-1847,
-1848,
-1849,
-1850
-]
-},
-{
-"tb": 560,
-"tbk": 14,
-"tl": 200,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-313,
-314,
-402,
-46,
-85,
-46,
-47
-]
-},
-{
-"tb": 3640,
-"tbk": 13,
-"tl": 12554,
-"mb": 840,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1851,
-1852,
-1853,
-1854,
-636,
-637
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 889,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-723,
-45,
-46,
-85,
-85,
-46
-]
-},
-{
-"tb": 960,
-"tbk": 24,
-"tl": 8012,
-"mb": 80,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-160,
-161,
-249,
-250,
-251,
-7,
-1855
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 205,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-539,
-540,
-880,
-881,
-45,
-45,
-46
-]
-},
-{
-"tb": 320,
-"tbk": 5,
-"tl": 110587,
-"mb": 128,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-266,
-267,
-268,
-1856,
-1857,
-1304,
-1304
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 796,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-691,
-119,
-119,
-46,
-46
-]
-},
-{
-"tb": 493248,
-"tbk": 4404,
-"tl": 919702,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-4,
-5,
-982,
-1858,
-1859
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6756,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-830,
-1263,
-1264,
-7,
-167
-]
-},
-{
-"tb": 387,
-"tbk": 100,
-"tl": 116743,
-"mb": 28,
-"mbk": 7,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-703,
-704,
-1860
-]
-},
-{
-"tb": 195936,
-"tbk": 1985,
-"tl": 33039,
-"mb": 192,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-734,
-735,
-736,
-737,
-1861
-]
-},
-{
-"tb": 352,
-"tbk": 2,
-"tl": 228,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-423,
-1200,
-102,
-103,
-104
-]
-},
-{
-"tb": 400,
-"tbk": 10,
-"tl": 662393,
-"mb": 40,
-"mbk": 1,
-"gb": 40,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-26,
-27,
-1326,
-1629,
-1630,
-668,
-669
-]
-},
-{
-"tb": 640,
-"tbk": 16,
-"tl": 327,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-539,
-540,
-1862,
-881,
-46,
-46,
-47
-]
-},
-{
-"tb": 25088,
-"tbk": 392,
-"tl": 70380,
-"mb": 384,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1594,
-1595,
-1729,
-542,
-543,
-1863,
-1864
-]
-},
-{
-"tb": 1664,
-"tbk": 416,
-"tl": 1598518,
-"mb": 12,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-1865
-]
-},
-{
-"tb": 448,
-"tbk": 8,
-"tl": 14,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-83,
-896,
-118,
-45,
-46,
-46
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 886,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-691,
-118,
-46,
-85,
-46
-]
-},
-{
-"tb": 31944,
-"tbk": 2183,
-"tl": 1684627,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-947,
-948,
-949,
-950,
-1866,
-1867
-]
-},
-{
-"tb": 1280,
-"tbk": 32,
-"tl": 3476,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-39,
-40,
-42,
-40,
-42
-]
-},
-{
-"tb": 576840,
-"tbk": 3135,
-"tl": 204167,
-"mb": 184,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1868,
-1869,
-1870,
-1871,
-1872,
-1873,
-1874,
-1875,
-1876
-]
-},
-{
-"tb": 203813056,
-"tbk": 67757,
-"tl": 1068281,
-"mb": 3008,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1877,
-1878,
-1879,
-1880,
-1881
-]
-},
-{
-"tb": 4480,
-"tbk": 8,
-"tl": 89921,
-"mb": 896,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-1537,
-1538,
-1539,
-862,
-863,
-928
-]
-},
-{
-"tb": 85120,
-"tbk": 760,
-"tl": 463177,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-490,
-491,
-492,
-7,
-56
-]
-},
-{
-"tb": 11904,
-"tbk": 20,
-"tl": 179037,
-"mb": 1536,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-852,
-853,
-854,
-855,
-1882,
-1883
-]
-},
-{
-"tb": 272,
-"tbk": 22,
-"tl": 4305,
-"mb": 28,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1884,
-1885,
-1886,
-1887,
-1888,
-1889,
-1890,
-1891,
-1892
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 11512,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-830,
-1263,
-1264,
-7,
-230
-]
-},
-{
-"tb": 352,
-"tbk": 2,
-"tl": 753,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-457,
-803,
-459,
-460,
-1485
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5629,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-808,
-144,
-145,
-7,
-968
-]
-},
-{
-"tb": 19308,
-"tbk": 1609,
-"tl": 3900,
-"mb": 12,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1139,
-1140,
-1141,
-1142,
-1143,
-1144,
-1145,
-1146,
-1147,
-1148,
-1149,
-1893,
-1894,
-1895
-]
-},
-{
-"tb": 960,
-"tbk": 240,
-"tl": 1416661,
-"mb": 118,
-"mbk": 29,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-712,
-713,
-714,
-1896,
-236,
-237
-]
-},
-{
-"tb": 844712,
-"tbk": 7282,
-"tl": 163361,
-"mb": 116,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-1897,
-1898,
-1899,
-1900
-]
-},
-{
-"tb": 102032,
-"tbk": 911,
-"tl": 602436,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-808,
-144,
-444,
-304,
-305
-]
-},
-{
-"tb": 729344,
-"tbk": 6512,
-"tl": 691891,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-808,
-144,
-303,
-304,
-445
-]
-},
-{
-"tb": 2336,
-"tbk": 584,
-"tl": 2583796,
-"mb": 12,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-1901
-]
-},
-{
-"tb": 5560,
-"tbk": 139,
-"tl": 232,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-379,
-380,
-381,
-382,
-383,
-1902,
-1903,
-1904
-]
-},
-{
-"tb": 85904,
-"tbk": 767,
-"tl": 591956,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-143,
-144,
-807,
-304,
-305
-]
-},
-{
-"tb": 264,
-"tbk": 24,
-"tl": 109903,
-"mb": 11,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-412,
-413,
-414,
-1905
-]
-},
-{
-"tb": 120,
-"tbk": 24,
-"tl": 105331,
-"mb": 5,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-1906
-]
-},
-{
-"tb": 640,
-"tbk": 16,
-"tl": 1689,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-392,
-393,
-41,
-118,
-46,
-85
-]
-},
-{
-"tb": 33440,
-"tbk": 10708,
-"tl": 748847,
-"mb": 40,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1599,
-1600,
-1601,
-1602,
-1603,
-1604,
-1605,
-1606,
-1607,
-1608,
-1609,
-1610,
-1907
-]
-},
-{
-"tb": 1600,
-"tbk": 40,
-"tl": 63,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-379,
-380,
-381,
-382,
-383,
-1908,
-1909,
-386
-]
-},
-{
-"tb": 416,
-"tbk": 8,
-"tl": 801,
-"mb": 52,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1599,
-1600,
-1601,
-1602,
-1603,
-1604,
-1605,
-1606,
-1607,
-1608,
-1609,
-1610,
-1910
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 1041,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-26,
-27,
-28,
-1911,
-740,
-42,
-40
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5101,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-330,
-5,
-6,
-7,
-1299
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 959,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1912,
-1913,
-1914,
-476,
-477,
-377
-]
-},
-{
-"tb": 10795712,
-"tbk": 3589,
-"tl": 20409,
-"mb": 3008,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1915,
-1916,
-1917,
-1918,
-1919
-]
-},
-{
-"tb": 2296,
-"tbk": 41,
-"tl": 112,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-83,
-896,
-46,
-85,
-47,
-403
-]
-},
-{
-"tb": 233024,
-"tbk": 7282,
-"tl": 99659,
-"mb": 32,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1920,
-1921,
-1922,
-1923,
-438
-]
-},
-{
-"tb": 176,
-"tbk": 1,
-"tl": 267,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-457,
-1924,
-1925,
-460,
-461
-]
-},
-{
-"tb": 640,
-"tbk": 16,
-"tl": 1627,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-1456,
-46,
-85,
-46,
-47
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 3555,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-711,
-440,
-441,
-7,
-913
-]
-},
-{
-"tb": 172416,
-"tbk": 2768,
-"tl": 1340393,
-"mb": 288,
-"mbk": 2,
-"gb": 96,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-632,
-633,
-1926,
-1927,
-193,
-194
-]
-},
-{
-"tb": 352,
-"tbk": 2,
-"tl": 708,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-341,
-453,
-454,
-455,
-456
-]
-},
-{
-"tb": 336,
-"tbk": 3,
-"tl": 162684,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-697,
-1928,
-1929,
-700,
-701
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 5940,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-129,
-130,
-131,
-7,
-1930
-]
-},
-{
-"tb": 159408,
-"tbk": 1945,
-"tl": 38471,
-"mb": 336,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1931,
-1932,
-1933,
-1934,
-1935,
-1936,
-1937,
-1938,
-1939
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 773,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-573,
-574,
-443,
-46,
-46,
-47
-]
-},
-{
-"tb": 116688,
-"tbk": 1296,
-"tl": 20368097,
-"mb": 1920,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1540,
-1940,
-1941,
-1942,
-1943,
-1944,
-1945,
-1946,
-1947,
-1948
-]
-},
-{
-"tb": 48,
-"tbk": 1,
-"tl": 64598855,
-"mb": 48,
-"mbk": 1,
-"gb": 48,
-"gbk": 1,
-"eb": 48,
-"ebk": 1,
-"fs": [
-1,
-416,
-417,
-418,
-741,
-742,
-23,
-24,
-25
-]
-},
-{
-"tb": 519360,
-"tbk": 3486,
-"tl": 6957693,
-"mb": 2072,
-"mbk": 14,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1675,
-1676,
-1677,
-1949,
-1950,
-1951,
-1952
-]
-},
-{
-"tb": 1800,
-"tbk": 45,
-"tl": 81,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-897,
-898,
-899,
-900,
-900,
-901,
-1953
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 114,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-539,
-540,
-880,
-881,
-45,
-46,
-46
-]
-},
-{
-"tb": 168192,
-"tbk": 712,
-"tl": 217056,
-"mb": 408,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-1954,
-1955,
-1956
-]
-},
-{
-"tb": 26174340,
-"tbk": 14445,
-"tl": 59584866,
-"mb": 3624,
-"mbk": 2,
-"gb": 1812,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-1957,
-1958,
-1959,
-1960
-]
-},
-{
-"tb": 3584,
-"tbk": 32,
-"tl": 21938,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-283,
-840,
-841,
-7,
-968
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 793,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-573,
-574,
-46,
-46,
-47,
-403
-]
-},
-{
-"tb": 4465224,
-"tbk": 3242,
-"tl": 547745,
-"mb": 6788,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-1961,
-1962,
-1963,
-1964
-]
-},
-{
-"tb": 208576,
-"tbk": 6518,
-"tl": 176565,
-"mb": 32,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1920,
-1921,
-1922,
-1965,
-1966
-]
-},
-{
-"tb": 821760,
-"tbk": 12840,
-"tl": 10910173,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1967,
-1968,
-1969,
-1970,
-1971,
-1972,
-1973,
-1974
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 918,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-392,
-393,
-41,
-46,
-85,
-85
-]
-},
-{
-"tb": 61440,
-"tbk": 1536,
-"tl": 3437,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-379,
-380,
-381,
-382,
-1375,
-1975,
-1976,
-1977
-]
-},
-{
-"tb": 28224,
-"tbk": 392,
-"tl": 2475378,
-"mb": 3528,
-"mbk": 49,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-1978,
-1979,
-1980,
-1981,
-1982,
-717,
-238
-]
-},
-{
-"tb": 90440,
-"tbk": 1615,
-"tl": 4184,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-83,
-84,
-46,
-85,
-47,
-403
-]
-},
-{
-"tb": 15232,
-"tbk": 136,
-"tl": 66477,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-711,
-440,
-441,
-7,
-56
-]
-},
-{
-"tb": 5712,
-"tbk": 51,
-"tl": 6861,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-808,
-144,
-807,
-304,
-908
-]
-},
-{
-"tb": 676512,
-"tbk": 1044,
-"tl": 744245,
-"mb": 3888,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1379,
-1380,
-1983,
-1984,
-636,
-637
-]
-},
-{
-"tb": 38400,
-"tbk": 600,
-"tl": 93269,
-"mb": 384,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1594,
-1595,
-1729,
-542,
-543,
-1523,
-1524
-]
-},
-{
-"tb": 176,
-"tbk": 1,
-"tl": 234,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-1060,
-920,
-921,
-922,
-923
-]
-},
-{
-"tb": 128,
-"tbk": 2,
-"tl": 82,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-266,
-267,
-1482,
-1483,
-1484,
-461,
-1985
-]
-},
-{
-"tb": 5376,
-"tbk": 48,
-"tl": 38157,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-330,
-5,
-6,
-7,
-8
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 2098,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-924,
-1578,
-1579,
-7,
-56
-]
-},
-{
-"tb": 5120,
-"tbk": 216,
-"tl": 12682544683,
-"mb": 3392,
-"mbk": 197,
-"gb": 3136,
-"gbk": 196,
-"eb": 3136,
-"ebk": 196,
-"fs": [
-204,
-205,
-692,
-693,
-694,
-1986,
-1987
-]
-},
-{
-"tb": 672,
-"tbk": 168,
-"tl": 660408,
-"mb": 8,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-1988
-]
-},
-{
-"tb": 320,
-"tbk": 80,
-"tl": 255093,
-"mb": 8,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-1475,
-1989
-]
-},
-{
-"tb": 552,
-"tbk": 3,
-"tl": 894,
-"mb": 368,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-1990,
-1991,
-1992,
-1993,
-1994,
-1995,
-1996,
-1997,
-1998
-]
-},
-{
-"tb": 3584,
-"tbk": 32,
-"tl": 22237,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-839,
-840,
-841,
-7,
-968
-]
-},
-{
-"tb": 512,
-"tbk": 8,
-"tl": 139,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1594,
-1595,
-1596,
-881,
-306,
-41,
-46
-]
-},
-{
-"tb": 163008,
-"tbk": 2264,
-"tl": 624974,
-"mb": 72,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-446,
-447,
-1999,
-2000,
-2001,
-2002,
-2003
-]
-},
-{
-"tb": 448,
-"tbk": 8,
-"tl": 1187,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1165,
-1549,
-1550,
-1551,
-1552,
-1553,
-1554,
-1555,
-1556,
-2004
-]
-},
-{
-"tb": 137456,
-"tbk": 781,
-"tl": 120148,
-"mb": 704,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-423,
-101,
-102,
-103,
-426
-]
-},
-{
-"tb": 95040,
-"tbk": 297,
-"tl": 281653,
-"mb": 1600,
-"mbk": 5,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2005,
-2006,
-2007,
-2008,
-636,
-637
-]
-},
-{
-"tb": 768,
-"tbk": 24,
-"tl": 17095,
-"mb": 128,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-2009,
-2010,
-2011,
-2012,
-2013,
-2014,
-2015
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 811,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-2016,
-443,
-46,
-85,
-46
-]
-},
-{
-"tb": 103242,
-"tbk": 6591,
-"tl": 621689,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2017,
-2018,
-2019,
-2020,
-2021,
-2022
-]
-},
-{
-"tb": 1309680,
-"tbk": 1605,
-"tl": 242792,
-"mb": 816,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1032,
-419,
-420,
-421,
-422,
-2023
-]
-},
-{
-"tb": 64,
-"tbk": 1,
-"tl": 38,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-266,
-267,
-1482,
-1483,
-1484,
-2024,
-2025
-]
-},
-{
-"tb": 1536,
-"tbk": 384,
-"tl": 1453724,
-"mb": 12,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-412,
-413,
-414,
-2026
-]
-},
-{
-"tb": 32928,
-"tbk": 196,
-"tl": 12682631886,
-"mb": 32928,
-"mbk": 196,
-"gb": 32928,
-"gbk": 196,
-"eb": 32928,
-"ebk": 196,
-"fs": [
-211,
-1081,
-1082,
-1083,
-302,
-214,
-215,
-216
-]
-},
-{
-"tb": 51744,
-"tbk": 294,
-"tl": 31442,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-423,
-1200,
-425,
-103,
-426
-]
-},
-{
-"tb": 448,
-"tbk": 8,
-"tl": 26,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-83,
-84,
-45,
-45,
-46,
-46
-]
-},
-{
-"tb": 80,
-"tbk": 80,
-"tl": 303543,
-"mb": 2,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-412,
-413,
-414,
-2027
-]
-},
-{
-"tb": 4640,
-"tbk": 4,
-"tl": 1039,
-"mb": 1856,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1388,
-1389,
-1390,
-2028,
-1703
-]
-},
-{
-"tb": 3287040,
-"tbk": 12840,
-"tl": 1167756,
-"mb": 256,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2029,
-2030,
-2031,
-2032,
-2033,
-2034,
-2035
-]
-},
-{
-"tb": 6282784,
-"tbk": 13624,
-"tl": 2239342,
-"mb": 2552,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-2036,
-2037,
-2038,
-2039
-]
-},
-{
-"tb": 896,
-"tbk": 4,
-"tl": 4755,
-"mb": 224,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-1301,
-1302,
-1400,
-862,
-863,
-864,
-215
-]
-},
-{
-"tb": 234240,
-"tbk": 1208,
-"tl": 2174209,
-"mb": 240,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1486,
-2040,
-2041,
-2042,
-2043,
-2044,
-2045,
-2046
-]
-},
-{
-"tb": 9216,
-"tbk": 168,
-"tl": 68639,
-"mb": 128,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1734,
-2047,
-2048,
-2049,
-1054,
-1055,
-1056,
-2050,
-673,
-674
-]
-},
-{
-"tb": 73504,
-"tbk": 2297,
-"tl": 574866,
-"mb": 32,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-2051,
-2052,
-2053,
-2054,
-2055,
-2056,
-2057
-]
-},
-{
-"tb": 6272,
-"tbk": 56,
-"tl": 33514,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-697,
-888,
-889,
-7,
-56
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 3228,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-265,
-157,
-158,
-7,
-1930
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 10549,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1272,
-1030,
-1031,
-7,
-887
-]
-},
-{
-"tb": 75520,
-"tbk": 424,
-"tl": 68837,
-"mb": 640,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-2058,
-2059,
-2060,
-2061,
-238
-]
-},
-{
-"tb": 1584,
-"tbk": 1584,
-"tl": 5412852,
-"mb": 4,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-412,
-413,
-414,
-2062
-]
-},
-{
-"tb": 333063,
-"tbk": 6436,
-"tl": 83776,
-"mb": 54,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-2063,
-2064,
-2065,
-2066,
-2067,
-2068,
-2069,
-2070,
-2071,
-2072,
-2073,
-1001,
-1002,
-1003,
-2074
-]
-},
-{
-"tb": 8064,
-"tbk": 72,
-"tl": 31827,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-439,
-440,
-441,
-7,
-132
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 4760,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-665,
-945,
-946,
-7,
-8
-]
-},
-{
-"tb": 820512,
-"tbk": 7326,
-"tl": 324809,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-808,
-144,
-303,
-718,
-719
-]
-},
-{
-"tb": 58240,
-"tbk": 1456,
-"tl": 2280,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-379,
-380,
-381,
-382,
-383,
-2075,
-2076,
-386
-]
-},
-{
-"tb": 1098752,
-"tbk": 12840,
-"tl": 481303,
-"mb": 128,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-65,
-66,
-67,
-68,
-2077,
-2078,
-2079,
-2080
-]
-},
-{
-"tb": 2336,
-"tbk": 584,
-"tl": 2553220,
-"mb": 12,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-2081
-]
-},
-{
-"tb": 51744,
-"tbk": 294,
-"tl": 34009,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-100,
-1200,
-425,
-103,
-426
-]
-},
-{
-"tb": 129520,
-"tbk": 3238,
-"tl": 100243,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-539,
-540,
-880,
-881,
-443,
-46,
-85
-]
-},
-{
-"tb": 2240,
-"tbk": 56,
-"tl": 5922,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-392,
-393,
-46,
-46,
-47,
-403
-]
-},
-{
-"tb": 448,
-"tbk": 8,
-"tl": 25,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-83,
-84,
-42,
-40,
-46,
-46
-]
-},
-{
-"tb": 448,
-"tbk": 8,
-"tl": 13,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-83,
-84,
-46,
-85,
-85,
-46
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 862,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1339,
-1340,
-45,
-46,
-85,
-46
-]
-},
-{
-"tb": 640,
-"tbk": 16,
-"tl": 1711,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-1221,
-46,
-85,
-46,
-47
-]
-},
-{
-"tb": 3696,
-"tbk": 21,
-"tl": 3669,
-"mb": 528,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-919,
-1061,
-1062,
-922,
-923
-]
-},
-{
-"tb": 640,
-"tbk": 16,
-"tl": 1516,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-39,
-40,
-46,
-46,
-47
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5003,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1665,
-1666,
-1667,
-7,
-8
-]
-},
-{
-"tb": 40,
-"tbk": 1,
-"tl": 351,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-2082,
-2083,
-2084,
-2085,
-2086,
-584,
-1485
-]
-},
-{
-"tb": 117504,
-"tbk": 455,
-"tl": 3395,
-"mb": 512,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-351,
-2087,
-2088,
-2089,
-2090,
-2091,
-2092,
-2093,
-2094,
-2095
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 7834,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-156,
-157,
-158,
-7,
-167
-]
-},
-{
-"tb": 1909760,
-"tbk": 1688,
-"tl": 52537,
-"mb": 8192,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-2096,
-2097,
-2098,
-2099,
-2100
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 865,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-117,
-1721,
-1722,
-1723,
-1724
-]
-},
-{
-"tb": 198648,
-"tbk": 2759,
-"tl": 5969,
-"mb": 72,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-2101,
-2102,
-2103,
-2104,
-2105,
-2106,
-2107
-]
-},
-{
-"tb": 56,
-"tbk": 1,
-"tl": 64598423,
-"mb": 56,
-"mbk": 1,
-"gb": 56,
-"gbk": 1,
-"eb": 56,
-"ebk": 1,
-"fs": [
-1,
-555,
-1563,
-741,
-742,
-23,
-24,
-25
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5869,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-265,
-157,
-158,
-7,
-442
-]
-},
-{
-"tb": 14112,
-"tbk": 196,
-"tl": 12682633907,
-"mb": 14112,
-"mbk": 196,
-"gb": 14112,
-"gbk": 196,
-"eb": 14112,
-"ebk": 196,
-"fs": [
-211,
-2108,
-2109,
-2110,
-302,
-214,
-215,
-216
-]
-},
-{
-"tb": 16,
-"tbk": 2,
-"tl": 3609,
-"mb": 8,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-518,
-519,
-767,
-768,
-2111,
-770
-]
-},
-{
-"tb": 96,
-"tbk": 1,
-"tl": 25,
-"mb": 96,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1540,
-2112,
-2113,
-2114,
-2115,
-2116,
-2117,
-2118,
-2119
-]
-},
-{
-"tb": 4640,
-"tbk": 5,
-"tl": 920,
-"mb": 928,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1388,
-1389,
-1390,
-2120,
-2121
-]
-},
-{
-"tb": 465856,
-"tbk": 464,
-"tl": 98062,
-"mb": 3712,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1388,
-1389,
-1390,
-2122,
-2123
-]
-},
-{
-"tb": 11264,
-"tbk": 64,
-"tl": 17828,
-"mb": 528,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-1705,
-935,
-936,
-937,
-1504
-]
-},
-{
-"tb": 378560,
-"tbk": 3380,
-"tl": 446428,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-156,
-157,
-2124,
-1745,
-2125
-]
-},
-{
-"tb": 107712,
-"tbk": 1496,
-"tl": 224364,
-"mb": 72,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-446,
-447,
-2126,
-2127,
-2128,
-2129,
-2130
-]
-},
-{
-"tb": 435744,
-"tbk": 801,
-"tl": 2920842,
-"mb": 1088,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-2131,
-2132,
-2133,
-2134,
-2135,
-2136
-]
-},
-{
-"tb": 80250,
-"tbk": 1605,
-"tl": 20877,
-"mb": 50,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-638,
-639,
-640,
-641,
-642,
-643,
-644,
-645,
-646,
-2137,
-1673,
-452,
-596
-]
-},
-{
-"tb": 722088,
-"tbk": 10029,
-"tl": 58018587,
-"mb": 288,
-"mbk": 4,
-"gb": 144,
-"gbk": 2,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-446,
-447,
-2138,
-2139,
-2140,
-2141,
-2142
-]
-},
-{
-"tb": 41280,
-"tbk": 1032,
-"tl": 24608,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-600,
-601,
-602,
-227,
-228,
-229,
-605
-]
-},
-{
-"tb": 24000,
-"tbk": 600,
-"tl": 103709,
-"mb": 240,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-539,
-540,
-541,
-542,
-543,
-1523,
-1524
-]
-},
-{
-"tb": 1008,
-"tbk": 9,
-"tl": 608607,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-830,
-831,
-832,
-668,
-669
-]
-},
-{
-"tb": 560,
-"tbk": 5,
-"tl": 302025,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-702,
-2143,
-926,
-701,
-927
-]
-},
-{
-"tb": 1920,
-"tbk": 48,
-"tl": 2938326,
-"mb": 120,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-326,
-327,
-328,
-329,
-2144,
-2145,
-927
-]
-},
-{
-"tb": 9520,
-"tbk": 170,
-"tl": 23160,
-"mb": 112,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-658,
-659,
-661,
-764,
-1220,
-2146,
-2147
-]
-},
-{
-"tb": 6512,
-"tbk": 37,
-"tl": 2275,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-100,
-806,
-425,
-103,
-104
-]
-},
-{
-"tb": 1536,
-"tbk": 8,
-"tl": 348,
-"mb": 192,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1495,
-1496,
-1497,
-2148,
-237
-]
-},
-{
-"tb": 1392,
-"tbk": 58,
-"tl": 15194,
-"mb": 72,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-494,
-495,
-496,
-497,
-1305,
-1306,
-2149
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 900,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-117,
-45,
-46,
-46,
-47
-]
-},
-{
-"tb": 5760,
-"tbk": 232,
-"tl": 14848,
-"mb": 256,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-692,
-693,
-694,
-2150,
-2151
-]
-},
-{
-"tb": 4752,
-"tbk": 27,
-"tl": 6007,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-252,
-453,
-454,
-455,
-749
-]
-},
-{
-"tb": 70000,
-"tbk": 1750,
-"tl": 2624,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1760,
-1761,
-2152,
-2153,
-1765,
-1446,
-2154
-]
-},
-{
-"tb": 436560,
-"tbk": 1605,
-"tl": 325160,
-"mb": 272,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2155,
-2156,
-2157,
-421,
-422,
-2023
-]
-},
-{
-"tb": 4768,
-"tbk": 4,
-"tl": 258701558,
-"mb": 4768,
-"mbk": 4,
-"gb": 4768,
-"gbk": 4,
-"eb": 4768,
-"ebk": 4,
-"fs": [
-2158,
-2159,
-2160,
-2161,
-2162,
-2163,
-2164,
-2165
-]
-},
-{
-"tb": 2053356,
-"tbk": 131589,
-"tl": 5764154836,
-"mb": 1448,
-"mbk": 93,
-"gb": 1416,
-"gbk": 92,
-"eb": 1256,
-"ebk": 91,
-"fs": [
-204,
-205,
-2166,
-2167,
-2168,
-2169,
-2170,
-2171
-]
-},
-{
-"tb": 4608,
-"tbk": 24,
-"tl": 216453,
-"mb": 576,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1495,
-1496,
-1497,
-2172,
-236
-]
-},
-{
-"tb": 8480,
-"tbk": 1696,
-"tl": 7231689,
-"mb": 25,
-"mbk": 5,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-2173
-]
-},
-{
-"tb": 8160,
-"tbk": 24,
-"tl": 21373,
-"mb": 680,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-2174,
-2175,
-2176
-]
-},
-{
-"tb": 64,
-"tbk": 64,
-"tl": 317086,
-"mb": 3,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-412,
-413,
-414,
-2177
-]
-},
-{
-"tb": 512,
-"tbk": 8,
-"tl": 183,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1594,
-1595,
-1596,
-881,
-41,
-45,
-46
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 807,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-691,
-119,
-443,
-46,
-46
-]
-},
-{
-"tb": 5376,
-"tbk": 48,
-"tl": 28751,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-105,
-106,
-107,
-7,
-230
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 834,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-44,
-443,
-118,
-46,
-46
-]
-},
-{
-"tb": 32,
-"tbk": 1,
-"tl": 397,
-"mb": 32,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-809,
-810,
-811,
-812,
-1304,
-1304,
-1304
-]
-},
-{
-"tb": 48,
-"tbk": 1,
-"tl": 64597907,
-"mb": 48,
-"mbk": 1,
-"gb": 48,
-"gbk": 1,
-"eb": 48,
-"ebk": 1,
-"fs": [
-1,
-1011,
-1012,
-2178,
-390,
-391,
-23,
-24,
-25
-]
-},
-{
-"tb": 768,
-"tbk": 16,
-"tl": 11372,
-"mb": 96,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-2179,
-2180,
-2181,
-2182,
-2183,
-2184,
-2185,
-2186,
-2187,
-2188
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 2002,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-283,
-840,
-841,
-7,
-1647
-]
-},
-{
-"tb": 864,
-"tbk": 16,
-"tl": 72,
-"mb": 54,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1139,
-1140,
-1141,
-1142,
-1143,
-1144,
-1145,
-1146,
-1147,
-1148,
-2189,
-1120,
-2190,
-2191
-]
-},
-{
-"tb": 1217864,
-"tbk": 5569,
-"tl": 52402098,
-"mb": 4096,
-"mbk": 1,
-"gb": 2048,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-168,
-2192,
-2193,
-2194,
-2195,
-2196,
-2197,
-2198,
-2199,
-2200,
-2201,
-2202,
-2203,
-2204,
-2205,
-2206,
-2207,
-2190,
-2208,
-2209
-]
-},
-{
-"tb": 504,
-"tbk": 168,
-"tl": 593228,
-"mb": 6,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-2210
-]
-},
-{
-"tb": 6144,
-"tbk": 32,
-"tl": 9440,
-"mb": 192,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-606,
-607,
-608,
-2211,
-2212
-]
-},
-{
-"tb": 12160,
-"tbk": 304,
-"tl": 1127,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-897,
-898,
-899,
-900,
-901,
-1953,
-1516
-]
-},
-{
-"tb": 288,
-"tbk": 3,
-"tl": 233,
-"mb": 96,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1317,
-2213,
-2214,
-2215,
-2216,
-2217,
-2218,
-2219,
-2220
-]
-},
-{
-"tb": 154248,
-"tbk": 1605,
-"tl": 2955024,
-"mb": 168,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-273,
-2221,
-2222,
-2223,
-2224,
-2225,
-2226,
-2227,
-2228
-]
-},
-{
-"tb": 48,
-"tbk": 1,
-"tl": 64598644,
-"mb": 48,
-"mbk": 1,
-"gb": 48,
-"gbk": 1,
-"eb": 48,
-"ebk": 1,
-"fs": [
-1,
-416,
-417,
-1059,
-741,
-742,
-23,
-24,
-25
-]
-},
-{
-"tb": 1511104,
-"tbk": 26984,
-"tl": 298927,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-2229,
-2230,
-2231,
-2232,
-2233,
-2234,
-2235,
-2236
-]
-},
-{
-"tb": 351072,
-"tbk": 590,
-"tl": 58789,
-"mb": 1152,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-2237,
-2238,
-2239,
-2240,
-2241,
-2242,
-2243,
-2244,
-2245
-]
-},
-{
-"tb": 704,
-"tbk": 4,
-"tl": 1073,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-1290,
-2246,
-2247,
-1293,
-461
-]
-},
-{
-"tb": 17856,
-"tbk": 2232,
-"tl": 1121498,
-"mb": 8,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2248,
-2249,
-2250,
-2251,
-2252,
-2253
-]
-},
-{
-"tb": 1091400,
-"tbk": 1605,
-"tl": 170348,
-"mb": 680,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-504,
-2254,
-2255,
-2256,
-2257,
-2258,
-2259,
-2260,
-2261
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 158,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1165,
-1549,
-1550,
-1551,
-1552,
-1553,
-1554,
-1555,
-1556,
-2262
-]
-},
-{
-"tb": 2784,
-"tbk": 3,
-"tl": 969,
-"mb": 928,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1388,
-1389,
-1390,
-2263,
-1292
-]
-},
-{
-"tb": 1728,
-"tbk": 24,
-"tl": 217265,
-"mb": 216,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-513,
-514,
-515,
-2264,
-236,
-237,
-238
-]
-},
-{
-"tb": 677570,
-"tbk": 135514,
-"tl": 1821598,
-"mb": 8,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2265,
-2266,
-2267,
-2268,
-2269,
-2270
-]
-},
-{
-"tb": 2992,
-"tbk": 17,
-"tl": 552,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-423,
-424,
-102,
-103,
-104
-]
-},
-{
-"tb": 384,
-"tbk": 16,
-"tl": 7403,
-"mb": 24,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-675,
-676,
-677,
-678,
-679,
-680,
-2271,
-2272
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 8745,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-4,
-5,
-6,
-7,
-230
-]
-},
-{
-"tb": 22080,
-"tbk": 552,
-"tl": 875,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-379,
-380,
-381,
-382,
-383,
-1902,
-1903,
-386
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 857,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-1456,
-85,
-42,
-40,
-46
-]
-},
-{
-"tb": 58560,
-"tbk": 915,
-"tl": 521599,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-2273,
-1565,
-1566,
-1567,
-1568,
-1569
-]
-},
-{
-"tb": 57,
-"tbk": 6,
-"tl": 10,
-"mb": 10,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-1394,
-1395,
-1396,
-1435,
-833
-]
-},
-{
-"tb": 11136,
-"tbk": 590,
-"tl": 21825,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-2274,
-2275,
-2276,
-2277,
-2278,
-2279,
-2280,
-2281,
-2282,
-2283
-]
-},
-{
-"tb": 1960,
-"tbk": 1,
-"tl": 64697109,
-"mb": 1960,
-"mbk": 1,
-"gb": 1960,
-"gbk": 1,
-"eb": 1960,
-"ebk": 1,
-"fs": [
-64,
-1130,
-1131,
-1132,
-1133,
-1134,
-1135,
-2284,
-2285,
-2286
-]
-},
-{
-"tb": 151164,
-"tbk": 4199,
-"tl": 25554,
-"mb": 36,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-2287,
-2288,
-2289,
-2290
-]
-},
-{
-"tb": 773136,
-"tbk": 6903,
-"tl": 579115,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-143,
-144,
-807,
-718,
-719
-]
-},
-{
-"tb": 447140,
-"tbk": 1605,
-"tl": 1356616,
-"mb": 536,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-2291,
-2292,
-2293,
-2294
-]
-},
-{
-"tb": 29952,
-"tbk": 416,
-"tl": 478515,
-"mb": 216,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-2295,
-883,
-124,
-125,
-126
-]
-},
-{
-"tb": 22176,
-"tbk": 198,
-"tl": 11484134,
-"mb": 448,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-490,
-2296,
-2297,
-2298,
-2299
-]
-},
-{
-"tb": 334208,
-"tbk": 452,
-"tl": 1301,
-"mb": 2464,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-1640,
-1641,
-1642,
-1643,
-1644,
-2300
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5741,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-105,
-106,
-107,
-7,
-132
-]
-},
-{
-"tb": 156702,
-"tbk": 1609,
-"tl": 61566443,
-"mb": 269,
-"mbk": 1,
-"gb": 214,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1235,
-1236,
-1237,
-1238,
-1239,
-1240,
-1241,
-1242,
-2301,
-452,
-596
-]
-},
-{
-"tb": 1320,
-"tbk": 120,
-"tl": 450173,
-"mb": 22,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-412,
-413,
-414,
-2302
-]
-},
-{
-"tb": 9600,
-"tbk": 200,
-"tl": 2290559,
-"mb": 2400,
-"mbk": 50,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-929,
-930,
-931,
-237,
-238,
-932,
-1412
-]
-},
-{
-"tb": 48,
-"tbk": 1,
-"tl": 64895745,
-"mb": 48,
-"mbk": 1,
-"gb": 48,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-2303,
-2304,
-2305,
-2306,
-2307,
-625,
-626
-]
-},
-{
-"tb": 144384,
-"tbk": 564,
-"tl": 25640,
-"mb": 256,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-2308,
-2309,
-2310,
-2311,
-2312
-]
-},
-{
-"tb": 87808,
-"tbk": 784,
-"tl": 481850,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-265,
-157,
-158,
-7,
-56
-]
-},
-{
-"tb": 8272,
-"tbk": 47,
-"tl": 10525,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-706,
-755,
-1438,
-709,
-710
-]
-},
-{
-"tb": 4048,
-"tbk": 23,
-"tl": 3202,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-423,
-806,
-102,
-103,
-104
-]
-},
-{
-"tb": 6720,
-"tbk": 168,
-"tl": 350,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-379,
-380,
-381,
-382,
-2313,
-2314,
-2315,
-2316
-]
-},
-{
-"tb": 9856,
-"tbk": 88,
-"tl": 52785,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-156,
-157,
-158,
-7,
-8
-]
-},
-{
-"tb": 40,
-"tbk": 1,
-"tl": 64598190,
-"mb": 40,
-"mbk": 1,
-"gb": 40,
-"gbk": 1,
-"eb": 40,
-"ebk": 1,
-"fs": [
-1,
-26,
-27,
-28,
-2317,
-2318,
-2319,
-2320,
-2321
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 13393,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-265,
-157,
-158,
-7,
-464
-]
-},
-{
-"tb": 112,
-"tbk": 1,
-"tl": 56199,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1160,
-831,
-832,
-833,
-669
-]
-},
-{
-"tb": 410880,
-"tbk": 1605,
-"tl": 59507165,
-"mb": 256,
-"mbk": 1,
-"gb": 256,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2029,
-2030,
-2031,
-2322,
-2323,
-2324,
-2325
-]
-},
-{
-"tb": 77040,
-"tbk": 1605,
-"tl": 316639,
-"mb": 48,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-18,
-19,
-463,
-2156,
-2157,
-421,
-422
-]
-},
-{
-"tb": 19584,
-"tbk": 272,
-"tl": 288773,
-"mb": 216,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-2326,
-1407,
-802,
-1408,
-1102
-]
-},
-{
-"tb": 43056,
-"tbk": 1794,
-"tl": 266807,
-"mb": 120,
-"mbk": 5,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-494,
-495,
-496,
-497,
-813,
-814,
-815
-]
-},
-{
-"tb": 1115136,
-"tbk": 12840,
-"tl": 594006,
-"mb": 128,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-65,
-66,
-67,
-68,
-2327,
-2328,
-2329,
-2330
-]
-},
-{
-"tb": 13536,
-"tbk": 188,
-"tl": 9050874,
-"mb": 72,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-446,
-447,
-2126,
-2127,
-2128,
-2331,
-2332
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 784,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-39,
-40,
-45,
-46,
-85
-]
-},
-{
-"tb": 77040,
-"tbk": 1605,
-"tl": 377626,
-"mb": 48,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-416,
-417,
-1563,
-419,
-420,
-421,
-422
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6527,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-501,
-502,
-503,
-7,
-89
-]
-},
-{
-"tb": 166920,
-"tbk": 4173,
-"tl": 7100,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-379,
-380,
-381,
-382,
-383,
-1519,
-2333,
-2334
-]
-},
-{
-"tb": 240,
-"tbk": 6,
-"tl": 376009,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-1265,
-2335,
-1630,
-833,
-669
-]
-},
-{
-"tb": 1508256,
-"tbk": 13122,
-"tl": 645806,
-"mb": 768,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-687,
-688,
-2336,
-2337,
-2338,
-2339
-]
-},
-{
-"tb": 14336,
-"tbk": 128,
-"tl": 80254,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-156,
-157,
-158,
-7,
-968
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 12184,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-283,
-840,
-841,
-7,
-331
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5821,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1272,
-1030,
-1031,
-7,
-1930
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5864,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-265,
-157,
-158,
-7,
-146
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 14538,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-944,
-945,
-946,
-7,
-230
-]
-},
-{
-"tb": 77040,
-"tbk": 1605,
-"tl": 445173,
-"mb": 48,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-416,
-417,
-1059,
-419,
-420,
-421,
-422
-]
-},
-{
-"tb": 207232,
-"tbk": 3238,
-"tl": 83597,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1594,
-1595,
-1596,
-881,
-443,
-46,
-85
-]
-},
-{
-"tb": 665616,
-"tbk": 5943,
-"tl": 1184843,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-265,
-157,
-597,
-1858,
-1859
-]
-},
-{
-"tb": 8176,
-"tbk": 73,
-"tl": 5300498,
-"mb": 336,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-839,
-284,
-285,
-286,
-287
-]
-},
-{
-"tb": 3136,
-"tbk": 8,
-"tl": 2046,
-"mb": 392,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1165,
-1549,
-1550,
-1551,
-1552,
-1553,
-1554,
-1555,
-1556,
-2340
-]
-},
-{
-"tb": 1536,
-"tbk": 384,
-"tl": 1450265,
-"mb": 12,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-2341
-]
-},
-{
-"tb": 52296,
-"tbk": 2671,
-"tl": 3318,
-"mb": 128,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-947,
-948,
-1153,
-1154,
-719,
-2342
-]
-},
-{
-"tb": 56,
-"tbk": 1,
-"tl": 64597171,
-"mb": 56,
-"mbk": 1,
-"gb": 56,
-"gbk": 1,
-"eb": 56,
-"ebk": 1,
-"fs": [
-1,
-462,
-20,
-21,
-22,
-23,
-24,
-25
-]
-},
-{
-"tb": 80450,
-"tbk": 1609,
-"tl": 20644,
-"mb": 50,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-638,
-639,
-640,
-641,
-642,
-643,
-644,
-645,
-646,
-2137,
-595,
-452,
-596
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 3152,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-156,
-157,
-158,
-7,
-1930
-]
-},
-{
-"tb": 179760,
-"tbk": 1605,
-"tl": 330968,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-388,
-2178,
-1014,
-1015,
-421,
-422
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 14906,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-156,
-157,
-158,
-7,
-1639
-]
-},
-{
-"tb": 1480280,
-"tbk": 3218,
-"tl": 1343531,
-"mb": 736,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-902,
-903,
-2343,
-2344,
-636,
-637
-]
-},
-{
-"tb": 15840,
-"tbk": 220,
-"tl": 12932125,
-"mb": 216,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-446,
-447,
-2345,
-2346,
-2347,
-2348,
-2349
-]
-},
-{
-"tb": 160704,
-"tbk": 2232,
-"tl": 830141,
-"mb": 72,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-446,
-447,
-2350,
-2249,
-2250,
-2251,
-2252
-]
-},
-{
-"tb": 42048,
-"tbk": 584,
-"tl": 759545,
-"mb": 216,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-2351,
-1101,
-1102,
-1103,
-1104
-]
-},
-{
-"tb": 44800,
-"tbk": 200,
-"tl": 13887,
-"mb": 448,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-2352,
-2353,
-860,
-861,
-862,
-863,
-928
-]
-},
-{
-"tb": 40,
-"tbk": 1,
-"tl": 64598950,
-"mb": 40,
-"mbk": 1,
-"gb": 40,
-"gbk": 1,
-"eb": 40,
-"ebk": 1,
-"fs": [
-1,
-26,
-27,
-28,
-2354,
-2355,
-2356,
-2357,
-2358
-]
-},
-{
-"tb": 97440,
-"tbk": 435,
-"tl": 7136,
-"mb": 224,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-427,
-2359,
-2360,
-2361,
-2362,
-2363,
-2364,
-2365,
-2366,
-2367
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 8405,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-369,
-370,
-371,
-7,
-1287
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5888,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-439,
-440,
-441,
-7,
-159
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 831,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-44,
-42,
-40,
-41,
-46
-]
-},
-{
-"tb": 8,
-"tbk": 1,
-"tl": 1596,
-"mb": 8,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-518,
-519,
-767,
-768,
-2368,
-770
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 198,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-539,
-540,
-880,
-881,
-45,
-46,
-85
-]
-},
-{
-"tb": 665616,
-"tbk": 5943,
-"tl": 1128829,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-156,
-157,
-597,
-1858,
-1859
-]
-},
-{
-"tb": 6272,
-"tbk": 56,
-"tl": 34009,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-665,
-945,
-946,
-7,
-56
-]
-},
-{
-"tb": 19008,
-"tbk": 94,
-"tl": 2480,
-"mb": 384,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-2369,
-2370,
-2371,
-2372,
-2373,
-2374,
-2375,
-2376,
-2377
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 854,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-117,
-118,
-45,
-46,
-46
-]
-},
-{
-"tb": 960,
-"tbk": 24,
-"tl": 2581,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-44,
-45,
-45,
-46,
-85
-]
-},
-{
-"tb": 414848,
-"tbk": 3704,
-"tl": 2058969,
-"mb": 448,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-808,
-144,
-145,
-7,
-146
-]
-},
-{
-"tb": 10912,
-"tbk": 62,
-"tl": 12424,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-341,
-342,
-2378,
-344,
-1300
-]
-},
-{
-"tb": 83648,
-"tbk": 1307,
-"tl": 1683684,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-2379,
-1212,
-1213,
-1214,
-1215,
-2380
-]
-},
-{
-"tb": 179760,
-"tbk": 1605,
-"tl": 298435,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-388,
-389,
-1014,
-1015,
-421,
-422
-]
-},
-{
-"tb": 31944,
-"tbk": 2183,
-"tl": 3814,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-947,
-948,
-1153,
-2381,
-2332,
-2382
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 858,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1339,
-1340,
-46,
-85,
-85,
-46
-]
-},
-{
-"tb": 3584,
-"tbk": 32,
-"tl": 15912,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-830,
-1263,
-1264,
-7,
-56
-]
-},
-{
-"tb": 256,
-"tbk": 64,
-"tl": 316517,
-"mb": 12,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-2383
-]
-},
-{
-"tb": 960,
-"tbk": 24,
-"tl": 20864,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-1265,
-1266,
-1267,
-7,
-230
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 200,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-539,
-540,
-880,
-881,
-42,
-40,
-46
-]
-},
-{
-"tb": 2432,
-"tbk": 32,
-"tl": 23980,
-"mb": 304,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-675,
-1413,
-1414,
-1415,
-1416,
-1417,
-1418,
-1419,
-2384,
-2385
-]
-},
-{
-"tb": 294000,
-"tbk": 1750,
-"tl": 1405572,
-"mb": 1176,
-"mbk": 7,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2386,
-2387,
-2388,
-2389,
-2390,
-2391,
-2392
-]
-},
-{
-"tb": 50304,
-"tbk": 1568,
-"tl": 14838,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-1465,
-1466,
-1467,
-1468,
-1469,
-1470,
-1471,
-1472,
-2393
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 2452,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-86,
-87,
-88,
-7,
-2394
-]
-},
-{
-"tb": 29568,
-"tbk": 264,
-"tl": 192876,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-283,
-840,
-841,
-7,
-56
-]
-},
-{
-"tb": 89088,
-"tbk": 184,
-"tl": 87536,
-"mb": 768,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-288,
-2395,
-2396,
-2397,
-2398,
-2399,
-2400,
-2401,
-2402,
-2403
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 1611,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-1265,
-1266,
-1267,
-7,
-1855
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 10168,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1577,
-1578,
-1579,
-7,
-2404
-]
-},
-{
-"tb": 1600,
-"tbk": 40,
-"tl": 67,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-379,
-380,
-381,
-382,
-383,
-2405,
-2406,
-747
-]
-},
-{
-"tb": 10720,
-"tbk": 268,
-"tl": 8720488,
-"mb": 120,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-26,
-27,
-2407,
-2408,
-1574,
-2409,
-499
-]
-},
-{
-"tb": 175104,
-"tbk": 1368,
-"tl": 1759280,
-"mb": 128,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1211,
-1212,
-1213,
-1214,
-1215,
-2380
-]
-},
-{
-"tb": 896,
-"tbk": 16,
-"tl": 30,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-83,
-896,
-118,
-118,
-46,
-85
-]
-},
-{
-"tb": 512,
-"tbk": 8,
-"tl": 122,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1594,
-1595,
-1596,
-881,
-45,
-46,
-85
-]
-},
-{
-"tb": 3584,
-"tbk": 32,
-"tl": 24636,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-490,
-491,
-492,
-7,
-167
-]
-},
-{
-"tb": 48,
-"tbk": 1,
-"tl": 64598539,
-"mb": 48,
-"mbk": 1,
-"gb": 48,
-"gbk": 1,
-"eb": 48,
-"ebk": 1,
-"fs": [
-1,
-416,
-417,
-2410,
-741,
-742,
-23,
-24,
-25
-]
-},
-{
-"tb": 755328,
-"tbk": 1945,
-"tl": 30114,
-"mb": 672,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-2411,
-2412,
-2413,
-2414,
-2415,
-2416
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 3630,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-439,
-440,
-441,
-7,
-913
-]
-},
-{
-"tb": 110360,
-"tbk": 2759,
-"tl": 11736,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-897,
-898,
-899,
-901,
-1953,
-1516,
-1517
-]
-},
-{
-"tb": 2080,
-"tbk": 416,
-"tl": 1529930,
-"mb": 15,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-2417
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 928,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-44,
-119,
-2418,
-2419,
-2420
-]
-},
-{
-"tb": 52224,
-"tbk": 136,
-"tl": 2074,
-"mb": 384,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1835,
-2421,
-2422,
-2423,
-2424,
-2425,
-2426,
-2427,
-2428,
-2429
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 11703,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-490,
-491,
-492,
-7,
-442
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 828,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-117,
-41,
-46,
-85,
-85
-]
-},
-{
-"tb": 27840,
-"tbk": 435,
-"tl": 208241,
-"mb": 128,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-266,
-267,
-1805,
-1664,
-1806,
-461,
-2430
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5117,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-924,
-1578,
-1579,
-7,
-968
-]
-},
-{
-"tb": 5792,
-"tbk": 4,
-"tl": 258616777,
-"mb": 5792,
-"mbk": 4,
-"gb": 5792,
-"gbk": 4,
-"eb": 5792,
-"ebk": 4,
-"fs": [
-211,
-1057,
-1058,
-202,
-203,
-743,
-744,
-745
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5969,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-697,
-888,
-889,
-7,
-132
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 876,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-372,
-1913,
-1914,
-476,
-477,
-377
-]
-},
-{
-"tb": 672,
-"tbk": 21,
-"tl": 339,
-"mb": 32,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-2431,
-2432,
-2433,
-2434,
-2435,
-2436,
-2437,
-2438,
-2439
-]
-},
-{
-"tb": 320,
-"tbk": 80,
-"tl": 302821,
-"mb": 8,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-2440
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 802,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1339,
-1340,
-45,
-45,
-46,
-85
-]
-},
-{
-"tb": 69760,
-"tbk": 1744,
-"tl": 27328,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-26,
-27,
-1206,
-1207,
-2441,
-1104,
-348
-]
-},
-{
-"tb": 176,
-"tbk": 1,
-"tl": 286,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-706,
-1821,
-1822,
-1823,
-1824
-]
-},
-{
-"tb": 27072,
-"tbk": 376,
-"tl": 287195,
-"mb": 144,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-1004,
-2442,
-348,
-349,
-350
-]
-},
-{
-"tb": 5120,
-"tbk": 13,
-"tl": 119527,
-"mb": 960,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-518,
-2443,
-2444,
-2445,
-2446,
-2447
-]
-},
-{
-"tb": 10240,
-"tbk": 256,
-"tl": 501134,
-"mb": 120,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-160,
-161,
-162,
-163,
-164,
-1526,
-1669
-]
-},
-{
-"tb": 6320,
-"tbk": 158,
-"tl": 20978,
-"mb": 280,
-"mbk": 7,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-313,
-314,
-315,
-1863,
-1864,
-2448,
-2449
-]
-},
-{
-"tb": 45072,
-"tbk": 626,
-"tl": 35990,
-"mb": 72,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-446,
-447,
-2345,
-2346,
-2347,
-2450,
-2451
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6037,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1160,
-1263,
-1264,
-7,
-1930
-]
-},
-{
-"tb": 342400,
-"tbk": 5350,
-"tl": 6904361,
-"mb": 256,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-2452,
-1212,
-1213,
-1214,
-1215,
-2380
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6535,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-665,
-945,
-946,
-7,
-913
-]
-},
-{
-"tb": 168192,
-"tbk": 712,
-"tl": 25929,
-"mb": 408,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-2453,
-2454,
-2455,
-2456
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 13296,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-283,
-840,
-841,
-7,
-132
-]
-},
-{
-"tb": 14336,
-"tbk": 128,
-"tl": 107522,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-283,
-840,
-841,
-7,
-89
-]
-},
-{
-"tb": 9680,
-"tbk": 55,
-"tl": 1138,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-423,
-424,
-102,
-103,
-426
-]
-},
-{
-"tb": 640,
-"tbk": 16,
-"tl": 1354,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-539,
-540,
-880,
-881,
-2418,
-2419,
-2420
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 10694,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1029,
-1030,
-1031,
-7,
-887
-]
-},
-{
-"tb": 137456,
-"tbk": 781,
-"tl": 128154,
-"mb": 704,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-100,
-101,
-102,
-103,
-426
-]
-},
-{
-"tb": 1592,
-"tbk": 168,
-"tl": 69454,
-"mb": 18,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-2457,
-2458,
-2459,
-2460,
-2461
-]
-},
-{
-"tb": 56672,
-"tbk": 322,
-"tl": 29564,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-100,
-1271,
-425,
-103,
-426
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 7315,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-702,
-258,
-259,
-7,
-56
-]
-},
-{
-"tb": 15104,
-"tbk": 472,
-"tl": 209215,
-"mb": 800,
-"mbk": 25,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-556,
-557,
-558,
-559,
-2462
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6427,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-884,
-885,
-886,
-7,
-968
-]
-},
-{
-"tb": 640,
-"tbk": 16,
-"tl": 1581,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-117,
-118,
-443,
-46,
-46
-]
-},
-{
-"tb": 2992,
-"tbk": 17,
-"tl": 722,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-100,
-424,
-102,
-103,
-104
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5080,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-697,
-888,
-889,
-7,
-89
-]
-},
-{
-"tb": 68480,
-"tbk": 1070,
-"tl": 1461468,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-2452,
-1212,
-1213,
-1214,
-1215,
-1216
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 8419,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-697,
-888,
-889,
-7,
-282
-]
-},
-{
-"tb": 272,
-"tbk": 1,
-"tl": 313,
-"mb": 272,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2155,
-21,
-22,
-23,
-24,
-25,
-1033
-]
-},
-{
-"tb": 1736,
-"tbk": 28,
-"tl": 853,
-"mb": 136,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1307,
-1308,
-1309,
-1310,
-1311,
-1312,
-2463
-]
-},
-{
-"tb": 59280,
-"tbk": 1482,
-"tl": 52706159,
-"mb": 280,
-"mbk": 7,
-"gb": 40,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-26,
-27,
-1326,
-2464,
-2409,
-499,
-500
-]
-},
-{
-"tb": 352,
-"tbk": 88,
-"tl": 366710,
-"mb": 8,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-2465
-]
-},
-{
-"tb": 199440,
-"tbk": 4986,
-"tl": 197464608,
-"mb": 240,
-"mbk": 6,
-"gb": 120,
-"gbk": 3,
-"eb": 120,
-"ebk": 3,
-"fs": [
-1,
-26,
-27,
-1206,
-1207,
-2466,
-2467,
-2468
-]
-},
-{
-"tb": 960,
-"tbk": 24,
-"tl": 2629,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-573,
-574,
-45,
-46,
-46,
-47
-]
-},
-{
-"tb": 30779056,
-"tbk": 628144,
-"tl": 5245696,
-"mb": 49,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-2469,
-2470,
-2471,
-2472,
-2473,
-2474,
-2475
-]
-},
-{
-"tb": 39424,
-"tbk": 224,
-"tl": 56716,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-423,
-1271,
-102,
-103,
-426
-]
-},
-{
-"tb": 64,
-"tbk": 1,
-"tl": 399,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-2476,
-2477,
-2478,
-1857,
-1304,
-1305,
-1306
-]
-},
-{
-"tb": 112,
-"tbk": 1,
-"tl": 73504,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1160,
-831,
-832,
-1224,
-1225
-]
-},
-{
-"tb": 384,
-"tbk": 4,
-"tl": 258942985,
-"mb": 384,
-"mbk": 4,
-"gb": 384,
-"gbk": 4,
-"eb": 384,
-"ebk": 4,
-"fs": [
-204,
-205,
-575,
-576,
-577,
-578,
-2479
-]
-},
-{
-"tb": 859048,
-"tbk": 67533,
-"tl": 1586539784,
-"mb": 1459,
-"mbk": 43,
-"gb": 997,
-"gbk": 40,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-703,
-704,
-2480
-]
-},
-{
-"tb": 2314532,
-"tbk": 1605,
-"tl": 3276312,
-"mb": 2840,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1675,
-1676,
-1677,
-2481,
-2482,
-2483,
-2484
-]
-},
-{
-"tb": 56672,
-"tbk": 322,
-"tl": 27607,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-423,
-1271,
-425,
-103,
-426
-]
-},
-{
-"tb": 224,
-"tbk": 1,
-"tl": 27,
-"mb": 224,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-875,
-876,
-877,
-878,
-2485
-]
-},
-{
-"tb": 7840,
-"tbk": 196,
-"tl": 12682457764,
-"mb": 7840,
-"mbk": 196,
-"gb": 7840,
-"gbk": 196,
-"eb": 7840,
-"ebk": 196,
-"fs": [
-211,
-2486,
-2487,
-2488,
-214,
-215,
-216,
-217
-]
-},
-{
-"tb": 1960,
-"tbk": 49,
-"tl": 1128486,
-"mb": 240,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-1201,
-1202,
-1203,
-1204,
-166
-]
-},
-{
-"tb": 112,
-"tbk": 1,
-"tl": 64598321,
-"mb": 112,
-"mbk": 1,
-"gb": 112,
-"gbk": 1,
-"eb": 112,
-"ebk": 1,
-"fs": [
-1,
-388,
-1065,
-741,
-742,
-23,
-24,
-25
-]
-},
-{
-"tb": 40,
-"tbk": 40,
-"tl": 147291,
-"mb": 2,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-412,
-413,
-414,
-2489
-]
-},
-{
-"tb": 3840,
-"tbk": 6,
-"tl": 1372,
-"mb": 640,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-2490,
-2491,
-2492,
-2493,
-2494,
-2495,
-2496,
-2497,
-2498,
-2499
-]
-},
-{
-"tb": 755200,
-"tbk": 2360,
-"tl": 1291886,
-"mb": 1600,
-"mbk": 5,
-"gb": 640,
-"gbk": 2,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2005,
-2006,
-2500,
-2501,
-193,
-194
-]
-},
-{
-"tb": 960,
-"tbk": 24,
-"tl": 2393,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-26,
-27,
-2407,
-2502,
-1104,
-348,
-349
-]
-},
-{
-"tb": 7040,
-"tbk": 40,
-"tl": 8306,
-"mb": 528,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-909,
-836,
-837,
-838,
-461
-]
-},
-{
-"tb": 1728,
-"tbk": 24,
-"tl": 32105,
-"mb": 72,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-2503,
-2504,
-348,
-349,
-350
-]
-},
-{
-"tb": 107712,
-"tbk": 1496,
-"tl": 470346,
-"mb": 72,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-446,
-447,
-2505,
-2249,
-2250,
-2251,
-2252
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 4912,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-944,
-945,
-946,
-7,
-8
-]
-},
-{
-"tb": 82,
-"tbk": 1,
-"tl": 18,
-"mb": 82,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1139,
-1140,
-1141,
-1142,
-1143,
-1144,
-1145,
-2506,
-2507,
-2508,
-2509,
-2510,
-2511,
-2512,
-2513,
-1713,
-1714,
-1715,
-1716
-]
-},
-{
-"tb": 6512,
-"tbk": 37,
-"tl": 2023,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-423,
-806,
-425,
-103,
-104
-]
-},
-{
-"tb": 3456,
-"tbk": 48,
-"tl": 404321,
-"mb": 432,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-2514,
-2515,
-2516,
-2517,
-1411,
-237,
-238
-]
-},
-{
-"tb": 80250,
-"tbk": 1605,
-"tl": 20282,
-"mb": 50,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-638,
-639,
-640,
-641,
-642,
-643,
-644,
-645,
-646,
-2137,
-1436,
-452,
-596
-]
-},
-{
-"tb": 15152,
-"tbk": 947,
-"tl": 17956,
-"mb": 16,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1218,
-1219,
-94,
-95,
-96,
-97,
-229
-]
-},
-{
-"tb": 288,
-"tbk": 4,
-"tl": 258637153,
-"mb": 288,
-"mbk": 4,
-"gb": 288,
-"gbk": 4,
-"eb": 288,
-"ebk": 4,
-"fs": [
-211,
-2108,
-2109,
-2110,
-302,
-203,
-743,
-744
-]
-},
-{
-"tb": 69344,
-"tbk": 269,
-"tl": 16962144332,
-"mb": 69344,
-"mbk": 269,
-"gb": 69344,
-"gbk": 269,
-"eb": 69344,
-"ebk": 269,
-"fs": [
-204,
-205,
-2518,
-2519,
-2520,
-2521,
-2522,
-2523
-]
-},
-{
-"tb": 917504,
-"tbk": 872,
-"tl": 6696176,
-"mb": 84224,
-"mbk": 78,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1175,
-1176,
-1177,
-2524,
-862
-]
-},
-{
-"tb": 600,
-"tbk": 15,
-"tl": 3448,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1699,
-1700,
-1701,
-2525,
-2526,
-2527,
-1703
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 11588,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-830,
-1263,
-1264,
-7,
-8
-]
-},
-{
-"tb": 440,
-"tbk": 11,
-"tl": 1684,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1699,
-1700,
-1825,
-2528,
-1664,
-1806,
-461
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 831,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-2529,
-45,
-45,
-46,
-85
-]
-},
-{
-"tb": 400,
-"tbk": 10,
-"tl": 662320,
-"mb": 40,
-"mbk": 1,
-"gb": 40,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-1265,
-2335,
-1630,
-668,
-669
-]
-},
-{
-"tb": 1091400,
-"tbk": 1605,
-"tl": 194729,
-"mb": 680,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2530,
-1014,
-1015,
-421,
-422,
-2023
-]
-},
-{
-"tb": 4752,
-"tbk": 1584,
-"tl": 5398457,
-"mb": 12,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-2531
-]
-},
-{
-"tb": 1003104,
-"tbk": 10449,
-"tl": 221101871,
-"mb": 768,
-"mbk": 8,
-"gb": 672,
-"gbk": 7,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-852,
-2532,
-2533,
-2534,
-2535
-]
-},
-{
-"tb": 32503744,
-"tbk": 44648,
-"tl": 27301059,
-"mb": 13104,
-"mbk": 18,
-"gb": 8736,
-"gbk": 12,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2536,
-2537,
-2538,
-2539,
-2540,
-2541,
-193
-]
-},
-{
-"tb": 926008,
-"tbk": 112097,
-"tl": 183611,
-"mb": 18,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-168,
-2192,
-2193,
-2194,
-2195,
-2196,
-2197,
-2198,
-2199,
-2200,
-2201,
-2202,
-2542,
-2543,
-2190,
-2191,
-2544
-]
-},
-{
-"tb": 18816,
-"tbk": 196,
-"tl": 56414,
-"mb": 96,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-2545,
-2546,
-2547,
-2548,
-2549
-]
-},
-{
-"tb": 704,
-"tbk": 4,
-"tl": 54,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-706,
-1437,
-708,
-709,
-710
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 5074,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-369,
-370,
-371,
-7,
-230
-]
-},
-{
-"tb": 672,
-"tbk": 12,
-"tl": 333,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-2229,
-2550,
-2551,
-2552,
-2553,
-2554,
-2555,
-2556
-]
-},
-{
-"tb": 56,
-"tbk": 1,
-"tl": 64598726,
-"mb": 56,
-"mbk": 1,
-"gb": 56,
-"gbk": 1,
-"eb": 56,
-"ebk": 1,
-"fs": [
-1,
-555,
-1179,
-741,
-742,
-23,
-24,
-25
-]
-},
-{
-"tb": 4242384,
-"tbk": 58922,
-"tl": 3575247,
-"mb": 576,
-"mbk": 8,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-446,
-447,
-2345,
-2346,
-2347,
-2450,
-2557
-]
-},
-{
-"tb": 12496,
-"tbk": 71,
-"tl": 11143,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-1784,
-2558,
-2559,
-1787,
-1512
-]
-},
-{
-"tb": 40,
-"tbk": 1,
-"tl": 179,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1699,
-1700,
-1825,
-2528,
-1664,
-1806,
-1807
-]
-},
-{
-"tb": 88704,
-"tbk": 504,
-"tl": 176835,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-912,
-1821,
-2560,
-2561,
-708
-]
-},
-{
-"tb": 7008,
-"tbk": 584,
-"tl": 2684225,
-"mb": 36,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-412,
-413,
-414,
-2562
-]
-},
-{
-"tb": 1024480,
-"tbk": 1645,
-"tl": 824587,
-"mb": 1216,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-2563,
-2564,
-2565,
-2566,
-2567
-]
-},
-{
-"tb": 240,
-"tbk": 6,
-"tl": 22806,
-"mb": 160,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-160,
-161,
-162,
-163,
-164,
-1526,
-2568
-]
-},
-{
-"tb": 821760,
-"tbk": 12840,
-"tl": 658478,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1967,
-2569,
-2570,
-2571,
-2572,
-2573,
-2574,
-2575,
-2576,
-2253
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 10001,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1577,
-1578,
-1579,
-7,
-167
-]
-},
-{
-"tb": 40,
-"tbk": 1,
-"tl": 64598655,
-"mb": 40,
-"mbk": 1,
-"gb": 40,
-"gbk": 1,
-"eb": 40,
-"ebk": 1,
-"fs": [
-1,
-26,
-27,
-28,
-2577,
-2578,
-2579,
-2580,
-2581
-]
-},
-{
-"tb": 64512,
-"tbk": 168,
-"tl": 104686,
-"mb": 384,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-288,
-2582,
-2583,
-2584,
-2585,
-2586,
-2587,
-2588,
-2589,
-2590
-]
-},
-{
-"tb": 80,
-"tbk": 2,
-"tl": 792,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-539,
-540,
-1522,
-542,
-543,
-316,
-317
-]
-},
-{
-"tb": 555424,
-"tbk": 3727,
-"tl": 122085565,
-"mb": 2072,
-"mbk": 14,
-"gb": 296,
-"gbk": 2,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-2591,
-2592,
-2593,
-2594
-]
-},
-{
-"tb": 10032,
-"tbk": 57,
-"tl": 1347,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-423,
-101,
-102,
-103,
-104
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 852,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-44,
-118,
-46,
-85,
-85
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 209,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-539,
-540,
-880,
-881,
-306,
-41,
-46
-]
-},
-{
-"tb": 365568,
-"tbk": 400,
-"tl": 28211,
-"mb": 1792,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-2595,
-2596,
-2597,
-2598,
-861
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 15156,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-265,
-157,
-158,
-7,
-1639
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 9992,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1272,
-1030,
-1031,
-7,
-230
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 1648,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-4,
-5,
-6,
-7,
-968
-]
-},
-{
-"tb": 5408,
-"tbk": 13,
-"tl": 316,
-"mb": 416,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-2599,
-2600,
-2601,
-2602,
-2603,
-2604,
-2605,
-2606,
-2607
-]
-},
-{
-"tb": 303680,
-"tbk": 470,
-"tl": 237664,
-"mb": 1760,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-2608,
-2609,
-2610,
-2611,
-2612,
-2613
-]
-},
-{
-"tb": 728816,
-"tbk": 859,
-"tl": 22893021597,
-"mb": 381104,
-"mbk": 364,
-"gb": 381104,
-"gbk": 364,
-"eb": 381104,
-"ebk": 364,
-"fs": [
-204,
-205,
-2614,
-2615,
-2616,
-2617,
-2618,
-2619
-]
-},
-{
-"tb": 73920,
-"tbk": 420,
-"tl": 14040,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-423,
-806,
-425,
-103,
-426
-]
-},
-{
-"tb": 154080,
-"tbk": 12840,
-"tl": 27220,
-"mb": 12,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1139,
-1140,
-1141,
-1142,
-1143,
-1144,
-1145,
-1146,
-1147,
-2620,
-2621,
-2622,
-2623,
-2624
-]
-},
-{
-"tb": 18576,
-"tbk": 172,
-"tl": 322,
-"mb": 144,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1139,
-1140,
-1141,
-1142,
-1143,
-1144,
-1145,
-1146,
-1147,
-1148,
-2625,
-1120,
-1121,
-2626
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 4725,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-720,
-502,
-503,
-7,
-56
-]
-},
-{
-"tb": 896,
-"tbk": 16,
-"tl": 39,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-83,
-84,
-46,
-85,
-46,
-47
-]
-},
-{
-"tb": 159104,
-"tbk": 1243,
-"tl": 1302929,
-"mb": 128,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-2627,
-1588,
-1589,
-1590,
-1591,
-1593
-]
-},
-{
-"tb": 512,
-"tbk": 8,
-"tl": 133,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1594,
-1595,
-1596,
-881,
-42,
-40,
-46
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 18857,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-105,
-106,
-107,
-7,
-89
-]
-},
-{
-"tb": 880,
-"tbk": 5,
-"tl": 974,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-919,
-1061,
-1062,
-922,
-2628
-]
-},
-{
-"tb": 28800,
-"tbk": 400,
-"tl": 494,
-"mb": 72,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-232,
-233,
-939,
-2629,
-941,
-942,
-943
-]
-},
-{
-"tb": 953008,
-"tbk": 8509,
-"tl": 1590011,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-330,
-5,
-2630,
-1745,
-2125
-]
-},
-{
-"tb": 696,
-"tbk": 232,
-"tl": 831287,
-"mb": 9,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-412,
-413,
-414,
-2631
-]
-},
-{
-"tb": 20480,
-"tbk": 216,
-"tl": 8460,
-"mb": 1024,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-2632,
-2633,
-2634,
-2635,
-2636
-]
-},
-{
-"tb": 3584,
-"tbk": 32,
-"tl": 14766,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-265,
-157,
-158,
-7,
-132
-]
-},
-{
-"tb": 923012,
-"tbk": 1621,
-"tl": 57418811,
-"mb": 1676,
-"mbk": 2,
-"gb": 564,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-2637,
-2638,
-2639,
-2640
-]
-},
-{
-"tb": 832,
-"tbk": 416,
-"tl": 1602327,
-"mb": 6,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-412,
-413,
-414,
-2641
-]
-},
-{
-"tb": 524,
-"tbk": 3,
-"tl": 64409151,
-"mb": 440,
-"mbk": 2,
-"gb": 288,
-"gbk": 1,
-"eb": 288,
-"ebk": 1,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-2642,
-2643,
-2644,
-2645
-]
-},
-{
-"tb": 58240,
-"tbk": 1456,
-"tl": 2423,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-379,
-380,
-381,
-382,
-383,
-1597,
-1598,
-747
-]
-},
-{
-"tb": 3584,
-"tbk": 32,
-"tl": 24753,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-490,
-491,
-492,
-7,
-887
-]
-},
-{
-"tb": 144,
-"tbk": 14,
-"tl": 13844,
-"mb": 16,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-518,
-519,
-767,
-768,
-2646,
-770
-]
-},
-{
-"tb": 40,
-"tbk": 1,
-"tl": 63972784,
-"mb": 40,
-"mbk": 1,
-"gb": 40,
-"gbk": 1,
-"eb": 40,
-"ebk": 1,
-"fs": [
-1,
-26,
-27,
-28,
-2647,
-2648,
-2649,
-2650,
-2651
-]
-},
-{
-"tb": 80,
-"tbk": 2,
-"tl": 114272,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-26,
-27,
-1326,
-1629,
-1630,
-1224,
-1225
-]
-},
-{
-"tb": 572992,
-"tbk": 5116,
-"tl": 695554,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-156,
-157,
-597,
-598,
-599
-]
-},
-{
-"tb": 56,
-"tbk": 1,
-"tl": 64598160,
-"mb": 56,
-"mbk": 1,
-"gb": 56,
-"gbk": 1,
-"eb": 56,
-"ebk": 1,
-"fs": [
-1,
-555,
-1217,
-390,
-391,
-23,
-24,
-25
-]
-},
-{
-"tb": 27904,
-"tbk": 436,
-"tl": 42435,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-953,
-954,
-955,
-956,
-957,
-2652
-]
-},
-{
-"tb": 89880,
-"tbk": 1605,
-"tl": 395506,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-555,
-2410,
-419,
-420,
-421,
-422
-]
-},
-{
-"tb": 3248,
-"tbk": 29,
-"tl": 1781496,
-"mb": 336,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-86,
-2653,
-2654,
-927,
-2655
-]
-},
-{
-"tb": 880,
-"tbk": 5,
-"tl": 1439,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-1784,
-2656,
-1786,
-1787,
-1512
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5135,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1029,
-1030,
-1031,
-7,
-132
-]
-},
-{
-"tb": 21448,
-"tbk": 2040,
-"tl": 476596,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-2166,
-2657,
-2658,
-2659,
-2660
-]
-},
-{
-"tb": 7504,
-"tbk": 67,
-"tl": 5680,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-143,
-144,
-444,
-304,
-908
-]
-},
-{
-"tb": 1056,
-"tbk": 6,
-"tl": 1200,
-"mb": 528,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-1508,
-1509,
-2661,
-1511,
-1512
-]
-},
-{
-"tb": 869760,
-"tbk": 1208,
-"tl": 516015,
-"mb": 8640,
-"mbk": 12,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-2662,
-2663,
-2664,
-2665,
-2666,
-2667
-]
-},
-{
-"tb": 160,
-"tbk": 4,
-"tl": 180643,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-1265,
-2668,
-2669,
-264,
-669
-]
-},
-{
-"tb": 230640,
-"tbk": 68896,
-"tl": 166668692,
-"mb": 108,
-"mbk": 9,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-2670,
-2671,
-2672
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 847,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-117,
-2418,
-2419,
-2420,
-2673
-]
-},
-{
-"tb": 35890,
-"tbk": 7178,
-"tl": 62234,
-"mb": 8,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2674,
-2675,
-2676,
-2677,
-2678,
-2679
-]
-},
-{
-"tb": 189504,
-"tbk": 2632,
-"tl": 1253701,
-"mb": 72,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-446,
-447,
-2680,
-2681,
-2682,
-2683,
-2684
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 7476,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-490,
-491,
-492,
-7,
-2685
-]
-},
-{
-"tb": 208488,
-"tbk": 60804,
-"tl": 9201244,
-"mb": 45,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-638,
-639,
-640,
-641,
-642,
-643,
-644,
-645,
-646,
-647,
-648,
-116,
-111,
-112,
-113,
-114,
-673,
-674
-]
-},
-{
-"tb": 640,
-"tbk": 8,
-"tl": 1039,
-"mb": 80,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2686,
-45,
-45,
-46,
-85,
-46
-]
-},
-{
-"tb": 640,
-"tbk": 16,
-"tl": 8535,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-129,
-130,
-131,
-7,
-282
-]
-},
-{
-"tb": 24024,
-"tbk": 8008,
-"tl": 29827923,
-"mb": 30,
-"mbk": 10,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-2687,
-2688
-]
-},
-{
-"tb": 384,
-"tbk": 4,
-"tl": 1764,
-"mb": 192,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-891,
-892,
-893,
-894,
-2689
-]
-},
-{
-"tb": 218824,
-"tbk": 1609,
-"tl": 64698299,
-"mb": 136,
-"mbk": 1,
-"gb": 136,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-2690,
-2691,
-2692,
-2693,
-2694,
-2695,
-2696,
-2697,
-2698,
-2699,
-2700,
-2701,
-2702,
-2703,
-452,
-596
-]
-},
-{
-"tb": 48,
-"tbk": 1,
-"tl": 64598330,
-"mb": 48,
-"mbk": 1,
-"gb": 48,
-"gbk": 1,
-"eb": 48,
-"ebk": 1,
-"fs": [
-1,
-1011,
-1012,
-1065,
-741,
-742,
-23,
-24,
-25
-]
-},
-{
-"tb": 202368,
-"tbk": 2200,
-"tl": 1675993,
-"mb": 960,
-"mbk": 5,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-687,
-688,
-2704,
-2705,
-193,
-194
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 468417,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1665,
-1727,
-2706,
-669,
-1328
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 12718,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1029,
-1030,
-1031,
-7,
-167
-]
-},
-{
-"tb": 6272,
-"tbk": 56,
-"tl": 23476,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-4,
-5,
-6,
-7,
-167
-]
-},
-{
-"tb": 65792,
-"tbk": 1028,
-"tl": 67287,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-266,
-267,
-1482,
-1483,
-1484,
-461,
-2707
-]
-},
-{
-"tb": 10912,
-"tbk": 62,
-"tl": 12992,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-252,
-342,
-2378,
-344,
-1300
-]
-},
-{
-"tb": 121344,
-"tbk": 632,
-"tl": 22120,
-"mb": 192,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1495,
-1496,
-1497,
-2708,
-237
-]
-},
-{
-"tb": 16512,
-"tbk": 129,
-"tl": 2161,
-"mb": 128,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-351,
-2709,
-2710,
-2711,
-2712,
-2713,
-2714,
-2715,
-2716
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 775,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-1221,
-306,
-306,
-46,
-46
-]
-},
-{
-"tb": 192,
-"tbk": 6,
-"tl": 1541,
-"mb": 32,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-809,
-810,
-811,
-812,
-1304,
-1305,
-1306
-]
-},
-{
-"tb": 1584,
-"tbk": 9,
-"tl": 1334,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-912,
-755,
-1438,
-709,
-756
-]
-},
-{
-"tb": 160,
-"tbk": 4,
-"tl": 637,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1699,
-1700,
-1701,
-1702,
-1703,
-461,
-2707
-]
-},
-{
-"tb": 48,
-"tbk": 1,
-"tl": 64597684,
-"mb": 48,
-"mbk": 1,
-"gb": 48,
-"gbk": 1,
-"eb": 48,
-"ebk": 1,
-"fs": [
-1,
-1011,
-1012,
-1013,
-390,
-391,
-23,
-24,
-25
-]
-},
-{
-"tb": 528,
-"tbk": 88,
-"tl": 267864,
-"mb": 12,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-2717,
-2718
-]
-},
-{
-"tb": 163856,
-"tbk": 931,
-"tl": 295416,
-"mb": 1056,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-252,
-342,
-2378,
-344,
-345
-]
-},
-{
-"tb": 32,
-"tbk": 2,
-"tl": 118,
-"mb": 16,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-2719,
-2720,
-2721,
-2722,
-2723,
-2724,
-2725,
-2726,
-2727
-]
-},
-{
-"tb": 8080,
-"tbk": 202,
-"tl": 904,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1440,
-1441,
-1442,
-2728,
-1443,
-1444,
-1445
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 750,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1339,
-1340,
-118,
-46,
-46,
-47
-]
-},
-{
-"tb": 960,
-"tbk": 24,
-"tl": 2540,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-117,
-118,
-46,
-85,
-46
-]
-},
-{
-"tb": 1764,
-"tbk": 54,
-"tl": 1664,
-"mb": 80,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-2729,
-2730,
-2731,
-2732,
-2733,
-2734,
-2735,
-2736,
-2737
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5200,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1577,
-1578,
-1579,
-7,
-968
-]
-},
-{
-"tb": 40,
-"tbk": 1,
-"tl": 64598745,
-"mb": 40,
-"mbk": 1,
-"gb": 40,
-"gbk": 1,
-"eb": 40,
-"ebk": 1,
-"fs": [
-1,
-26,
-27,
-28,
-2738,
-2739,
-2740,
-2741,
-2742
-]
-},
-{
-"tb": 58560,
-"tbk": 915,
-"tl": 553022,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1564,
-1565,
-1566,
-1567,
-1568,
-2743
-]
-},
-{
-"tb": 368640,
-"tbk": 773,
-"tl": 12947,
-"mb": 1152,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1835,
-2744,
-2745,
-2746,
-2747,
-2748,
-2749,
-2750,
-2751,
-2752
-]
-},
-{
-"tb": 856520,
-"tbk": 3059,
-"tl": 206641,
-"mb": 560,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-2753,
-2754,
-2755,
-2756,
-2757,
-2758
-]
-},
-{
-"tb": 40,
-"tbk": 1,
-"tl": 64598442,
-"mb": 40,
-"mbk": 1,
-"gb": 40,
-"gbk": 1,
-"eb": 40,
-"ebk": 1,
-"fs": [
-1,
-26,
-27,
-28,
-2759,
-2760,
-2761,
-2762,
-2763
-]
-},
-{
-"tb": 6408,
-"tbk": 400,
-"tl": 23721,
-"mb": 366,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-2469,
-2470,
-2471,
-2472,
-2473,
-2764,
-869
-]
-},
-{
-"tb": 150,
-"tbk": 2,
-"tl": 64895778,
-"mb": 100,
-"mbk": 1,
-"gb": 100,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-168,
-169,
-170,
-171,
-585,
-586,
-587,
-588,
-589,
-590,
-591,
-592,
-593,
-2765,
-1671
-]
-},
-{
-"tb": 6784,
-"tbk": 1696,
-"tl": 7497581,
-"mb": 20,
-"mbk": 5,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-2766
-]
-},
-{
-"tb": 616320,
-"tbk": 1605,
-"tl": 161945,
-"mb": 384,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-288,
-2767,
-2768,
-2769,
-2770,
-2771,
-2772,
-2773,
-2774
-]
-},
-{
-"tb": 11264,
-"tbk": 64,
-"tl": 17234,
-"mb": 528,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-934,
-935,
-936,
-937,
-1504
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 869,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-39,
-40,
-85,
-85,
-46
-]
-},
-{
-"tb": 640,
-"tbk": 8,
-"tl": 1062,
-"mb": 80,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2686,
-45,
-118,
-46,
-46,
-47
-]
-},
-{
-"tb": 4480,
-"tbk": 20,
-"tl": 443498,
-"mb": 1120,
-"mbk": 5,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-1301,
-1302,
-1303,
-862,
-863,
-928,
-743
-]
-},
-{
-"tb": 47360,
-"tbk": 313,
-"tl": 11412549007,
-"mb": 29504,
-"mbk": 182,
-"gb": 29504,
-"gbk": 182,
-"eb": 29504,
-"ebk": 182,
-"fs": [
-204,
-205,
-2775,
-2776,
-2777,
-2778,
-2779
-]
-},
-{
-"tb": 1360,
-"tbk": 272,
-"tl": 890071,
-"mb": 15,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-2780
-]
-},
-{
-"tb": 118784,
-"tbk": 3712,
-"tl": 55925,
-"mb": 32,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-2781,
-2782,
-2783,
-2784,
-2785,
-2786,
-2787,
-2788,
-2789
-]
-},
-{
-"tb": 15680,
-"tbk": 392,
-"tl": 77146,
-"mb": 240,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-539,
-540,
-541,
-542,
-543,
-1863,
-1864
-]
-},
-{
-"tb": 163856,
-"tbk": 931,
-"tl": 287115,
-"mb": 1056,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-341,
-342,
-2378,
-344,
-345
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 11305,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1272,
-1030,
-1031,
-7,
-1639
-]
-},
-{
-"tb": 89880,
-"tbk": 1605,
-"tl": 301243,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-462,
-463,
-2156,
-2157,
-421,
-422
-]
-},
-{
-"tb": 37760,
-"tbk": 95,
-"tl": 70524,
-"mb": 2560,
-"mbk": 5,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-518,
-2443,
-2444,
-2445,
-2790,
-2791
-]
-},
-{
-"tb": 77040,
-"tbk": 1605,
-"tl": 346672,
-"mb": 48,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1011,
-1012,
-2178,
-1014,
-1015,
-421,
-422
-]
-},
-{
-"tb": 156344,
-"tbk": 24728,
-"tl": 14521408,
-"mb": 270,
-"mbk": 30,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-638,
-639,
-640,
-641,
-642,
-643,
-644,
-645,
-646,
-647,
-115,
-116,
-111,
-112,
-113,
-114,
-115,
-116
-]
-},
-{
-"tb": 75520,
-"tbk": 424,
-"tl": 1223,
-"mb": 640,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-2058,
-2059,
-2060,
-2792,
-2793
-]
-},
-{
-"tb": 924480,
-"tbk": 12840,
-"tl": 44317308,
-"mb": 72,
-"mbk": 1,
-"gb": 72,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-446,
-447,
-448,
-2794,
-450,
-451,
-452
-]
-},
-{
-"tb": 680,
-"tbk": 17,
-"tl": 30,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-379,
-380,
-381,
-382,
-383,
-2405,
-2406,
-531
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 11904,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-439,
-440,
-441,
-7,
-89
-]
-},
-{
-"tb": 40,
-"tbk": 1,
-"tl": 276,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1699,
-1700,
-1825,
-1826,
-1664,
-1806,
-1807
-]
-},
-{
-"tb": 1024,
-"tbk": 16,
-"tl": 1217,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1594,
-1595,
-1596,
-881,
-2418,
-2419,
-2420
-]
-},
-{
-"tb": 5120000,
-"tbk": 16,
-"tl": 28469,
-"mb": 320000,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-2795,
-2796,
-2797,
-2798,
-2799,
-2800,
-2801,
-2802
-]
-},
-{
-"tb": 160,
-"tbk": 40,
-"tl": 146932,
-"mb": 8,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-2803
-]
-},
-{
-"tb": 3584,
-"tbk": 32,
-"tl": 14453,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-156,
-157,
-158,
-7,
-132
-]
-},
-{
-"tb": 9504,
-"tbk": 54,
-"tl": 7944,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-1784,
-2656,
-2559,
-1787,
-1512
-]
-},
-{
-"tb": 640,
-"tbk": 16,
-"tl": 1644,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-44,
-45,
-46,
-85,
-85
-]
-},
-{
-"tb": 880,
-"tbk": 5,
-"tl": 747,
-"mb": 528,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-2804,
-2805,
-2806,
-2807,
-2808
-]
-},
-{
-"tb": 2880,
-"tbk": 40,
-"tl": 45372,
-"mb": 144,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-2809,
-2810,
-1783,
-1820,
-124
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 21808,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-839,
-840,
-841,
-7,
-230
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 14424,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-105,
-106,
-107,
-7,
-8
-]
-},
-{
-"tb": 1792,
-"tbk": 192,
-"tl": 176989,
-"mb": 224,
-"mbk": 24,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-675,
-1413,
-1414,
-1415,
-1416,
-1417,
-1418,
-1419,
-1420,
-2811
-]
-},
-{
-"tb": 13464,
-"tbk": 187,
-"tl": 3594,
-"mb": 72,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1034,
-1035,
-94,
-95,
-96,
-97,
-229
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6506,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-884,
-885,
-886,
-7,
-230
-]
-},
-{
-"tb": 400,
-"tbk": 80,
-"tl": 293990,
-"mb": 10,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-2812
-]
-},
-{
-"tb": 493248,
-"tbk": 4404,
-"tl": 877924,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-330,
-5,
-982,
-1858,
-1859
-]
-},
-{
-"tb": 1152,
-"tbk": 24,
-"tl": 51276,
-"mb": 96,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-1409,
-1410,
-1411,
-237,
-238,
-932,
-933
-]
-},
-{
-"tb": 1184932,
-"tbk": 1621,
-"tl": 1050527,
-"mb": 2156,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-2813,
-2814,
-2815,
-2816
-]
-},
-{
-"tb": 89880,
-"tbk": 1605,
-"tl": 154904,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-462,
-20,
-2156,
-2157,
-421,
-422
-]
-},
-{
-"tb": 126976,
-"tbk": 856,
-"tl": 263779,
-"mb": 512,
-"mbk": 2,
-"gb": 256,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1832,
-2817,
-2818,
-193,
-194,
-874
-]
-},
-{
-"tb": 31200,
-"tbk": 325,
-"tl": 8852287,
-"mb": 1248,
-"mbk": 13,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1570,
-1571,
-1572,
-1573,
-2819
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 10977,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-283,
-840,
-841,
-7,
-913
-]
-},
-{
-"tb": 40,
-"tbk": 1,
-"tl": 104,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-2016,
-118,
-46,
-46,
-47
-]
-},
-{
-"tb": 75264,
-"tbk": 80,
-"tl": 697952,
-"mb": 6720,
-"mbk": 7,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-2820,
-2821,
-2822,
-2823,
-2824
-]
-},
-{
-"tb": 1840,
-"tbk": 46,
-"tl": 4869,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-117,
-46,
-46,
-47,
-403
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 9249,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-884,
-885,
-886,
-7,
-167
-]
-},
-{
-"tb": 78760,
-"tbk": 1969,
-"tl": 3173,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-379,
-380,
-381,
-382,
-383,
-2075,
-2076,
-1904
-]
-},
-{
-"tb": 225342,
-"tbk": 3571,
-"tl": 11883,
-"mb": 108,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1139,
-1140,
-1141,
-1142,
-1143,
-1144,
-1145,
-1146,
-1147,
-1148,
-2189,
-1120,
-1121,
-2626
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 11590,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-490,
-491,
-492,
-7,
-1405
-]
-},
-{
-"tb": 3892736,
-"tbk": 45248,
-"tl": 9218346,
-"mb": 448,
-"mbk": 7,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-65,
-108,
-109,
-110,
-111,
-112,
-113,
-114,
-673,
-674
-]
-},
-{
-"tb": 640,
-"tbk": 16,
-"tl": 226,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-313,
-314,
-402,
-2825,
-740,
-46,
-85
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 8594,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-627,
-370,
-371,
-7,
-442
-]
-},
-{
-"tb": 401160,
-"tbk": 10029,
-"tl": 58208766,
-"mb": 160,
-"mbk": 4,
-"gb": 80,
-"gbk": 2,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-26,
-27,
-1206,
-1207,
-1208,
-2826,
-2141
-]
-},
-{
-"tb": 179760,
-"tbk": 1605,
-"tl": 328162,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-388,
-1065,
-419,
-420,
-421,
-422
-]
-},
-{
-"tb": 3840,
-"tbk": 96,
-"tl": 46501,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-1265,
-1266,
-1267,
-7,
-56
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 846,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1339,
-1340,
-42,
-40,
-46,
-85
-]
-},
-{
-"tb": 96,
-"tbk": 24,
-"tl": 109706,
-"mb": 4,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-2827
-]
-},
-{
-"tb": 160,
-"tbk": 4,
-"tl": 258616737,
-"mb": 160,
-"mbk": 4,
-"gb": 160,
-"gbk": 4,
-"eb": 160,
-"ebk": 4,
-"fs": [
-211,
-2486,
-2487,
-2488,
-203,
-743,
-744,
-745
-]
-},
-{
-"tb": 91168,
-"tbk": 814,
-"tl": 585359,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-808,
-144,
-303,
-304,
-305
-]
-},
-{
-"tb": 5208,
-"tbk": 93,
-"tl": 18935,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-658,
-659,
-661,
-662,
-663,
-664,
-2828
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 3137,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-86,
-87,
-88,
-7,
-159
-]
-},
-{
-"tb": 704,
-"tbk": 88,
-"tl": 367517,
-"mb": 16,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-412,
-413,
-414,
-2829
-]
-},
-{
-"tb": 1856,
-"tbk": 58,
-"tl": 15697,
-"mb": 96,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-809,
-810,
-811,
-812,
-1305,
-1306,
-2149
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 796,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-372,
-2830,
-2831,
-375,
-376,
-377
-]
-},
-{
-"tb": 77040,
-"tbk": 1605,
-"tl": 313260,
-"mb": 48,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1011,
-1012,
-389,
-1014,
-1015,
-421,
-422
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 14307,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-665,
-945,
-946,
-7,
-230
-]
-},
-{
-"tb": 2288,
-"tbk": 13,
-"tl": 1111,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-457,
-458,
-1925,
-460,
-461
-]
-},
-{
-"tb": 69144,
-"tbk": 2881,
-"tl": 2734503,
-"mb": 72,
-"mbk": 3,
-"gb": 24,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-2832,
-2833,
-2834,
-2835,
-2836,
-2837,
-2838,
-2839,
-2840
-]
-},
-{
-"tb": 320,
-"tbk": 64,
-"tl": 305803,
-"mb": 15,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-2841
-]
-},
-{
-"tb": 40,
-"tbk": 1,
-"tl": 348,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1699,
-1700,
-1701,
-1702,
-1703,
-1485,
-1484
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 16198,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-283,
-840,
-841,
-7,
-159
-]
-},
-{
-"tb": 12480,
-"tbk": 312,
-"tl": 9726552,
-"mb": 160,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-26,
-27,
-2407,
-2408,
-1674,
-2842,
-814
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 896,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-372,
-2843,
-2844,
-375,
-376,
-377
-]
-},
-{
-"tb": 1152,
-"tbk": 16,
-"tl": 44,
-"mb": 72,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-232,
-233,
-234,
-2845,
-312,
-237,
-238
-]
-},
-{
-"tb": 429800,
-"tbk": 102584,
-"tl": 69566289,
-"mb": 139,
-"mbk": 23,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-638,
-639,
-640,
-641,
-642,
-643,
-644,
-645,
-646,
-2846,
-1257,
-1106,
-1107,
-1108,
-1109,
-1110
-]
-},
-{
-"tb": 5505368,
-"tbk": 4818,
-"tl": 194496630,
-"mb": 4796,
-"mbk": 4,
-"gb": 3428,
-"gbk": 3,
-"eb": 3428,
-"ebk": 3,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-2847,
-2848,
-2849,
-2850
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 6297,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-1265,
-1266,
-1267,
-7,
-159
-]
-},
-{
-"tb": 23808,
-"tbk": 20,
-"tl": 43291,
-"mb": 3072,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1495,
-1496,
-1497,
-2851,
-743
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5915,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-265,
-157,
-158,
-7,
-2394
-]
-},
-{
-"tb": 576,
-"tbk": 144,
-"tl": 532403,
-"mb": 12,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-2852
-]
-},
-{
-"tb": 560,
-"tbk": 5,
-"tl": 301981,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-257,
-2143,
-926,
-701,
-927
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 242,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-539,
-540,
-880,
-881,
-41,
-45,
-46
-]
-},
-{
-"tb": 374752,
-"tbk": 196,
-"tl": 12682466272,
-"mb": 374752,
-"mbk": 196,
-"gb": 374752,
-"gbk": 196,
-"eb": 374752,
-"ebk": 196,
-"fs": [
-211,
-2853,
-2854,
-2855,
-2856,
-214,
-215,
-216
-]
-},
-{
-"tb": 102032,
-"tbk": 911,
-"tl": 611140,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-143,
-144,
-444,
-304,
-305
-]
-},
-{
-"tb": 59520,
-"tbk": 915,
-"tl": 20715,
-"mb": 128,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-351,
-1020,
-1021,
-1022,
-1023,
-1024,
-1025,
-1026,
-2123,
-1028
-]
-},
-{
-"tb": 1498824,
-"tbk": 3324,
-"tl": 90679,
-"mb": 2552,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-2857,
-2858,
-2859,
-2860
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 9856,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-924,
-1578,
-1579,
-7,
-167
-]
-},
-{
-"tb": 640,
-"tbk": 16,
-"tl": 1631,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-573,
-574,
-45,
-46,
-85,
-46
-]
-},
-{
-"tb": 78400,
-"tbk": 200,
-"tl": 12941110164,
-"mb": 78400,
-"mbk": 200,
-"gb": 78400,
-"gbk": 200,
-"eb": 78400,
-"ebk": 200,
-"fs": [
-211,
-2861,
-2862,
-2863,
-696,
-869,
-870,
-2864
-]
-},
-{
-"tb": 918288,
-"tbk": 8199,
-"tl": 274242,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-143,
-144,
-444,
-718,
-719
-]
-},
-{
-"tb": 122112,
-"tbk": 1696,
-"tl": 2127095,
-"mb": 360,
-"mbk": 5,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-2865,
-2866,
-124,
-125,
-126
-]
-},
-{
-"tb": 448,
-"tbk": 28,
-"tl": 1268,
-"mb": 16,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-2729,
-2730,
-2731,
-2732,
-2733,
-2734,
-2735,
-2736,
-2867
-]
-},
-{
-"tb": 5376,
-"tbk": 48,
-"tl": 30451,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-490,
-491,
-492,
-7,
-968
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5889,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1029,
-1030,
-1031,
-7,
-1930
-]
-},
-{
-"tb": 1280,
-"tbk": 32,
-"tl": 3389,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-39,
-40,
-46,
-85,
-46
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 4436,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-283,
-840,
-841,
-7,
-8
-]
-},
-{
-"tb": 979680,
-"tbk": 1985,
-"tl": 58260,
-"mb": 960,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-133,
-2868,
-2869,
-2870,
-2871,
-2872,
-2873,
-2874,
-2875,
-2876
-]
-},
-{
-"tb": 2968,
-"tbk": 53,
-"tl": 203,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-83,
-896,
-85,
-85,
-85,
-47
-]
-},
-{
-"tb": 80,
-"tbk": 2,
-"tl": 260,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-326,
-327,
-834,
-835,
-836,
-910,
-838
-]
-},
-{
-"tb": 1200,
-"tbk": 30,
-"tl": 3129,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-117,
-118,
-118,
-46,
-46
-]
-},
-{
-"tb": 139008,
-"tbk": 712,
-"tl": 13291,
-"mb": 288,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-2369,
-2877,
-2878,
-2879,
-2880,
-2881,
-2882,
-2883,
-2884
-]
-},
-{
-"tb": 44160,
-"tbk": 690,
-"tl": 390741,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-2273,
-1565,
-1566,
-1567,
-1568,
-2743
-]
-},
-{
-"tb": 123200,
-"tbk": 440,
-"tl": 94126,
-"mb": 1120,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-2753,
-2754,
-2755,
-2756,
-2757,
-2885
-]
-},
-{
-"tb": 73504,
-"tbk": 2297,
-"tl": 607259,
-"mb": 32,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-2051,
-2052,
-2886,
-2887,
-2888,
-2889,
-2890
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6741,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-697,
-888,
-889,
-7,
-968
-]
-},
-{
-"tb": 896,
-"tbk": 4,
-"tl": 14321,
-"mb": 224,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-2891,
-2892,
-1638,
-862,
-863,
-864,
-215
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 1573,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-330,
-5,
-6,
-7,
-968
-]
-},
-{
-"tb": 3024,
-"tbk": 27,
-"tl": 1548217,
-"mb": 336,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-884,
-2893,
-2894,
-2895,
-2896
-]
-},
-{
-"tb": 2880,
-"tbk": 40,
-"tl": 45738,
-"mb": 144,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-2897,
-2810,
-1783,
-1820,
-124
-]
-},
-{
-"tb": 80,
-"tbk": 2,
-"tl": 114255,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-1265,
-2335,
-1630,
-1224,
-1225
-]
-},
-{
-"tb": 40,
-"tbk": 1,
-"tl": 64598340,
-"mb": 40,
-"mbk": 1,
-"gb": 40,
-"gbk": 1,
-"eb": 40,
-"ebk": 1,
-"fs": [
-1,
-26,
-27,
-28,
-2898,
-2899,
-2900,
-2901,
-2902
-]
-},
-{
-"tb": 1119360,
-"tbk": 7770,
-"tl": 1737609,
-"mb": 288,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-288,
-2903,
-2904,
-2905,
-2906,
-2907,
-2908,
-2909,
-2910
-]
-},
-{
-"tb": 73920,
-"tbk": 420,
-"tl": 16201,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-100,
-806,
-425,
-103,
-426
-]
-},
-{
-"tb": 4048,
-"tbk": 23,
-"tl": 3366,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-100,
-806,
-102,
-103,
-104
-]
-},
-{
-"tb": 928,
-"tbk": 232,
-"tl": 829159,
-"mb": 12,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-2911
-]
-},
-{
-"tb": 44800,
-"tbk": 200,
-"tl": 14112,
-"mb": 448,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-2352,
-2353,
-860,
-861,
-862,
-863,
-864
-]
-},
-{
-"tb": 10240,
-"tbk": 216,
-"tl": 12941274088,
-"mb": 8320,
-"mbk": 200,
-"gb": 8320,
-"gbk": 200,
-"eb": 8320,
-"ebk": 200,
-"fs": [
-204,
-205,
-2912,
-2913,
-2914,
-2915,
-302
-]
-},
-{
-"tb": 2336,
-"tbk": 73,
-"tl": 53524,
-"mb": 64,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-757,
-758,
-759,
-760,
-761,
-762,
-2916
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 848,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-117,
-443,
-443,
-46,
-85
-]
-},
-{
-"tb": 11264,
-"tbk": 64,
-"tl": 18424,
-"mb": 528,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-1682,
-935,
-936,
-937,
-1504
-]
-},
-{
-"tb": 24320,
-"tbk": 608,
-"tl": 19235010,
-"mb": 320,
-"mbk": 8,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-26,
-27,
-2407,
-2408,
-2819,
-2917,
-2918
-]
-},
-{
-"tb": 1800,
-"tbk": 45,
-"tl": 108,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1440,
-1441,
-1442,
-2728,
-2728,
-1443,
-1444
-]
-},
-{
-"tb": 186848,
-"tbk": 800,
-"tl": 366227,
-"mb": 620,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-2919,
-2920,
-2921,
-2922
-]
-},
-{
-"tb": 96,
-"tbk": 4,
-"tl": 83,
-"mb": 24,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-273,
-2923,
-2924,
-2925,
-2926,
-2927,
-2928,
-2929,
-2930
-]
-},
-{
-"tb": 418104,
-"tbk": 5807,
-"tl": 35230507,
-"mb": 432,
-"mbk": 6,
-"gb": 216,
-"gbk": 3,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-446,
-447,
-2931,
-2932,
-2933,
-2934,
-2935
-]
-},
-{
-"tb": 158112,
-"tbk": 409,
-"tl": 5992,
-"mb": 672,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-1180,
-2936,
-2937,
-2938,
-2939,
-2940,
-2941,
-2942,
-2943
-]
-},
-{
-"tb": 500864,
-"tbk": 4472,
-"tl": 2342764,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-808,
-144,
-145,
-7,
-387
-]
-},
-{
-"tb": 522368,
-"tbk": 4664,
-"tl": 662251,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-330,
-5,
-982,
-598,
-599
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 105,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-313,
-314,
-402,
-118,
-46,
-85,
-85
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 766,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-1221,
-42,
-40,
-42,
-40
-]
-},
-{
-"tb": 204288,
-"tbk": 608,
-"tl": 524186,
-"mb": 1008,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-518,
-914,
-915,
-2944,
-2945,
-2946
-]
-},
-{
-"tb": 3520,
-"tbk": 20,
-"tl": 4073,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-252,
-342,
-343,
-344,
-345
-]
-},
-{
-"tb": 11648,
-"tbk": 104,
-"tl": 71546,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-884,
-885,
-886,
-7,
-56
-]
-},
-{
-"tb": 640,
-"tbk": 16,
-"tl": 1570,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-392,
-393,
-46,
-85,
-85,
-46
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5408,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-439,
-440,
-441,
-7,
-8
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 4509,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-839,
-840,
-841,
-7,
-8
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 8908,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1282,
-840,
-841,
-7,
-146
-]
-},
-{
-"tb": 26544,
-"tbk": 121,
-"tl": 84461,
-"mb": 896,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2947,
-2948,
-2949,
-636,
-637,
-1732
-]
-},
-{
-"tb": 29568,
-"tbk": 264,
-"tl": 195351,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-839,
-840,
-841,
-7,
-56
-]
-},
-{
-"tb": 47360,
-"tbk": 40,
-"tl": 5004,
-"mb": 1184,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-2950,
-2951,
-2952,
-2953,
-2954
-]
-},
-{
-"tb": 386048,
-"tbk": 458,
-"tl": 13868,
-"mb": 1664,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-580,
-581,
-582,
-2955,
-1806
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6600,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-720,
-502,
-503,
-7,
-89
-]
-},
-{
-"tb": 40,
-"tbk": 1,
-"tl": 64598866,
-"mb": 40,
-"mbk": 1,
-"gb": 40,
-"gbk": 1,
-"eb": 40,
-"ebk": 1,
-"fs": [
-1,
-26,
-27,
-28,
-2956,
-2957,
-2958,
-2959,
-2960
-]
-},
-{
-"tb": 128,
-"tbk": 16,
-"tl": 7427,
-"mb": 8,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-675,
-676,
-677,
-678,
-679,
-680,
-2961,
-682
-]
-},
-{
-"tb": 12480,
-"tbk": 15,
-"tl": 1003,
-"mb": 832,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-580,
-581,
-582,
-2962,
-2527
-]
-},
-{
-"tb": 99,
-"tbk": 10,
-"tl": 16,
-"mb": 15,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-1394,
-1395,
-1396,
-1435,
-668
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 12499,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1282,
-840,
-841,
-7,
-167
-]
-},
-{
-"tb": 13584,
-"tbk": 283,
-"tl": 4948,
-"mb": 48,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1559,
-1560,
-603,
-604,
-229,
-605,
-1561
-]
-},
-{
-"tb": 3584,
-"tbk": 32,
-"tl": 15618,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1160,
-1263,
-1264,
-7,
-56
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 827,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-392,
-2963,
-2964,
-375,
-376,
-377
-]
-},
-{
-"tb": 378560,
-"tbk": 3380,
-"tl": 478663,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-265,
-157,
-2124,
-1745,
-2125
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 4667,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-156,
-157,
-158,
-7,
-887
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 797,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-392,
-393,
-45,
-45,
-46,
-85
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 8588,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-330,
-5,
-6,
-7,
-230
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 11445,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1160,
-1263,
-1264,
-7,
-8
-]
-},
-{
-"tb": 14336,
-"tbk": 128,
-"tl": 106269,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1282,
-840,
-841,
-7,
-89
-]
-},
-{
-"tb": 72960,
-"tbk": 304,
-"tl": 1289615,
-"mb": 640,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-148,
-149,
-150,
-151,
-152,
-2965,
-2966,
-2967
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5784,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-156,
-157,
-158,
-7,
-146
-]
-},
-{
-"tb": 512,
-"tbk": 8,
-"tl": 140,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1594,
-1595,
-1596,
-881,
-45,
-45,
-46
-]
-},
-{
-"tb": 960,
-"tbk": 24,
-"tl": 2530,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-39,
-40,
-443,
-46,
-85
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 802,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-392,
-393,
-45,
-118,
-46,
-85
-]
-},
-{
-"tb": 112,
-"tbk": 1,
-"tl": 73512,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-830,
-831,
-832,
-1224,
-1225
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6106,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-830,
-1263,
-1264,
-7,
-1930
-]
-},
-{
-"tb": 24448,
-"tbk": 764,
-"tl": 19252,
-"mb": 32,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1920,
-1921,
-1922,
-1965,
-2968
-]
-},
-{
-"tb": 49280,
-"tbk": 440,
-"tl": 309630,
-"mb": 336,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-265,
-157,
-158,
-7,
-230
-]
-},
-{
-"tb": 12288,
-"tbk": 128,
-"tl": 4505,
-"mb": 96,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-734,
-735,
-736,
-737,
-2969
-]
-},
-{
-"tb": 4480,
-"tbk": 40,
-"tl": 29296,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-156,
-157,
-158,
-7,
-282
-]
-},
-{
-"tb": 12544,
-"tbk": 196,
-"tl": 54100,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-2970,
-2971,
-2972,
-2973,
-2549
-]
-},
-{
-"tb": 23856,
-"tbk": 213,
-"tl": 14365707,
-"mb": 560,
-"mbk": 5,
-"gb": 112,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-156,
-2974,
-629,
-630,
-631
-]
-},
-{
-"tb": 48,
-"tbk": 1,
-"tl": 64598169,
-"mb": 48,
-"mbk": 1,
-"gb": 48,
-"gbk": 1,
-"eb": 48,
-"ebk": 1,
-"fs": [
-1,
-416,
-417,
-1217,
-390,
-391,
-23,
-24,
-25
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 21368,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1282,
-840,
-841,
-7,
-230
-]
-},
-{
-"tb": 773136,
-"tbk": 6903,
-"tl": 527092,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-808,
-144,
-807,
-718,
-719
-]
-},
-{
-"tb": 8960,
-"tbk": 80,
-"tl": 43589,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-490,
-491,
-492,
-7,
-230
-]
-},
-{
-"tb": 1960,
-"tbk": 1,
-"tl": 64593668,
-"mb": 1960,
-"mbk": 1,
-"gb": 1960,
-"gbk": 1,
-"eb": 1960,
-"ebk": 1,
-"fs": [
-64,
-1130,
-1131,
-1132,
-1133,
-1134,
-1135,
-2975,
-2976,
-2977
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 1583,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-490,
-491,
-492,
-7,
-2394
-]
-},
-{
-"tb": 4608,
-"tbk": 64,
-"tl": 84470,
-"mb": 216,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-2978,
-1819,
-1783,
-1820,
-124
-]
-},
-{
-"tb": 528,
-"tbk": 3,
-"tl": 958,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-457,
-458,
-1925,
-460,
-1485
-]
-},
-{
-"tb": 77040,
-"tbk": 1605,
-"tl": 379252,
-"mb": 48,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1011,
-1012,
-851,
-1014,
-1015,
-421,
-422
-]
-},
-{
-"tb": 2497760,
-"tbk": 2330,
-"tl": 10756907,
-"mb": 5360,
-"mbk": 5,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-2979,
-2980,
-2981,
-2982,
-2983,
-2984
-]
-},
-{
-"tb": 2720,
-"tbk": 68,
-"tl": 27997,
-"mb": 200,
-"mbk": 5,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-26,
-27,
-2407,
-2408,
-2819,
-2985,
-2986
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 15977,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1282,
-840,
-841,
-7,
-159
-]
-},
-{
-"tb": 24,
-"tbk": 1,
-"tl": 405,
-"mb": 24,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-494,
-495,
-496,
-497,
-1304,
-1304,
-1304
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 861,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-2987,
-118,
-45,
-46,
-85
-]
-},
-{
-"tb": 6272,
-"tbk": 56,
-"tl": 36922,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1272,
-1030,
-1031,
-7,
-56
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6467,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-720,
-502,
-503,
-7,
-230
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 10130,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1029,
-1030,
-1031,
-7,
-230
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 7025,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-697,
-888,
-889,
-7,
-887
-]
-},
-{
-"tb": 2207040,
-"tbk": 3135,
-"tl": 64522,
-"mb": 704,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-2988,
-2989,
-2990,
-2991,
-438
-]
-},
-{
-"tb": 65296,
-"tbk": 371,
-"tl": 23880,
-"mb": 880,
-"mbk": 5,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-423,
-1200,
-425,
-103,
-104
-]
-},
-{
-"tb": 50,
-"tbk": 1,
-"tl": 52,
-"mb": 50,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1649,
-1650,
-1651,
-1652,
-1653,
-1654,
-1655,
-1656,
-1657,
-1658,
-1659,
-1660,
-1661,
-2992,
-1671
-]
-},
-{
-"tb": 56,
-"tbk": 1,
-"tl": 64598530,
-"mb": 56,
-"mbk": 1,
-"gb": 56,
-"gbk": 1,
-"eb": 56,
-"ebk": 1,
-"fs": [
-1,
-555,
-2410,
-741,
-742,
-23,
-24,
-25
-]
-},
-{
-"tb": 179712,
-"tbk": 648,
-"tl": 67586,
-"mb": 768,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-2993,
-2994,
-2995,
-2996,
-2997
-]
-},
-{
-"tb": 64480,
-"tbk": 1262,
-"tl": 1281035,
-"mb": 208,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-2998,
-2999,
-3000,
-3001,
-3002,
-3003,
-3004,
-3005,
-3006,
-3007
-]
-},
-{
-"tb": 179760,
-"tbk": 1605,
-"tl": 364353,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-388,
-851,
-1014,
-1015,
-421,
-422
-]
-},
-{
-"tb": 513600,
-"tbk": 12840,
-"tl": 1685288,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-313,
-314,
-315,
-3008,
-3009,
-3010,
-3011
-]
-},
-{
-"tb": 924480,
-"tbk": 12840,
-"tl": 44537120,
-"mb": 72,
-"mbk": 1,
-"gb": 72,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-446,
-447,
-448,
-3012,
-450,
-451,
-452
-]
-},
-{
-"tb": 3287040,
-"tbk": 12840,
-"tl": 7689024,
-"mb": 256,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1967,
-3013,
-3014,
-3015,
-3016,
-3017,
-3018,
-3019,
-3020,
-3021
-]
-},
-{
-"tb": 1058080,
-"tbk": 1945,
-"tl": 189173,
-"mb": 2176,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-3022,
-3023,
-3024,
-3025,
-3026,
-3027
-]
-},
-{
-"tb": 1129920,
-"tbk": 1605,
-"tl": 69412,
-"mb": 704,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-3028,
-3029,
-3030,
-3031,
-3032,
-3033,
-3034,
-3035,
-3036,
-3037
-]
-},
-{
-"tb": 21472,
-"tbk": 244,
-"tl": 4007,
-"mb": 88,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1693,
-1694,
-227,
-228,
-229,
-605,
-1561
-]
-},
-{
-"tb": 1640,
-"tbk": 41,
-"tl": 4228,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-117,
-46,
-85,
-46,
-47
-]
-},
-{
-"tb": 544,
-"tbk": 272,
-"tl": 942696,
-"mb": 6,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-412,
-413,
-414,
-3038
-]
-},
-{
-"tb": 576,
-"tbk": 8,
-"tl": 73939,
-"mb": 72,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-3039,
-3040,
-3041,
-3042,
-312,
-237,
-238
-]
-},
-{
-"tb": 899864,
-"tbk": 181000,
-"tl": 400720130,
-"mb": 131,
-"mbk": 29,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-2670,
-3043,
-3044
-]
-},
-{
-"tb": 7168,
-"tbk": 64,
-"tl": 45177,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-105,
-106,
-107,
-7,
-159
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5619,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-86,
-87,
-88,
-7,
-1639
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 9940,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-627,
-370,
-371,
-7,
-132
-]
-},
-{
-"tb": 2576,
-"tbk": 46,
-"tl": 96,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-2229,
-2550,
-2551,
-3045,
-664,
-2828,
-3046,
-3047
-]
-},
-{
-"tb": 918288,
-"tbk": 8199,
-"tl": 195426,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-808,
-144,
-444,
-718,
-719
-]
-},
-{
-"tb": 385200,
-"tbk": 1605,
-"tl": 1685842,
-"mb": 240,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-3048,
-421,
-422,
-2023,
-605,
-1561
-]
-},
-{
-"tb": 27648,
-"tbk": 384,
-"tl": 430107,
-"mb": 216,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-3049,
-3050,
-124,
-125,
-126
-]
-},
-{
-"tb": 112,
-"tbk": 1,
-"tl": 64597676,
-"mb": 112,
-"mbk": 1,
-"gb": 112,
-"gbk": 1,
-"eb": 112,
-"ebk": 1,
-"fs": [
-1,
-388,
-1013,
-390,
-391,
-23,
-24,
-25
-]
-},
-{
-"tb": 1451060,
-"tbk": 1605,
-"tl": 55845664,
-"mb": 3360,
-"mbk": 1,
-"gb": 852,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-3051,
-3052,
-3053,
-3054
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 10829,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1282,
-840,
-841,
-7,
-913
-]
-},
-{
-"tb": 3720,
-"tbk": 93,
-"tl": 2143904,
-"mb": 240,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-1201,
-1202,
-1203,
-1204,
-378
-]
-},
-{
-"tb": 1088,
-"tbk": 17,
-"tl": 432166,
-"mb": 128,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-266,
-267,
-268,
-1856,
-1857,
-1304,
-1305
-]
-},
-{
-"tb": 88704,
-"tbk": 504,
-"tl": 181556,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-706,
-1821,
-2560,
-2561,
-708
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 846,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-117,
-443,
-46,
-85,
-46
-]
-},
-{
-"tb": 15152,
-"tbk": 947,
-"tl": 182306,
-"mb": 16,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1218,
-1219,
-94,
-95,
-820,
-229,
-605
-]
-},
-{
-"tb": 256,
-"tbk": 2,
-"tl": 110,
-"mb": 128,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1503,
-936,
-937,
-1504,
-1505,
-3055
-]
-},
-{
-"tb": 1344,
-"tbk": 8,
-"tl": 156,
-"mb": 168,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1165,
-1549,
-1550,
-1551,
-1552,
-1553,
-1554,
-1555,
-1556,
-3056
-]
-},
-{
-"tb": 176576,
-"tbk": 2759,
-"tl": 173363,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-3057,
-3058,
-3059,
-3060,
-3061,
-2104,
-2105
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 8559,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-627,
-370,
-371,
-7,
-1287
-]
-},
-{
-"tb": 352,
-"tbk": 2,
-"tl": 247,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-100,
-1200,
-102,
-103,
-104
-]
-},
-{
-"tb": 17024,
-"tbk": 1064,
-"tl": 19267,
-"mb": 16,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-3062,
-3063,
-603,
-604,
-229,
-605,
-1561
-]
-},
-{
-"tb": 9216,
-"tbk": 288,
-"tl": 9356,
-"mb": 32,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-3064,
-3065,
-3066,
-3067,
-3068
-]
-},
-{
-"tb": 4048,
-"tbk": 23,
-"tl": 3107,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-1784,
-3069,
-1786,
-1787,
-1512
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 5222,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-627,
-370,
-371,
-7,
-230
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 891,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-3070,
-3071,
-3072,
-476,
-477,
-377
-]
-},
-{
-"tb": 405884,
-"tbk": 3499,
-"tl": 236814,
-"mb": 464,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-3073,
-3074,
-3075,
-3076
-]
-},
-{
-"tb": 8960,
-"tbk": 80,
-"tl": 48097,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-143,
-144,
-145,
-7,
-56
-]
-},
-{
-"tb": 448,
-"tbk": 8,
-"tl": 16,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-83,
-896,
-443,
-118,
-46,
-85
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 518,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1165,
-1549,
-1550,
-1551,
-1552,
-1553,
-1554,
-1555,
-1556,
-3077
-]
-},
-{
-"tb": 80250,
-"tbk": 1605,
-"tl": 42751,
-"mb": 50,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1649,
-1650,
-1651,
-1652,
-1653,
-1654,
-1655,
-1656,
-1657,
-1658,
-1659,
-1660,
-1661,
-1662,
-1673,
-452,
-596
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6364,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-86,
-87,
-88,
-7,
-8
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 2076,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-839,
-840,
-841,
-7,
-1647
-]
-},
-{
-"tb": 30528,
-"tbk": 424,
-"tl": 2681066,
-"mb": 3816,
-"mbk": 53,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-3078,
-3079,
-3080,
-236,
-237,
-238,
-932
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 9952,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-924,
-1578,
-1579,
-7,
-2404
-]
-},
-{
-"tb": 299808,
-"tbk": 3091,
-"tl": 61104,
-"mb": 192,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-734,
-735,
-736,
-737,
-3081
-]
-},
-{
-"tb": 876000,
-"tbk": 1769,
-"tl": 3764035,
-"mb": 1920,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-3082,
-3083,
-3084,
-3085,
-3086,
-3087,
-3088,
-3089,
-3090,
-3091
-]
-},
-{
-"tb": 1024,
-"tbk": 16,
-"tl": 316,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1594,
-1595,
-1596,
-881,
-46,
-46,
-47
-]
-},
-{
-"tb": 2877248,
-"tbk": 2684,
-"tl": 919546,
-"mb": 7504,
-"mbk": 7,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-2979,
-2980,
-2981,
-2982,
-2983,
-3092
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 9779,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-369,
-370,
-371,
-7,
-132
-]
-},
-{
-"tb": 291600,
-"tbk": 405,
-"tl": 289684,
-"mb": 2880,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-3093,
-3094,
-3095,
-3096,
-3097,
-3098
-]
-},
-{
-"tb": 115920,
-"tbk": 1035,
-"tl": 58585068,
-"mb": 672,
-"mbk": 6,
-"gb": 224,
-"gbk": 2,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-143,
-3099,
-3100,
-3101,
-3102
-]
-},
-{
-"tb": 210816,
-"tbk": 2928,
-"tl": 1381394,
-"mb": 216,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-446,
-447,
-3103,
-3104,
-3105,
-3106,
-3107
-]
-},
-{
-"tb": 42048,
-"tbk": 584,
-"tl": 753979,
-"mb": 216,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-3108,
-1101,
-1102,
-1103,
-1104
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6690,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1160,
-1263,
-1264,
-7,
-167
-]
-},
-{
-"tb": 77040,
-"tbk": 1605,
-"tl": 410987,
-"mb": 48,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-416,
-417,
-2410,
-419,
-420,
-421,
-422
-]
-},
-{
-"tb": 78400,
-"tbk": 200,
-"tl": 12941193255,
-"mb": 78400,
-"mbk": 200,
-"gb": 78400,
-"gbk": 200,
-"eb": 78400,
-"ebk": 200,
-"fs": [
-211,
-2861,
-2862,
-2863,
-696,
-869,
-870,
-3109
-]
-},
-{
-"tb": 192,
-"tbk": 3,
-"tl": 195,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-266,
-267,
-1805,
-1664,
-1806,
-461,
-2707
-]
-},
-{
-"tb": 40,
-"tbk": 1,
-"tl": 64597917,
-"mb": 40,
-"mbk": 1,
-"gb": 40,
-"gbk": 1,
-"eb": 40,
-"ebk": 1,
-"fs": [
-1,
-26,
-27,
-28,
-3110,
-3111,
-3112,
-3113,
-3114
-]
-},
-{
-"tb": 23856,
-"tbk": 213,
-"tl": 14367710,
-"mb": 560,
-"mbk": 5,
-"gb": 112,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-265,
-2974,
-629,
-630,
-631
-]
-},
-{
-"tb": 29120,
-"tbk": 104,
-"tl": 57301,
-"mb": 840,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1851,
-1852,
-3115,
-3116,
-193,
-194
-]
-},
-{
-"tb": 68800,
-"tbk": 213,
-"tl": 283812,
-"mb": 2240,
-"mbk": 7,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-3117,
-3118,
-3119,
-3120,
-3121
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 823,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-2529,
-118,
-46,
-46,
-47
-]
-},
-{
-"tb": 640,
-"tbk": 8,
-"tl": 1034,
-"mb": 80,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1052,
-896,
-670,
-670,
-46,
-85
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 11360,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1160,
-1263,
-1264,
-7,
-230
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 116,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-313,
-314,
-402,
-45,
-46,
-85,
-46
-]
-},
-{
-"tb": 5568,
-"tbk": 6,
-"tl": 1643,
-"mb": 928,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1388,
-1389,
-1390,
-2122,
-1027
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 856,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-39,
-40,
-46,
-85,
-85
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 918,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-1221,
-41,
-46,
-46,
-47
-]
-},
-{
-"tb": 89880,
-"tbk": 1605,
-"tl": 430024,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-555,
-1059,
-419,
-420,
-421,
-422
-]
-},
-{
-"tb": 1584,
-"tbk": 9,
-"tl": 1411,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-706,
-755,
-1438,
-709,
-756
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 13243,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-156,
-157,
-158,
-7,
-464
-]
-},
-{
-"tb": 115920,
-"tbk": 1035,
-"tl": 58577054,
-"mb": 672,
-"mbk": 6,
-"gb": 224,
-"gbk": 2,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-808,
-3099,
-3100,
-3101,
-3102
-]
-},
-{
-"tb": 440,
-"tbk": 11,
-"tl": 617124,
-"mb": 80,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-160,
-161,
-3122,
-3123,
-3124,
-1792,
-669
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 11616,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1665,
-1666,
-1667,
-7,
-89
-]
-},
-{
-"tb": 480,
-"tbk": 120,
-"tl": 449094,
-"mb": 8,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-3125
-]
-},
-{
-"tb": 1536,
-"tbk": 24,
-"tl": 474,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1594,
-1595,
-1596,
-881,
-46,
-85,
-85
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 4362,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1282,
-840,
-841,
-7,
-8
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 8468,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-665,
-945,
-946,
-7,
-1399
-]
-},
-{
-"tb": 64,
-"tbk": 1,
-"tl": 400,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-2476,
-2477,
-2478,
-1857,
-1304,
-1304,
-1305
-]
-},
-{
-"tb": 8064,
-"tbk": 72,
-"tl": 31153,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-711,
-440,
-441,
-7,
-132
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 22,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-313,
-314,
-402,
-45,
-119,
-46,
-85
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 768,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-723,
-46,
-85,
-46,
-47,
-403
-]
-},
-{
-"tb": 133936,
-"tbk": 761,
-"tl": 203231,
-"mb": 528,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-100,
-806,
-102,
-103,
-426
-]
-},
-{
-"tb": 720,
-"tbk": 144,
-"tl": 510065,
-"mb": 15,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-3126
-]
-},
-{
-"tb": 4082624,
-"tbk": 5608,
-"tl": 5246654,
-"mb": 13104,
-"mbk": 18,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2536,
-2537,
-2538,
-2539,
-3127,
-3128,
-636
-]
-},
-{
-"tb": 5376,
-"tbk": 48,
-"tl": 2938822,
-"mb": 336,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-105,
-2144,
-2145,
-927,
-2655
-]
-},
-{
-"tb": 1183488,
-"tbk": 2336,
-"tl": 291353,
-"mb": 3000,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-3129,
-3130,
-3131,
-3132
-]
-},
-{
-"tb": 448,
-"tbk": 7,
-"tl": 1969,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-2476,
-2477,
-2478,
-1857,
-1305,
-1306,
-2149
-]
-},
-{
-"tb": 2288,
-"tbk": 13,
-"tl": 2380,
-"mb": 528,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-2804,
-2805,
-3133,
-2807,
-2808
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 4650,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-501,
-502,
-503,
-7,
-56
-]
-},
-{
-"tb": 795904,
-"tbk": 3109,
-"tl": 212085,
-"mb": 256,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-3134,
-3135,
-3136,
-3137,
-3138
-]
-},
-{
-"tb": 45312,
-"tbk": 95,
-"tl": 1718401,
-"mb": 3072,
-"mbk": 5,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-3139,
-3140,
-3141,
-3142,
-3143,
-3144,
-3145,
-3146,
-3147,
-3148
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 12954,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-839,
-840,
-841,
-7,
-167
-]
-},
-{
-"tb": 680,
-"tbk": 17,
-"tl": 27,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-379,
-380,
-381,
-382,
-383,
-1908,
-1909,
-1904
-]
-},
-{
-"tb": 2337380,
-"tbk": 1621,
-"tl": 57381509,
-"mb": 4268,
-"mbk": 2,
-"gb": 1428,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-3149,
-3150,
-3151,
-3152
-]
-},
-{
-"tb": 1056,
-"tbk": 6,
-"tl": 1766,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-909,
-836,
-837,
-838,
-1485
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 13524,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-839,
-840,
-841,
-7,
-132
-]
-},
-{
-"tb": 1120,
-"tbk": 10,
-"tl": 599244,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-369,
-628,
-629,
-630,
-631
-]
-},
-{
-"tb": 784,
-"tbk": 14,
-"tl": 17,
-"mb": 56,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-2229,
-2550,
-2551,
-2552,
-3153,
-3154,
-3155,
-3156
-]
-},
-{
-"tb": 5376,
-"tbk": 24,
-"tl": 24693,
-"mb": 224,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1165,
-3157,
-3158,
-3159,
-3160,
-3161,
-3162,
-3163,
-3164,
-3165
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 808,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-2016,
-46,
-85,
-46,
-47
-]
-},
-{
-"tb": 832,
-"tbk": 13,
-"tl": 5608,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-953,
-954,
-955,
-956,
-957,
-3166
-]
-},
-{
-"tb": 192256,
-"tbk": 2692,
-"tl": 68883051967,
-"mb": 95008,
-"mbk": 1092,
-"gb": 95008,
-"gbk": 1092,
-"eb": 95008,
-"ebk": 1092,
-"fs": [
-204,
-205,
-692,
-3167,
-3168,
-3169,
-3170,
-3171
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 182288,
-"mb": 80,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-26,
-27,
-1206,
-1207,
-3172,
-1792,
-669
-]
-},
-{
-"tb": 181,
-"tbk": 10,
-"tl": 13,
-"mb": 32,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-168,
-2192,
-2193,
-2194,
-2195,
-2196,
-2197,
-2198,
-2199,
-2200,
-2201,
-2202,
-179,
-2191,
-3173,
-3174,
-3175
-]
-},
-{
-"tb": 7488,
-"tbk": 18,
-"tl": 473,
-"mb": 416,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-3176,
-3177,
-3178,
-3179,
-3180,
-3181,
-3182,
-3183,
-3184
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 837,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-691,
-42,
-40,
-46,
-85
-]
-},
-{
-"tb": 69888,
-"tbk": 760,
-"tl": 759924,
-"mb": 672,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1734,
-2047,
-2048,
-2049,
-1054,
-1055,
-1056,
-2050,
-115,
-116
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 832,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-2987,
-306,
-42,
-40,
-46
-]
-},
-{
-"tb": 2784,
-"tbk": 3,
-"tl": 1178,
-"mb": 928,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1388,
-1389,
-1390,
-3185,
-1703
-]
-},
-{
-"tb": 5691680,
-"tbk": 1609,
-"tl": 64643050,
-"mb": 5919,
-"mbk": 1,
-"gb": 3832,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1235,
-1236,
-1237,
-1238,
-1239,
-1240,
-1241,
-3186,
-3187,
-452,
-596
-]
-},
-{
-"tb": 14336,
-"tbk": 416,
-"tl": 35812,
-"mb": 128,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-3188,
-3189,
-3190,
-3191,
-869
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 1887,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-265,
-157,
-158,
-7,
-913
-]
-},
-{
-"tb": 4480,
-"tbk": 40,
-"tl": 19596,
-"mb": 224,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-697,
-888,
-889,
-7,
-442
-]
-},
-{
-"tb": 680,
-"tbk": 1,
-"tl": 522,
-"mb": 680,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2530,
-390,
-391,
-23,
-24,
-25,
-1033
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 823,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-117,
-45,
-46,
-85,
-46
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 4733,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-265,
-157,
-158,
-7,
-887
-]
-},
-{
-"tb": 40,
-"tbk": 1,
-"tl": 139,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1699,
-1700,
-1825,
-2528,
-1664,
-1806,
-1485
-]
-},
-{
-"tb": 48,
-"tbk": 1,
-"tl": 64597317,
-"mb": 48,
-"mbk": 1,
-"gb": 48,
-"gbk": 1,
-"eb": 48,
-"ebk": 1,
-"fs": [
-1,
-18,
-19,
-463,
-21,
-22,
-23,
-24,
-25
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 12724,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-283,
-840,
-841,
-7,
-167
-]
-},
-{
-"tb": 74416,
-"tbk": 301,
-"tl": 11480464158,
-"mb": 47228,
-"mbk": 183,
-"gb": 46812,
-"gbk": 182,
-"eb": 46812,
-"ebk": 182,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-3192,
-3193,
-3194,
-3195
-]
-},
-{
-"tb": 37880,
-"tbk": 947,
-"tl": 191618,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-91,
-92,
-93,
-94,
-95,
-820,
-229
-]
-},
-{
-"tb": 188832,
-"tbk": 1945,
-"tl": 79555,
-"mb": 168,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-891,
-3196,
-3197,
-3198,
-3199,
-3200
-]
-},
-{
-"tb": 68800,
-"tbk": 1720,
-"tl": 5585,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1771,
-1772,
-1773,
-3201,
-3202,
-3203,
-3204
-]
-},
-{
-"tb": 199160,
-"tbk": 33688,
-"tl": 78503889,
-"mb": 100,
-"mbk": 12,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-3205,
-3206,
-3207
-]
-},
-{
-"tb": 336,
-"tbk": 168,
-"tl": 661982,
-"mb": 4,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-412,
-413,
-414,
-3208
-]
-},
-{
-"tb": 43008,
-"tbk": 168,
-"tl": 48996,
-"mb": 256,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-2308,
-2309,
-2310,
-3209,
-3210
-]
-},
-{
-"tb": 35616,
-"tbk": 168,
-"tl": 2819,
-"mb": 212,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-3211,
-3212,
-3213,
-3214
-]
-},
-{
-"tb": 56000,
-"tbk": 1750,
-"tl": 615317,
-"mb": 224,
-"mbk": 7,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-809,
-810,
-811,
-812,
-498,
-499,
-500
-]
-},
-{
-"tb": 400,
-"tbk": 10,
-"tl": 2407,
-"mb": 80,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-2082,
-2083,
-2084,
-2085,
-2086,
-584,
-461
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 4205,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-490,
-491,
-492,
-7,
-282
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 862,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1339,
-1340,
-45,
-46,
-85,
-85
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 909,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-473,
-3215,
-3216,
-476,
-477,
-377
-]
-},
-{
-"tb": 4480,
-"tbk": 40,
-"tl": 21919,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-490,
-491,
-492,
-7,
-159
-]
-},
-{
-"tb": 1792,
-"tbk": 32,
-"tl": 3572,
-"mb": 112,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-658,
-659,
-660,
-661,
-764,
-1220,
-2146
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5977,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-702,
-258,
-259,
-7,
-913
-]
-},
-{
-"tb": 222208,
-"tbk": 248,
-"tl": 102100,
-"mb": 1792,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1175,
-1176,
-1177,
-3217,
-1638
-]
-},
-{
-"tb": 54752,
-"tbk": 54,
-"tl": 14435,
-"mb": 1856,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1388,
-1389,
-1390,
-3218,
-3219
-]
-},
-{
-"tb": 640,
-"tbk": 8,
-"tl": 921,
-"mb": 80,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2686,
-443,
-42,
-40,
-46,
-85
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 838,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-2016,
-45,
-45,
-46,
-85
-]
-},
-{
-"tb": 122112,
-"tbk": 1696,
-"tl": 2143321,
-"mb": 360,
-"mbk": 5,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-3220,
-2866,
-124,
-125,
-126
-]
-},
-{
-"tb": 19072,
-"tbk": 298,
-"tl": 412687,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-2379,
-1212,
-1213,
-1214,
-1215,
-1216
-]
-},
-{
-"tb": 704,
-"tbk": 4,
-"tl": 991,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-912,
-707,
-708,
-709,
-710
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 844,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-39,
-40,
-443,
-443,
-46
-]
-},
-{
-"tb": 92160,
-"tbk": 773,
-"tl": 11223,
-"mb": 192,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-734,
-735,
-736,
-737,
-3221
-]
-},
-{
-"tb": 8176,
-"tbk": 73,
-"tl": 5299072,
-"mb": 336,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1282,
-284,
-285,
-286,
-287
-]
-},
-{
-"tb": 320,
-"tbk": 80,
-"tl": 264560,
-"mb": 8,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-3222
-]
-},
-{
-"tb": 212352,
-"tbk": 968,
-"tl": 503923,
-"mb": 896,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2947,
-3223,
-3224,
-193,
-194,
-874
-]
-},
-{
-"tb": 5760,
-"tbk": 80,
-"tl": 89853,
-"mb": 144,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-3225,
-123,
-124,
-125,
-126
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6836,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-924,
-1578,
-1579,
-7,
-1639
-]
-},
-{
-"tb": 40231,
-"tbk": 7517,
-"tl": 161000494,
-"mb": 464,
-"mbk": 16,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-412,
-413,
-611,
-3226
-]
-},
-{
-"tb": 140544,
-"tbk": 1952,
-"tl": 951966,
-"mb": 72,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-446,
-447,
-3227,
-2681,
-2682,
-2683,
-2684
-]
-},
-{
-"tb": 600,
-"tbk": 120,
-"tl": 435813,
-"mb": 10,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-3228
-]
-},
-{
-"tb": 161493,
-"tbk": 39970,
-"tl": 845000576,
-"mb": 344,
-"mbk": 80,
-"gb": 84,
-"gbk": 21,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-404,
-405,
-406,
-407,
-408,
-409,
-410,
-411,
-703,
-1283,
-3229
-]
-},
-{
-"tb": 10240,
-"tbk": 432,
-"tl": 93803,
-"mb": 256,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-692,
-693,
-694,
-3230,
-3231
-]
-},
-{
-"tb": 77040,
-"tbk": 1605,
-"tl": 478707,
-"mb": 48,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-416,
-417,
-1179,
-419,
-420,
-421,
-422
-]
-},
-{
-"tb": 280,
-"tbk": 7,
-"tl": 717,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-117,
-118,
-46,
-46,
-47
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 6013,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-129,
-130,
-131,
-7,
-159
-]
-},
-{
-"tb": 32896,
-"tbk": 514,
-"tl": 212880,
-"mb": 256,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-953,
-954,
-955,
-956,
-957,
-3232
-]
-},
-{
-"tb": 6298020,
-"tbk": 14445,
-"tl": 59709393,
-"mb": 872,
-"mbk": 2,
-"gb": 436,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-3233,
-3234,
-3235,
-3236
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 819,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-1456,
-85,
-85,
-46,
-85
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 854,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-392,
-393,
-41,
-41,
-46,
-85
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 8441,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-330,
-5,
-6,
-7,
-89
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 863,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-38,
-39,
-40,
-42,
-40,
-45
-]
-},
-{
-"tb": 5936,
-"tbk": 53,
-"tl": 3219501,
-"mb": 336,
-"mbk": 3,
-"gb": 112,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-4,
-1525,
-629,
-630,
-631
-]
-},
-{
-"tb": 12544,
-"tbk": 56,
-"tl": 61714,
-"mb": 224,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-3237,
-3238,
-3239,
-3240,
-3241,
-3242
-]
-},
-{
-"tb": 379272,
-"tbk": 3242,
-"tl": 2518361,
-"mb": 448,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-3243,
-3244,
-3245,
-3246
-]
-},
-{
-"tb": 1088,
-"tbk": 272,
-"tl": 940203,
-"mb": 12,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-571,
-3247
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6628,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-884,
-885,
-886,
-7,
-8
-]
-},
-{
-"tb": 28672,
-"tbk": 32,
-"tl": 94151,
-"mb": 1792,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1175,
-1176,
-1177,
-3248,
-862
-]
-},
-{
-"tb": 2427136,
-"tbk": 736,
-"tl": 12682539904,
-"mb": 437248,
-"mbk": 197,
-"gb": 175104,
-"gbk": 196,
-"eb": 175104,
-"ebk": 196,
-"fs": [
-204,
-205,
-3249,
-3250,
-3251,
-3252,
-3253,
-3254
-]
-},
-{
-"tb": 26120,
-"tbk": 653,
-"tl": 1086,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-379,
-380,
-381,
-382,
-383,
-384,
-385,
-1904
-]
-},
-{
-"tb": 2160,
-"tbk": 196,
-"tl": 266914,
-"mb": 51,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-3255,
-3256,
-3257,
-3258,
-3259
-]
-},
-{
-"tb": 18816,
-"tbk": 196,
-"tl": 12682589321,
-"mb": 18816,
-"mbk": 196,
-"gb": 18816,
-"gbk": 196,
-"eb": 18816,
-"ebk": 196,
-"fs": [
-204,
-205,
-2545,
-2546,
-2547,
-3260,
-1347
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5838,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-156,
-157,
-158,
-7,
-2394
-]
-},
-{
-"tb": 880,
-"tbk": 5,
-"tl": 925,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-1060,
-1061,
-1062,
-922,
-2628
-]
-},
-{
-"tb": 3200,
-"tbk": 80,
-"tl": 47699,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-127,
-128,
-129,
-130,
-131,
-7,
-56
-]
-},
-{
-"tb": 6144,
-"tbk": 13,
-"tl": 42756,
-"mb": 768,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-3139,
-3261,
-3262,
-3263,
-3264,
-3265,
-3266,
-3267,
-3268,
-3269
-]
-},
-{
-"tb": 4096,
-"tbk": 88,
-"tl": 545382,
-"mb": 384,
-"mbk": 8,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-3270,
-3271,
-3272,
-3273,
-3274
-]
-},
-{
-"tb": 2048,
-"tbk": 16,
-"tl": 19769,
-"mb": 128,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-3275,
-3276,
-3277,
-3278,
-3279
-]
-},
-{
-"tb": 288,
-"tbk": 3,
-"tl": 55,
-"mb": 96,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-1180,
-3280,
-3281,
-3282,
-3283,
-3284,
-3285,
-3286,
-3287
-]
-},
-{
-"tb": 176,
-"tbk": 1,
-"tl": 81,
-"mb": 176,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-341,
-332,
-829,
-334,
-335
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 9186,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-839,
-840,
-841,
-7,
-146
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 2207,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-808,
-144,
-145,
-7,
-132
-]
-},
-{
-"tb": 896,
-"tbk": 4,
-"tl": 89874,
-"mb": 224,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-2891,
-2892,
-1638,
-862,
-863,
-928,
-743
-]
-},
-{
-"tb": 8640,
-"tbk": 120,
-"tl": 134988,
-"mb": 144,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-3288,
-3289,
-348,
-349,
-350
-]
-},
-{
-"tb": 4736,
-"tbk": 74,
-"tl": 1862885,
-"mb": 128,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-266,
-267,
-268,
-1856,
-1857,
-1305,
-1306
-]
-},
-{
-"tb": 12000,
-"tbk": 24,
-"tl": 419,
-"mb": 500,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-3290,
-3291,
-3292,
-3293
-]
-},
-{
-"tb": 456,
-"tbk": 152,
-"tl": 681536,
-"mb": 6,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-3294,
-3295
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5169,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-105,
-106,
-107,
-7,
-167
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 12562,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1272,
-1030,
-1031,
-7,
-167
-]
-},
-{
-"tb": 4032,
-"tbk": 216,
-"tl": 1254449,
-"mb": 96,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-1631,
-1632,
-1633,
-3296,
-1635
-]
-},
-{
-"tb": 348,
-"tbk": 3,
-"tl": 318,
-"mb": 232,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-3297,
-3298,
-3299,
-3300
-]
-},
-{
-"tb": 360,
-"tbk": 9,
-"tl": 917,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-2529,
-46,
-46,
-47,
-403
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 568457,
-"mb": 336,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1577,
-925,
-926,
-701,
-927
-]
-},
-{
-"tb": 3136,
-"tbk": 200,
-"tl": 205574,
-"mb": 392,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-3301,
-3302,
-3303,
-3304,
-3305,
-3306,
-3307,
-3308,
-3309
-]
-},
-{
-"tb": 10368,
-"tbk": 144,
-"tl": 159396,
-"mb": 216,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-3310,
-1781,
-1698,
-1782,
-1783
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5802,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-711,
-440,
-441,
-7,
-442
-]
-},
-{
-"tb": 9344,
-"tbk": 248,
-"tl": 73878,
-"mb": 624,
-"mbk": 12,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-692,
-693,
-694,
-3311,
-3312
-]
-},
-{
-"tb": 16128,
-"tbk": 168,
-"tl": 28748,
-"mb": 224,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1165,
-1549,
-1550,
-1551,
-1552,
-1553,
-1554,
-3313,
-3314,
-3315
-]
-},
-{
-"tb": 120,
-"tbk": 3,
-"tl": 4,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1440,
-1441,
-1442,
-2728,
-2728,
-2728,
-1443
-]
-},
-{
-"tb": 154224,
-"tbk": 1605,
-"tl": 3021670,
-"mb": 120,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-273,
-274,
-275,
-276,
-277,
-278,
-279,
-280,
-3316
-]
-},
-{
-"tb": 7648,
-"tbk": 4,
-"tl": 258616918,
-"mb": 7648,
-"mbk": 4,
-"gb": 7648,
-"gbk": 4,
-"eb": 7648,
-"ebk": 4,
-"fs": [
-211,
-2853,
-2854,
-2855,
-2856,
-203,
-743,
-744
-]
-},
-{
-"tb": 662656,
-"tbk": 5177,
-"tl": 5109298,
-"mb": 512,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-2627,
-1588,
-1589,
-1590,
-1591,
-1592
-]
-},
-{
-"tb": 2160,
-"tbk": 196,
-"tl": 12676328319,
-"mb": 2160,
-"mbk": 196,
-"gb": 2160,
-"gbk": 196,
-"eb": 2160,
-"ebk": 196,
-"fs": [
-638,
-639,
-640,
-641,
-642,
-643,
-644,
-645,
-646,
-3317,
-3318,
-3319,
-3320,
-2164,
-2165,
-3321
-]
-},
-{
-"tb": 3168,
-"tbk": 18,
-"tl": 3654,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-252,
-1717,
-1718,
-1719,
-1720
-]
-},
-{
-"tb": 6272,
-"tbk": 56,
-"tl": 34534,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-944,
-945,
-946,
-7,
-56
-]
-},
-{
-"tb": 114296,
-"tbk": 446,
-"tl": 4489754,
-"mb": 3416,
-"mbk": 14,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-9,
-10,
-11,
-12,
-13,
-3322,
-3323,
-3324,
-3325
-]
-},
-{
-"tb": 16960,
-"tbk": 424,
-"tl": 69545,
-"mb": 240,
-"mbk": 6,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-313,
-314,
-315,
-1523,
-1524,
-3326,
-3327
-]
-},
-{
-"tb": 4608,
-"tbk": 64,
-"tl": 544579,
-"mb": 576,
-"mbk": 8,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-3328,
-3329,
-3330,
-3331,
-717,
-238,
-932
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 8367,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1272,
-1030,
-1031,
-7,
-89
-]
-},
-{
-"tb": 64,
-"tbk": 1,
-"tl": 24,
-"mb": 64,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-266,
-267,
-1482,
-1483,
-1484,
-461,
-2430
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 16430,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-839,
-840,
-841,
-7,
-159
-]
-},
-{
-"tb": 55040,
-"tbk": 214,
-"tl": 32937,
-"mb": 1792,
-"mbk": 7,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-3134,
-3135,
-3136,
-3332,
-3333
-]
-},
-{
-"tb": 71680,
-"tbk": 320,
-"tl": 436145,
-"mb": 896,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-231,
-1636,
-1637,
-1638,
-862,
-863,
-864,
-215
-]
-},
-{
-"tb": 164080,
-"tbk": 586,
-"tl": 45640,
-"mb": 560,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-2753,
-2754,
-2755,
-2756,
-3334,
-3335
-]
-},
-{
-"tb": 12960,
-"tbk": 27,
-"tl": 603079,
-"mb": 1920,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-3082,
-3336,
-3337,
-3338,
-3339,
-3340,
-3341,
-3342,
-3343,
-3344
-]
-},
-{
-"tb": 16512,
-"tbk": 1032,
-"tl": 14373,
-"mb": 16,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-3062,
-3063,
-227,
-228,
-229,
-605,
-1561
-]
-},
-{
-"tb": 320,
-"tbk": 8,
-"tl": 882,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-44,
-45,
-306,
-46,
-85
-]
-},
-{
-"tb": 2688,
-"tbk": 24,
-"tl": 21587,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-283,
-840,
-841,
-7,
-230
-]
-},
-{
-"tb": 148608,
-"tbk": 2064,
-"tl": 570101,
-"mb": 72,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-446,
-447,
-3345,
-2000,
-2001,
-2002,
-2003
-]
-},
-{
-"tb": 112,
-"tbk": 1,
-"tl": 64597898,
-"mb": 112,
-"mbk": 1,
-"gb": 112,
-"gbk": 1,
-"eb": 112,
-"ebk": 1,
-"fs": [
-1,
-388,
-2178,
-390,
-391,
-23,
-24,
-25
-]
-},
-{
-"tb": 4752,
-"tbk": 27,
-"tl": 5720,
-"mb": 352,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-98,
-99,
-341,
-453,
-454,
-455,
-749
-]
-},
-{
-"tb": 51072,
-"tbk": 304,
-"tl": 430478,
-"mb": 448,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-64,
-1165,
-3346,
-3347,
-3348,
-3349,
-3350,
-3351,
-3352
-]
-},
-{
-"tb": 1416,
-"tbk": 28,
-"tl": 545,
-"mb": 120,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-57,
-361,
-362,
-363,
-364,
-365,
-366,
-2463,
-3353
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 5189,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-1665,
-1666,
-1667,
-7,
-1855
-]
-},
-{
-"tb": 640,
-"tbk": 8,
-"tl": 904,
-"mb": 80,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-1052,
-84,
-46,
-85,
-46,
-47
-]
-},
-{
-"tb": 266,
-"tbk": 22,
-"tl": 27081,
-"mb": 44,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-147,
-518,
-519,
-767,
-768,
-3354,
-770
-]
-},
-{
-"tb": 17920,
-"tbk": 70,
-"tl": 2691,
-"mb": 768,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-2308,
-2309,
-2310,
-3355,
-3356
-]
-},
-{
-"tb": 1200,
-"tbk": 30,
-"tl": 3144,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-43,
-2529,
-46,
-85,
-46,
-47
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 7908,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-265,
-157,
-158,
-7,
-167
-]
-},
-{
-"tb": 20200,
-"tbk": 505,
-"tl": 2388,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-223,
-224,
-225,
-3357,
-3358,
-3359,
-3360
-]
-},
-{
-"tb": 59280,
-"tbk": 1482,
-"tl": 52449037,
-"mb": 200,
-"mbk": 5,
-"gb": 40,
-"gbk": 1,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-26,
-27,
-1326,
-3361,
-2842,
-814,
-815
-]
-},
-{
-"tb": 4480,
-"tbk": 40,
-"tl": 31184,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-86,
-87,
-88,
-7,
-230
-]
-},
-{
-"tb": 114048,
-"tbk": 1584,
-"tl": 1707582,
-"mb": 288,
-"mbk": 4,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-3362,
-3363,
-350,
-1697,
-1698
-]
-},
-{
-"tb": 89600,
-"tbk": 17920,
-"tl": 38803761,
-"mb": 25,
-"mbk": 5,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-569,
-570,
-3364,
-3365
-]
-},
-{
-"tb": 953008,
-"tbk": 8509,
-"tl": 1655505,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-4,
-5,
-2630,
-1745,
-2125
-]
-},
-{
-"tb": 12096,
-"tbk": 168,
-"tl": 202358,
-"mb": 144,
-"mbk": 2,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-3366,
-1342,
-124,
-125,
-126
-]
-},
-{
-"tb": 1792,
-"tbk": 16,
-"tl": 11128,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-839,
-840,
-841,
-7,
-913
-]
-},
-{
-"tb": 560,
-"tbk": 7,
-"tl": 875,
-"mb": 80,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2686,
-46,
-46,
-47,
-403,
-438
-]
-},
-{
-"tb": 80450,
-"tbk": 1609,
-"tl": 41805,
-"mb": 50,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1649,
-1650,
-1651,
-1652,
-1653,
-1654,
-1655,
-1656,
-1657,
-1658,
-1659,
-1660,
-1661,
-1662,
-595,
-452,
-596
-]
-},
-{
-"tb": 1720,
-"tbk": 43,
-"tl": 10630,
-"mb": 40,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1699,
-1700,
-1825,
-3367,
-1664,
-1806,
-461
-]
-},
-{
-"tb": 31,
-"tbk": 28,
-"tl": 3682,
-"mb": 4,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-561,
-562,
-563,
-564,
-565,
-566,
-567,
-568,
-3368,
-3369,
-3370
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 1811,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-156,
-157,
-158,
-7,
-913
-]
-},
-{
-"tb": 2510840,
-"tbk": 62771,
-"tl": 356397048,
-"mb": 1080,
-"mbk": 27,
-"gb": 240,
-"gbk": 6,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-26,
-27,
-1206,
-1207,
-2466,
-2467,
-3371
-]
-},
-{
-"tb": 128,
-"tbk": 1,
-"tl": 30,
-"mb": 128,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-90,
-1503,
-936,
-937,
-938,
-1505,
-1506
-]
-},
-{
-"tb": 77040,
-"tbk": 1605,
-"tl": 169919,
-"mb": 48,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-18,
-19,
-20,
-2156,
-2157,
-421,
-422
-]
-},
-{
-"tb": 113360,
-"tbk": 13585,
-"tl": 23905,
-"mb": 32,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-204,
-205,
-2166,
-2657,
-2658,
-3372,
-3373
-]
-},
-{
-"tb": 16704,
-"tbk": 232,
-"tl": 258173,
-"mb": 216,
-"mbk": 3,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-120,
-121,
-3374,
-3375,
-124,
-125,
-126
-]
-},
-{
-"tb": 896,
-"tbk": 8,
-"tl": 6502,
-"mb": 112,
-"mbk": 1,
-"gb": 0,
-"gbk": 0,
-"eb": 0,
-"ebk": 0,
-"fs": [
-1,
-2,
-3,
-143,
-144,
-145,
-7,
-89
-]
-}
-],
-"ftbl": [
-"[root]",
-"0x55d9d9c13333: alloc::alloc::exchange_malloc (alloc/src/alloc.rs:324:18)",
-"0x55d9d9ad1ae5: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9ad1ae5: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
-"0x55d9d9be2555: cedar_policy_core::ast::expr::ExprBuilder<T>::is_in (src/ast/expr.rs:1019:19)",
-"0x55d9d9c95290: cedar_policy_core::ast::expr::Expr::is_in (src/ast/expr.rs:399:9)",
-"0x55d9d9c9f12b: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:489:66)",
-"0x55d9d9ca05be: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
-"0x55d9d9c9fd5f: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:476:35)",
-"0x55d9d9f24af9: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
-"0x55d9d9f79518: hashbrown::raw::alloc::inner::do_alloc (src/raw/alloc.rs:11:15)",
-"0x55d9d9f0064e: hashbrown::raw::RawTableInner<A>::new_uninitialized (src/raw/mod.rs:1080:38)",
-"0x55d9d9f00c23: hashbrown::raw::RawTableInner<A>::fallible_with_capacity (src/raw/mod.rs:1109:30)",
-"0x55d9d9eff57e: hashbrown::raw::RawTableInner<A>::prepare_resize (src/raw/mod.rs:1353:29)",
-"0x55d9d9b50cd4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d9b50cd4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d9b50cd4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d9b65558: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9c1491e: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9c1491e: cedar_policy_core::ast::extension::ExtensionFunction::unary_never (src/ast/extension.rs:183:13)",
-"0x55d9d9b69604: cedar_policy_core::extensions::partial_evaluation::extension (src/extensions/partial_evaluation.rs:52:13)",
-"0x55d9d9bb5244: <cedar_policy_core::extensions::ALL_AVAILABLE_EXTENSIONS as core::ops::deref::Deref>::deref::__static_ref_initialize (cedar-policy-core/src/extensions.rs:36:9)",
-"0x55d9d9bb5244: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9bdc171: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
-"0x55d9d9b68c88: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
-"0x55d9d9d57dcd: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
-"0x55d9d9ad0716: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9ad0716: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
-"0x55d9d9cbe073: cedar_policy_core::ast::name::Name::parse_unqualified_name (src/ast/name.rs:69:19)",
-"0x55d9d9bb4ef5: <cedar_policy_core::extensions::decimal::names::GREATER_THAN as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/decimal.rs:50:46)",
-"0x55d9d9bb4ef5: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9bdbdc1: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
-"0x55d9d9b68418: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
-"0x55d9d9d5b0fd: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
-"0x55d9d9b5cb5d: hashbrown::raw::RawTable<T,A>::new_uninitialized (src/raw/mod.rs:442:20)",
-"0x55d9d9b429d5: <hashbrown::raw::RawTable<T,A> as core::clone::Clone>::clone (src/raw/mod.rs:1606:39)",
-"0x55d9d9cadb46: <hashbrown::map::HashMap<K,V,S,A> as core::clone::Clone>::clone (hashbrown-0.12.3/src/map.rs:197:20)",
-"0x55d9d9b06afd: <std::collections::hash::map::HashMap<K,V,S> as core::clone::Clone>::clone (collections/hash/map.rs:1267:22)",
-"0x55d9d9b0f355: cedar_policy_core::evaluator::<impl cedar_policy_core::ast::value::Value>::get_as_bool (cedar-policy-core/src/evaluator.rs:759:17)",
-"0x55d9d9b72726: cedar_policy_core::evaluator::Evaluator::eval_if (cedar-policy-core/src/evaluator.rs:616:20)",
-"0x55d9d9b6bc12: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:270:18)",
-"0x55d9d9b6c0ef: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:534:25)",
-"0x55d9d9b72653: cedar_policy_core::evaluator::Evaluator::eval_if (cedar-policy-core/src/evaluator.rs:614:15)",
-"0x55d9d9b0f525: cedar_policy_core::evaluator::<impl cedar_policy_core::ast::value::Value>::get_as_long (cedar-policy-core/src/evaluator.rs:771:17)",
-"0x55d9d9b6eb28: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:366:34)",
-"0x55d9d9b6be1e: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:348:21)",
-"0x55d9d9b714bf: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:281:35)",
-"0x55d9d9b6b128: cedar_policy_core::evaluator::Evaluator::partial_evaluate (cedar-policy-core/src/evaluator.rs:204:15)",
-"0x55d9d9eab881: alloc::alloc::alloc (alloc/src/alloc.rs:93:14)",
-"0x55d9d9eacf60: <hashbrown::raw::inner::alloc::inner::Global as hashbrown::raw::inner::alloc::inner::Allocator>::allocate (src/raw/alloc.rs:68:35)",
-"0x55d9d9eae077: hashbrown::raw::inner::alloc::inner::do_alloc (src/raw/alloc.rs:84:9)",
-"0x55d9d9eb8af2: hashbrown::raw::inner::RawTableInner<A>::new_uninitialized (src/raw/mod.rs:1578:38)",
-"0x55d9d9db2518: hashbrown::raw::inner::RawTable<T,A>::new_uninitialized (src/raw/mod.rs:861:20)",
-"0x55d9d9db1cf4: <hashbrown::raw::inner::RawTable<T,A> as core::clone::Clone>::clone_from (src/raw/mod.rs:2549:31)",
-"0x55d9d9db2819: hashbrown::raw::inner::RawTable<T,A>::clone_from_with_hasher (src/raw/mod.rs:2681:13)",
-"0x55d9d9d3d0ca: <indexmap::map::core::IndexMapCore<K,V> as core::clone::Clone>::clone_from (src/map/core.rs:71:9)",
-"0x55d9d9c9da3d: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:511:17)",
-"0x55d9d9a43cb9: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
-"0x55d9d9927569: alloc::boxed::Box<T,A>::try_new_uninit_in (alloc/src/boxed.rs:483:19)",
-"0x55d9d99263da: alloc::boxed::Box<T,A>::new_uninit_in (alloc/src/boxed.rs:448:15)",
-"0x55d9d9a1749d: alloc::collections::btree::node::LeafNode<K,V>::new (collections/btree/node.rs:83:28)",
-"0x55d9d9a0b9da: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::Leaf>::new_leaf (collections/btree/node.rs:217:29)",
-"0x55d9d9a0f70a: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::LeafOrInternal>::new (collections/btree/node.rs:584:9)",
-"0x55d9d9902ef7: <alloc::collections::btree::map::BTreeMap<K,V,A> as core::clone::Clone>::clone::clone_subtree (collections/btree/map.rs:219:36)",
-"0x55d9d9c13859: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
-"0x55d9d9b22efe: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9aa93a8: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa93a8: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa93a8: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d984f634: <serde::__private::de::content::TaggedContentVisitor<T> as serde::de::Visitor>::visit_map (src/private/de.rs:865:27)",
-"0x55d9d9816bcf: serde_json::value::de::visit_object (src/value/de.rs:196:20)",
-"0x55d9d98c9146: serde_json::value::de::<impl serde::de::Deserializer for serde_json::value::Value>::deserialize_any (src/value/de.rs:223:33)",
-"0x55d9d9895d14: cedar_policy_core::est::head_constraints::_::<impl serde::de::Deserialize for cedar_policy_core::est::head_constraints::ActionConstraint>::deserialize (src/est/head_constraints.rs:40:46)",
-"0x55d9d999e5ce: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d993925f: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d993925f: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d993925f: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d993925f: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d99491ee: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d99487a7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9961982: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9961982: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
-"0x55d9d98e8a24: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d9b71d87: cedar_policy_core::evaluator::Evaluator::eval_in (cedar-policy-core/src/evaluator.rs:577:52)",
-"0x55d9d9b6f952: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:417:53)",
-"0x55d9d9b6bc69: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:272:23)",
-"0x55d9d9be3dbd: cedar_policy_core::ast::expr::ExprBuilder<T>::has_attr (src/ast/expr.rs:1109:19)",
-"0x55d9d9c95b20: cedar_policy_core::ast::expr::Expr::has_attr (src/ast/expr.rs:459:9)",
-"0x55d9d9c9afb3: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:561:20)",
-"0x55d9d9c9a42b: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:574:17)",
-"0x55d9d9a43793: alloc::alloc::exchange_malloc (alloc/src/alloc.rs:324:18)",
-"0x55d9d99335b7: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d99335b7: <cedar_policy_validator::schema::ActionHeadVar as cedar_policy_validator::schema::HeadVar<cedar_policy_core::ast::entity::EntityUID>>::get_known_vars (cedar-policy-validator/src/schema.rs:1642:9)",
-"0x55d9d9904f52: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_entities_satisfying_constraint (cedar-policy-validator/src/rbac.rs:390:26)",
-"0x55d9d98d9062: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_actions_satisfying_constraint (cedar-policy-validator/src/rbac.rs:355:9)",
-"0x55d9d98d8f87: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_apply_specs_for_action (cedar-policy-validator/src/rbac.rs:330:9)",
-"0x55d9d98d8abe: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_in_fixes_principal (cedar-policy-validator/src/rbac.rs:172:14)",
-"0x55d9d98d8da0: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::validate_action_application (cedar-policy-validator/src/rbac.rs:283:38)",
-"0x55d9d9a3218b: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9a3218b: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
-"0x55d9d9a40664: cedar_policy_core::ast::expr::ExprBuilder<T>::and (src/ast/expr.rs:931:23)",
-"0x55d9d99170d5: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:790:45)",
-"0x55d9d99126f5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
-"0x55d9d99167c3: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:770:29)",
-"0x55d9d990f537: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d9be3f0d: cedar_policy_core::ast::expr::ExprBuilder<T>::like (src/ast/expr.rs:1119:19)",
-"0x55d9d9bdff00: cedar_policy_core::ast::expr::Expr::like (src/ast/expr.rs:466:9)",
-"0x55d9d9c9ad59: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:565:39)",
-"0x55d9d9cb9c06: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9cb9c06: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9cb9c06: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:139:27)",
-"0x55d9d9ac4008: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
-"0x55d9d9ac4008: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
-"0x55d9d9ac4008: <alloc::vec::Vec<T,A> as core::clone::Clone>::clone (src/vec/mod.rs:2643:9)",
-"0x55d9d9d53fe3: <serde::__private::de::content::Content as core::clone::Clone>::clone (src/private/de.rs:251:13)",
-"0x55d9d9bc8197: core::clone::Clone::clone (core/src/clone.rs:123:5)",
-"0x55d9d9cb9f07: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:146:32)",
-"0x55d9d9b70483: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:327:43)",
-"0x55d9d9b6bd7d: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:325:53)",
-"0x55d9d9b6bea8: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:482:61)",
-"0x55d9d9ad133e: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9ad133e: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
-"0x55d9d9cf44bd: cedar_policy_core::est::expr::Expr::less (src/est/expr.rs:314:20)",
-"0x55d9d9cf9592: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Relation>>::try_from (src/est/expr.rs:804:36)",
-"0x55d9d9d3c33e: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
-"0x55d9d9cf72df: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::And>>::try_from (src/est/expr.rs:765:24)",
-"0x55d9d9d3c2de: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
-"0x55d9d9ad0a16: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9ad0a16: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
-"0x55d9d9be3137: cedar_policy_core::ast::expr::ExprBuilder<T>::set (src/ast/expr.rs:1054:43)",
-"0x55d9d9bdf617: cedar_policy_core::ast::expr::Expr::set (src/ast/expr.rs:420:9)",
-"0x55d9d9c9a361: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:578:61)",
-"0x55d9d9c9d3e4: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:514:17)",
-"0x55d9d9b21d5e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9aa6432: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa6432: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa6432: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9aa6432: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9acdb8e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acd167: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c5f8f2: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9c5f8f2: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
-"0x55d9d9a94ea0: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d9be150c: cedar_policy_core::ast::expr::ExprBuilder<T>::and (src/ast/expr.rs:931:23)",
-"0x55d9d9c94400: cedar_policy_core::ast::expr::Expr::and (src/ast/expr.rs:347:9)",
-"0x55d9d9c9db01: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:509:67)",
-"0x55d9d9c9d85a: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:510:17)",
-"0x55d9d9eacda9: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
-"0x55d9d9ea9b2e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9eca228: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9eca228: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9eca228: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9ebbf5a: <serde_json::value::ser::Serializer as serde::ser::Serializer>::serialize_seq (src/value/ser.rs:233:18)",
-"0x55d9d98ccd24: serde::ser::Serializer::collect_seq (src/ser/mod.rs:1277:35)",
-"0x55d9d98900a6: serde::ser::impls::<impl serde::ser::Serialize for alloc::vec::Vec<T>>::serialize (src/ser/impls.rs:194:17)",
-"0x55d9d9890049: serde::ser::impls::<impl serde::ser::Serialize for &T>::serialize (src/ser/impls.rs:456:17)",
-"0x55d9d9be1347: cedar_policy_core::ast::expr::ExprBuilder<T>::is_eq (src/ast/expr.rs:920:19)",
-"0x55d9d9c940e0: cedar_policy_core::ast::expr::Expr::is_eq (src/ast/expr.rs:337:9)",
-"0x55d9d9c9f9f3: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:481:66)",
-"0x55d9d9c9ac75: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:565:55)",
-"0x55d9d9ad1816: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9ad1816: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
-"0x55d9d9be3247: cedar_policy_core::ast::expr::ExprBuilder<T>::record (src/ast/expr.rs:1060:20)",
-"0x55d9d9bdf9d7: cedar_policy_core::ast::expr::Expr::record (src/ast/expr.rs:425:9)",
-"0x55d9d9b7a452: cedar_policy_core::ast::restricted_expr::RestrictedExpr::record (src/ast/restricted_expr.rs:106:29)",
-"0x55d9d98b0b7f: cedar_policy_core::entities::json::jsonvalue::ValueParser::val_into_rexpr (entities/json/jsonvalue.rs:366:24)",
-"0x55d9d98b81c6: cedar_policy_core::entities::json::jsonvalue::ValueParser::val_into_rexpr::{{closure}} (entities/json/jsonvalue.rs:317:40)",
-"0x55d9d9c9ee90: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:490:17)",
-"0x55d9d97571f3: __rg_alloc (cedar-policy/tests/corpus_tests.rs:31:15)",
-"0x55d9da19e802: alloc::raw_vec::finish_grow (alloc/src/raw_vec.rs:0:0)",
-"0x55d9d97536a2: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d97536a2: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
-"0x55d9da1b4607: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
-"0x55d9da1b4607: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
-"0x55d9da1b4607: alloc::vec::Vec<T,A>::append_elements (src/vec/mod.rs:1940:9)",
-"0x55d9da1b4607: <alloc::vec::Vec<T,A> as alloc::vec::spec_extend::SpecExtend<&T,core::slice::iter::Iter<T>>>::spec_extend (src/vec/spec_extend.rs:55:18)",
-"0x55d9da1b4607: alloc::vec::Vec<T,A>::extend_from_slice (src/vec/mod.rs:2386:9)",
-"0x55d9da1b4607: std::io::impls::<impl std::io::Write for alloc::vec::Vec<u8,A>>::write_all (src/io/impls.rs:405:9)",
-"0x55d9da1b4607: <std::io::Write::write_fmt::Adapter<T> as core::fmt::Write>::write_str (src/io/mod.rs:1687:23)",
-"0x55d9da1df4fc: core::fmt::write (src/fmt/mod.rs:1252:21)",
-"0x55d9da1b42e5: std::io::Write::write_fmt (src/io/mod.rs:1698:15)",
-"0x55d9da1b3433: std::io::stdio::print_to_buffer_if_capture_used::{{closure}}::{{closure}} (src/io/stdio.rs:1030:25)",
-"0x55d9da1b3433: core::option::Option<T>::map (core/src/option.rs:1099:29)",
-"0x55d9da1b3433: std::io::stdio::print_to_buffer_if_capture_used::{{closure}} (src/io/stdio.rs:1029:13)",
-"0x55d9da1b3433: std::thread::local::LocalKey<T>::try_with (src/thread/local.rs:252:16)",
-"0x55d9da1b3433: std::io::stdio::print_to_buffer_if_capture_used (src/io/stdio.rs:1025:12)",
-"0x55d9da1b3724: std::io::stdio::print_to (src/io/stdio.rs:1013:8)",
-"0x55d9da1b3724: std::io::stdio::_eprint (src/io/stdio.rs:1106:5)",
-"0x55d9d9758cd6: cedar_policy::integration_testing::perform_integration_test_from_json_custom (cedar-policy/src/integration_testing.rs:184:5)",
-"0x55d9d9ccd04b: cedar_policy_core::parser::text_to_cst::grammar::__action151 (src/parser/grammar.rs:59758:5)",
-"0x55d9d9ccf68a: cedar_policy_core::parser::text_to_cst::grammar::__action185 (src/parser/grammar.rs:60381:5)",
-"0x55d9d9bf6828: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce15 (src/parser/grammar.rs:36998:20)",
-"0x55d9d9bede50: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35406:17)",
-"0x55d9d9bea683: <cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__StateMachine as lalrpop_util::state_machine::ParserDefinition>::reduce (src/parser/grammar.rs:33861:13)",
-"0x55d9d9d506dc: lalrpop_util::state_machine::Parser<D,I>::reduce (lalrpop-util-0.20.0/src/state_machine.rs:594:9)",
-"0x55d9d9c9d151: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:519:17)",
-"0x55d9d9f34dfc: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9ede008: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9ede008: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9ede008: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9fa23b5: regex_automata::util::pool::inner::Pool<T,F>::new (src/util/pool.rs:459:30)",
-"0x55d9d9fa22db: regex_automata::util::pool::Pool<T,F>::new (src/util/pool.rs:160:37)",
-"0x55d9d9f7b741: regex_automata::meta::regex::Builder::build_many_from_hir (src/meta/regex.rs:3557:13)",
-"0x55d9d9ed7e64: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3441:9)",
-"0x55d9da157b59: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
-"0x55d9da14793b: alloc::raw_vec::finish_grow (alloc/src/raw_vec.rs:475:9)",
-"0x55d9d9764f92: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d97656a8: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9785529: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9783253: <serde::de::impls::<impl serde::de::Deserialize for alloc::vec::Vec<T>>::deserialize::VecVisitor<T> as serde::de::Visitor>::visit_seq (src/de/impls.rs:1035:21)",
-"0x55d9d9774b0d: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_seq (serde_json-1.0.107/src/de.rs:1740:31)",
-"0x55d9d9f22e13: alloc::alloc::exchange_malloc (alloc/src/alloc.rs:324:18)",
-"0x55d9d9f7b6aa: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9f7b6aa: regex_automata::meta::regex::Builder::build_many_from_hir (src/meta/regex.rs:3556:39)",
-"0x55d9d9f7b18c: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3441:9)",
-"0x55d9d9f7a835: regex_automata::meta::regex::Builder::build (src/meta/regex.rs:3360:9)",
-"0x55d9d9edbc92: regex::builders::Builder::build_one_string (regex-1.9.5/src/builders.rs:79:9)",
-"0x55d9d9ed7266: regex::builders::string::RegexBuilder::build (regex-1.9.5/src/builders.rs:233:13)",
-"0x55d9d9edada6: regex::regex::string::Regex::new (src/regex/string.rs:181:9)",
-"0x55d9d99bd914: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d99bd914: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d99bd914: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d99d53b8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d99334f7: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d99334f7: <cedar_policy_validator::schema::PrincipalOrResourceHeadVar as cedar_policy_validator::schema::HeadVar<cedar_policy_core::ast::name::Name>>::get_descendants_if_present (cedar-policy-validator/src/schema.rs:1624:39)",
-"0x55d9d9997ce6: cedar_policy_validator::schema::ValidatorSchema::get_entities_in (cedar-policy-validator/src/schema.rs:1167:9)",
-"0x55d9d9905b91: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_entities_satisfying_constraint (cedar-policy-validator/src/rbac.rs:406:26)",
-"0x55d9d98d900e: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_principals_satisfying_constraint (cedar-policy-validator/src/rbac.rs:343:9)",
-"0x55d9d98d8d42: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::validate_action_application (cedar-policy-validator/src/rbac.rs:279:50)",
-"0x55d9d98d93e4: cedar_policy_validator::Validator::validate_policy (cedar-policy-validator/src/lib.rs:105:20)",
-"0x55d9d9c9f758: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:482:17)",
-"0x55d9da155473: alloc::alloc::exchange_malloc (alloc/src/alloc.rs:324:18)",
-"0x55d9da18a46c: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9da18a46c: regex_syntax::hir::Properties::empty (src/hir/mod.rs:2351:20)",
-"0x55d9da183a67: regex_syntax::hir::Hir::into_parts (src/hir/mod.rs:237:49)",
-"0x55d9da18472f: regex_syntax::hir::Hir::concat (src/hir/mod.rs:433:33)",
-"0x55d9da16b095: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_post (src/hir/translate.rs:466:42)",
-"0x55d9da111d15: regex_syntax::ast::visitor::HeapVisitor::visit (src/ast/visitor.rs:251:17)",
-"0x55d9da1116d3: regex_syntax::ast::visitor::visit (src/ast/visitor.rs:119:5)",
-"0x55d9d9f350ec: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9f22cdd: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9f22cdd: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9f22cdd: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:162:25)",
-"0x55d9d9ee5f58: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
-"0x55d9d9ee5f58: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
-"0x55d9d9ee5f58: <alloc::vec::Vec<T,A> as core::clone::Clone>::clone (src/vec/mod.rs:2643:9)",
-"0x55d9d9faccb4: regex_automata::dfa::remapper::Remapper::remap (src/dfa/remapper.rs:133:22)",
-"0x55d9d9f27406: regex_automata::dfa::onepass::InternalBuilder::shuffle_states (src/dfa/onepass.rs:753:9)",
-"0x55d9d9f26418: regex_automata::dfa::onepass::InternalBuilder::build (src/dfa/onepass.rs:724:9)",
-"0x55d9d9be3687: cedar_policy_core::ast::expr::ExprBuilder<T>::record (src/ast/expr.rs:1060:20)",
-"0x55d9d9bdf820: cedar_policy_core::ast::expr::Expr::record (src/ast/expr.rs:425:9)",
-"0x55d9d9c9a2ad: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:584:59)",
-"0x55d9d9a3fd93: cedar_policy_core::ast::expr::ExprBuilder<T>::binary_app (src/ast/expr.rs:1087:19)",
-"0x55d9d991b9f2: cedar_policy_validator::typecheck::Typechecker::typecheck_binary::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1303:29)",
-"0x55d9d9910a18: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d991b7f9: cedar_policy_validator::typecheck::Typechecker::typecheck_binary::{{closure}} (cedar-policy-validator/src/typecheck.rs:1301:21)",
-"0x55d9d990ec15: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d9be2097: cedar_policy_core::ast::expr::ExprBuilder<T>::add (src/ast/expr.rs:984:19)",
-"0x55d9d9c94d60: cedar_policy_core::ast::expr::Expr::add (src/ast/expr.rs:377:9)",
-"0x55d9d9c9d215: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:517:67)",
-"0x55d9d9b2c4d3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9b3d159: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9abc25f: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9cbf7b6: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::ast::name::Name>::into_func (src/parser/cst_to_ast.rs:1788:13)",
-"0x55d9d9a703c3: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1399:28)",
-"0x55d9d9be12a5: cedar_policy_core::ast::expr::ExprBuilder<T>::is_eq (src/ast/expr.rs:919:19)",
-"0x55d9d9a374a1: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9a374a1: cedar_policy_validator::types::Type::set (cedar-policy-validator/src/types.rs:137:32)",
-"0x55d9d98ec43a: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d99637f7: core::result::Result<T,E>::map (core/src/result.rs:759:25)",
-"0x55d9d99909d5: cedar_policy_validator::schema::WithUnresolvedTypeDefs<T>::map::{{closure}} (cedar-policy-validator/src/schema.rs:173:57)",
-"0x55d9d98eb73f: core::ops::function::FnOnce::call_once{{vtable.shim}} (src/ops/function.rs:250:5)",
-"0x55d9d99283d0: <alloc::boxed::Box<F,A> as core::ops::function::FnOnce<Args>>::call_once (alloc/src/boxed.rs:1973:9)",
-"0x55d9d9f35f9e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9937b6f: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9937b6f: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9937b6f: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9937b6f: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d99490be: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9948767: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d99dbfde: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d98d898c: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::validate_slots (cedar-policy-validator/src/rbac.rs:140:34)",
-"0x55d9d9ca0612: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from::{{closure}} (src/est/expr.rs:581:31)",
-"0x55d9d9be0fd4: cedar_policy_core::ast::expr::ExprBuilder<T>::ite (src/ast/expr.rs:902:24)",
-"0x55d9d9c821b3: cedar_policy_core::parser::cst_to_ast::construct_expr_if (src/parser/cst_to_ast.rs:1959:5)",
-"0x55d9d9a67831: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Expr>>>::to_expr_or_special (src/parser/cst_to_ast.rs:854:50)",
-"0x55d9d9a67143: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Expr>>>::to_expr (src/parser/cst_to_ast.rs:838:9)",
-"0x55d9d9a70d42: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1645:38)",
-"0x55d9d9b1bf5e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9aa4185: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa4185: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa4185: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9aa4185: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9acddde: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acd127: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c2a4ae: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a7081d: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::MemAccess>>>::to_access (src/parser/cst_to_ast.rs:1574:41)",
-"0x55d9da1468c9: alloc::boxed::Box<T,A>::try_new_uninit_in (alloc/src/boxed.rs:483:19)",
-"0x55d9da1467ea: alloc::boxed::Box<T,A>::new_uninit_in (alloc/src/boxed.rs:448:15)",
-"0x55d9da146d7c: <alloc::boxed::Box<T,A> as core::clone::Clone>::clone (alloc/src/boxed.rs:1281:25)",
-"0x55d9d9f03d9f: <regex_syntax::hir::Properties as core::clone::Clone>::clone (src/hir/mod.rs:1886:23)",
-"0x55d9d9f797a1: regex_automata::meta::regex::RegexInfo::new (src/meta/regex.rs:1928:24)",
-"0x55d9d9f7b421: regex_automata::meta::regex::Builder::build_many_from_hir (src/meta/regex.rs:3552:20)",
-"0x55d9d9c84dca: cedar_policy_core::ast::policy::TemplateBody::condition (src/ast/policy.rs:900:13)",
-"0x55d9d9c83c2b: cedar_policy_core::ast::policy::Template::condition (src/ast/policy.rs:140:9)",
-"0x55d9d9914ade: cedar_policy_validator::typecheck::Typechecker::apply_typecheck_fn_by_request_env (cedar-policy-validator/src/typecheck.rs:344:33)",
-"0x55d9d9b6bcf3: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:299:23)",
-"0x55d9da14857e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9da0fd0d8: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9da0fd0d8: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9da0fd0d8: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9da185726: regex_syntax::hir::Hir::alternation (src/hir/mod.rs:560:23)",
-"0x55d9da16b355: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_post (src/hir/translate.rs:475:42)",
-"0x55d9d9ad11a6: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9ad11a6: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
-"0x55d9d9b6a387: cedar_policy_core::evaluator::RestrictedEvaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:120:62)",
-"0x55d9d9c5b292: cedar_policy_core::evaluator::RestrictedEvaluator::partial_interpret::{{closure}} (cedar-policy-core/src/evaluator.rs:116:50)",
-"0x55d9d9af51af: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
-"0x55d9d9b9fa08: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
-"0x55d9d9aee81f: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
-"0x55d9da1806d3: <regex_syntax::ast::ClassSet as core::ops::drop::Drop>::drop (src/ast/mod.rs:1625:25)",
-"0x55d9da1766b7: core::ptr::drop_in_place<regex_syntax::ast::ClassSet> (src/ptr/mod.rs:490:1)",
-"0x55d9da176e2f: core::ptr::drop_in_place<regex_syntax::ast::ClassBracketed> (src/ptr/mod.rs:490:1)",
-"0x55d9da176238: core::ptr::drop_in_place<regex_syntax::ast::Class> (src/ptr/mod.rs:490:1)",
-"0x55d9da1760da: core::ptr::drop_in_place<regex_syntax::ast::Ast> (src/ptr/mod.rs:490:1)",
-"0x55d9da1802de: <regex_syntax::ast::Ast as core::ops::drop::Drop>::drop (src/ast/mod.rs:1587:9)",
-"0x55d9d9ad0e66: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9ad0e66: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
-"0x55d9d9b1a37d: cedar_policy_core::ast::pattern::Pattern::new (src/ast/pattern.rs:69:20)",
-"0x55d9d9be3f7f: cedar_policy_core::ast::expr::ExprBuilder<T>::like (src/ast/expr.rs:1120:22)",
-"0x55d9d9be25f7: cedar_policy_core::ast::expr::ExprBuilder<T>::is_in (src/ast/expr.rs:1020:19)",
-"0x55d9d9c9aecf: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:561:40)",
-"0x55d9d991be59: cedar_policy_validator::typecheck::Typechecker::typecheck_binary::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1324:41)",
-"0x55d9d990fc85: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
-"0x55d9d991bbb8: cedar_policy_validator::typecheck::Typechecker::typecheck_binary::{{closure}} (cedar-policy-validator/src/typecheck.rs:1320:25)",
-"0x55d9d990e335: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d9bb56b5: <cedar_policy_core::extensions::decimal::names::LESS_THAN as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/decimal.rs:48:43)",
-"0x55d9d9bb56b5: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9bdbf41: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
-"0x55d9d9b68268: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
-"0x55d9d9d579dd: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
-"0x55d9d9a3fddd: cedar_policy_core::ast::expr::ExprBuilder<T>::binary_app (src/ast/expr.rs:1088:19)",
-"0x55d9d991afc1: cedar_policy_validator::typecheck::Typechecker::typecheck_binary::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1238:48)",
-"0x55d9d990dd58: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d991aac3: cedar_policy_validator::typecheck::Typechecker::typecheck_binary::{{closure}} (cedar-policy-validator/src/typecheck.rs:1228:21)",
-"0x55d9d990d8e5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
-"0x55d9d9cf4ffc: cedar_policy_core::est::expr::Expr::contains (src/est/expr.rs:386:20)",
-"0x55d9d9cfec2c: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Member>>::try_from (src/est/expr.rs:1227:61)",
-"0x55d9d9d3c22e: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
-"0x55d9d9cfb47f: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Unary>>::try_from (src/est/expr.rs:988:24)",
-"0x55d9d9d3c35e: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
-"0x55d9d999da0e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d993c88e: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d993c88e: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d993c88e: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d993c88e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9948e9e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9948ae7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d99e3a02: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d99e3a02: <core::option::Option<V> as core::iter::traits::collect::FromIterator<core::option::Option<A>>>::from_iter::{{closure}} (core/src/option.rs:2505:51)",
-"0x55d9d98e6ffe: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d999c57e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d99457d7: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d99457d7: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d99457d7: <T as alloc::vec::spec_from_elem::SpecFromElem>::from_elem (src/vec/spec_from_elem.rs:15:21)",
-"0x55d9d9945747: alloc::vec::from_elem (src/vec/mod.rs:2550:5)",
-"0x55d9d9a44f59: cedar_policy_validator::fuzzy_match::levenshtein_distance (cedar-policy-validator/src/fuzzy_match.rs:38:22)",
-"0x55d9d9933ebc: cedar_policy_validator::fuzzy_match::fuzzy_search::{{closure}} (cedar-policy-validator/src/fuzzy_match.rs:23:21)",
-"0x55d9d9906c11: core::iter::traits::iterator::Iterator::fold (iter/traits/iterator.rs:2482:21)",
-"0x55d9d9be1c97: cedar_policy_core::ast::expr::ExprBuilder<T>::less (src/ast/expr.rs:956:19)",
-"0x55d9d9c94720: cedar_policy_core::ast::expr::Expr::less (src/ast/expr.rs:357:9)",
-"0x55d9d9c9ecc7: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:493:68)",
-"0x55d9d9baba95: cedar_policy_core::extensions::ipaddr::as_ipaddr (src/extensions/ipaddr.rs:214:13)",
-"0x55d9d9bac023: cedar_policy_core::extensions::ipaddr::is_ipv4 (src/extensions/ipaddr.rs:225:18)",
-"0x55d9d9bb19f4: core::ops::function::Fn::call (src/ops/function.rs:79:5)",
-"0x55d9d9d069bc: <alloc::boxed::Box<F,A> as core::ops::function::Fn<Args>>::call (alloc/src/boxed.rs:1987:9)",
-"0x55d9d9cab2f3: cedar_policy_core::ast::extension::ExtensionFunction::unary::{{closure}} (src/ast/extension.rs:208:27)",
-"0x55d9d9d06975: <alloc::boxed::Box<F,A> as core::ops::function::Fn<Args>>::call (alloc/src/boxed.rs:1987:9)",
-"0x55d9d985240a: cedar_policy_core::entities::json::entities::EntityJsonParser<S>::parse_ejson::{{closure}} (entities/json/entities.rs:257:29)",
-"0x55d9d9eab7d3: alloc::alloc::exchange_malloc (alloc/src/alloc.rs:324:18)",
-"0x55d9d9ea84c4: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9ea84c4: serde_json::error::make_error (serde_json-1.0.107/src/error.rs:461:14)",
-"0x55d9d9ea8241: <serde_json::error::Error as serde::de::Error>::custom (serde_json-1.0.107/src/error.rs:436:9)",
-"0x55d9d9ea833c: <serde_json::error::Error as serde::de::Error>::invalid_type (serde_json-1.0.107/src/error.rs:444:13)",
-"0x55d9d9a7353a: serde::de::Visitor::visit_bool (src/de/mod.rs:1313:13)",
-"0x55d9d9cb72b5: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:1726:37)",
-"0x55d9d9a7ac3d: cedar_policy_core::entities::json::jsonvalue::_::<impl serde::de::Deserialize for cedar_policy_core::entities::json::jsonvalue::JSONValue>::deserialize (entities/json/jsonvalue.rs:38:39)",
-"0x55d9d9c9ff02: cedar_policy_core::est::<impl core::convert::TryFrom<cedar_policy_core::est::Clause> for cedar_policy_core::ast::expr::Expr>::try_from (cedar-policy-core/src/est.rs:246:35)",
-"0x55d9d9c1532b: cedar_policy_core::ast::extension::ExtensionFunction::binary (src/ast/extension.rs:242:13)",
-"0x55d9d9b0df85: cedar_policy_core::extensions::decimal::extension (src/extensions/decimal.rs:274:13)",
-"0x55d9d9bb520b: <cedar_policy_core::extensions::ALL_AVAILABLE_EXTENSIONS as core::ops::deref::Deref>::deref::__static_ref_initialize (cedar-policy-core/src/extensions.rs:35:9)",
-"0x55d9d9bb520b: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9b0f6f5: cedar_policy_core::evaluator::<impl cedar_policy_core::ast::value::Value>::get_as_string (cedar-policy-core/src/evaluator.rs:783:17)",
-"0x55d9d9b6cb04: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:537:52)",
-"0x55d9d9b50524: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d9b50524: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d9b50524: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d9b654a8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9b56914: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d9b56914: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d9b56914: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d9b651e8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9b6c735: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:560:42)",
-"0x55d9d9c6be66: cedar_policy_core::authorizer::Authorizer::evaluate_policies (cedar-policy-core/src/authorizer.rs:294:19)",
-"0x55d9d9ea954c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9ea6e2d: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9ea6e2d: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9ea6e2d: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:162:25)",
-"0x55d9d9eb566b: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
-"0x55d9d9eb566b: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
-"0x55d9d9eb566b: alloc::slice::<impl [T]>::to_vec (alloc/src/slice.rs:416:14)",
-"0x55d9d9eb566b: alloc::slice::<impl alloc::borrow::ToOwned for [T]>::to_owned (alloc/src/slice.rs:823:14)",
-"0x55d9d9ebb002: alloc::str::<impl alloc::borrow::ToOwned for str>::to_owned (alloc/src/str.rs:209:46)",
-"0x55d9d9ebb002: <alloc::string::String as core::convert::From<&str>>::from (alloc/src/string.rs:2650:11)",
-"0x55d9d9ebc114: <serde_json::value::ser::Serializer as serde::ser::Serializer>::serialize_struct_variant (src/value/ser.rs:287:19)",
-"0x55d9d98685ff: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9c14d2b: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9c14d2b: cedar_policy_core::ast::extension::ExtensionFunction::unary (src/ast/extension.rs:207:13)",
-"0x55d9d9bacb99: cedar_policy_core::extensions::ipaddr::extension (src/extensions/ipaddr.rs:267:13)",
-"0x55d9d998286c: cedar_policy_validator::extensions::ipaddr::extension_schema (src/extensions/ipaddr.rs:56:22)",
-"0x55d9d9a5b65e: cedar_policy_validator::extensions::all_available_extension_schemas (cedar-policy-validator/src/extensions.rs:33:9)",
-"0x55d9d9a27b39: cedar_policy_validator::typecheck::Typechecker::new (cedar-policy-validator/src/typecheck.rs:252:26)",
-"0x55d9d98d95a0: cedar_policy_validator::Validator::typecheck_policy (cedar-policy-validator/src/lib.rs:118:25)",
-"0x55d9d9a40765: cedar_policy_core::ast::expr::ExprBuilder<T>::and (src/ast/expr.rs:932:24)",
-"0x55d9d9916fd8: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:777:41)",
-"0x55d9d9912858: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d990f3c5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
-"0x55d9d9b1f72e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9939659: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9939659: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9939659: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9939659: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9948ede: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9948597: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d99e3a62: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d99e3a62: <core::option::Option<V> as core::iter::traits::collect::FromIterator<core::option::Option<A>>>::from_iter::{{closure}} (core/src/option.rs:2505:51)",
-"0x55d9d98e8c42: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d9b715ae: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:289:62)",
-"0x55d9d9c6a7bf: cedar_policy_core::authorizer::Authorizer::is_authorized_core (cedar-policy-core/src/authorizer.rs:179:23)",
-"0x55d9d9be18cc: cedar_policy_core::ast::expr::ExprBuilder<T>::or (src/ast/expr.rs:945:23)",
-"0x55d9d9c94590: cedar_policy_core::ast::expr::Expr::or (src/ast/expr.rs:352:9)",
-"0x55d9d9c9d68b: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:513:66)",
-"0x55d9d9c9c0b8: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:526:39)",
-"0x55d9d9b6e408: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:349:21)",
-"0x55d9d9c84e52: cedar_policy_core::ast::policy::TemplateBody::condition (src/ast/policy.rs:899:9)",
-"0x55d9d9c84628: cedar_policy_core::ast::policy::Policy::condition (src/ast/policy.rs:415:9)",
-"0x55d9d9ad168e: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9ad168e: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
-"0x55d9d9c5ad07: cedar_policy_core::ast::request::EntityUIDEntry::concrete (src/ast/request.rs:67:24)",
-"0x55d9d9c5adf4: cedar_policy_core::ast::request::Request::new (src/ast/request.rs:89:21)",
-"0x55d9d98c647f: cedar_policy::api::Request::new (cedar-policy/src/api.rs:2712:14)",
-"0x55d9d9759f84: cedar_policy::integration_testing::perform_integration_test_from_json_custom (cedar-policy/src/integration_testing.rs:300:23)",
-"0x55d9d9758b7c: cedar_policy::integration_testing::perform_integration_test_from_json (cedar-policy/src/integration_testing.rs:349:5)",
-"0x55d9d991b612: cedar_policy_validator::typecheck::Typechecker::typecheck_binary::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1277:29)",
-"0x55d9d990f218: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d991b419: cedar_policy_validator::typecheck::Typechecker::typecheck_binary::{{closure}} (cedar-policy-validator/src/typecheck.rs:1275:21)",
-"0x55d9d99105a5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
-"0x55d9d9a41ec4: cedar_policy_core::ast::expr::ExprBuilder<T>::has_attr (src/ast/expr.rs:1109:19)",
-"0x55d9d9919671: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:1056:33)",
-"0x55d9d990f839: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d9a290b8: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:999:17)",
-"0x55d9d9a2c76c: cedar_policy_validator::typecheck::Typechecker::expect_one_of_types (cedar-policy-validator/src/typecheck.rs:2004:22)",
-"0x55d9d9c149fe: cedar_policy_core::ast::extension::ExtensionFunction::unary_never (src/ast/extension.rs:192:13)",
-"0x55d9d9b69451: cedar_policy_core::extensions::partial_evaluation::extension (src/extensions/partial_evaluation.rs:46:13)",
-"0x55d9d9c9b356: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:554:17)",
-"0x55d9d9f356ce: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9f24264: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9f24264: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9f24264: <T as alloc::vec::spec_from_elem::SpecFromElem>::from_elem (src/vec/spec_from_elem.rs:15:21)",
-"0x55d9d9ee5b47: alloc::vec::from_elem (src/vec/mod.rs:2550:5)",
-"0x55d9d9f3057c: regex_automata::nfa::thompson::map::Utf8SuffixMap::clear (nfa/thompson/map.rs:244:24)",
-"0x55d9d9ef3616: regex_automata::nfa::thompson::compiler::Compiler::c_unicode_class_reverse_with_suffix (nfa/thompson/compiler.rs:1516:9)",
-"0x55d9d9ef2a26: regex_automata::nfa::thompson::compiler::Compiler::c_unicode_class (nfa/thompson/compiler.rs:1398:17)",
-"0x55d9d9b0c225: cedar_policy_core::extensions::decimal::as_decimal (src/extensions/decimal.rs:205:13)",
-"0x55d9d9b0ca58: cedar_policy_core::extensions::decimal::decimal_le (src/extensions/decimal.rs:224:16)",
-"0x55d9d9bb1718: core::ops::function::Fn::call (src/ops/function.rs:79:5)",
-"0x55d9d9d06a63: <alloc::boxed::Box<F,A> as core::ops::function::Fn<Args>>::call (alloc/src/boxed.rs:1987:9)",
-"0x55d9d9cab4c9: cedar_policy_core::ast::extension::ExtensionFunction::binary::{{closure}} (src/ast/extension.rs:234:37)",
-"0x55d9d9f34b0c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9f1dd09: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9f1dd09: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9f1dd09: <T as alloc::vec::spec_from_elem::SpecFromElem>::from_elem (src/vec/spec_from_elem.rs:15:21)",
-"0x55d9d9ee5aeb: alloc::vec::from_elem (src/vec/mod.rs:2550:5)",
-"0x55d9d9fbde5b: regex_automata::util::captures::Captures::all (src/util/captures.rs:217:50)",
-"0x55d9d9f8c483: <regex_automata::meta::strategy::Core as regex_automata::meta::strategy::Strategy>::create_cache (src/meta/strategy.rs:669:25)",
-"0x55d9d9f7b901: regex_automata::meta::regex::Builder::build_many_from_hir::{{closure}} (src/meta/regex.rs:3556:56)",
-"0x55d9d9b559b4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d9b559b4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d9b559b4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d9b65a28: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9be11ae: cedar_policy_core::ast::expr::ExprBuilder<T>::not (src/ast/expr.rs:911:18)",
-"0x55d9d9c93f6a: cedar_policy_core::ast::expr::Expr::not (src/ast/expr.rs:332:9)",
-"0x55d9d9c9fe0f: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:476:20)",
-"0x55d9d9c9b9af: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:551:17)",
-"0x55d9d9990392: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9990392: cedar_policy_validator::schema::WithUnresolvedTypeDefs<T>::new (cedar-policy-validator/src/schema.rs:167:30)",
-"0x55d9d9992fcb: cedar_policy_validator::schema::ValidatorNamespaceDef::parse_record_attributes (cedar-policy-validator/src/schema.rs:552:12)",
-"0x55d9d99314f6: cedar_policy_validator::schema::ValidatorNamespaceDef::try_schema_type_into_validator_type (cedar-policy-validator/src/schema.rs:691:25)",
-"0x55d9d9992411: cedar_policy_validator::schema::ValidatorNamespaceDef::build_action_ids::{{closure}} (cedar-policy-validator/src/schema.rs:461:35)",
-"0x55d9d99de4f7: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
-"0x55d9d995b3eb: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
-"0x55d9d9be2b67: cedar_policy_core::ast::expr::ExprBuilder<T>::contains_any (src/ast/expr.rs:1048:19)",
-"0x55d9d9c95740: cedar_policy_core::ast::expr::Expr::contains_any (src/ast/expr.rs:415:9)",
-"0x55d9d9c9b5fd: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:553:75)",
-"0x55d9d999dfee: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d99399c8: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d99399c8: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d99399c8: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d99399c8: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9948f1e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d99486e7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d99dc0de: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a5d43e: cedar_policy_validator::extensions::partial_evaluation::extension_schema (src/extensions/partial_evaluation.rs:44:47)",
-"0x55d9da18a62e: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9da18a62e: regex_syntax::hir::Properties::literal (src/hir/mod.rs:2370:20)",
-"0x55d9da183d0b: regex_syntax::hir::Hir::literal (src/hir/mod.rs:333:21)",
-"0x55d9da169cdf: regex_syntax::hir::translate::HirFrame::unwrap_expr (src/hir/translate.rs:256:39)",
-"0x55d9da16af0f: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_post (src/hir/translate.rs:453:28)",
-"0x55d9d9ea8d8b: alloc::raw_vec::finish_grow (alloc/src/raw_vec.rs:475:9)",
-"0x55d9d9eaa3c1: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9eab568: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
-"0x55d9d9ecaab0: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
-"0x55d9d9ecaab0: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
-"0x55d9d9eca39d: alloc::vec::Vec<T,A>::append_elements (src/vec/mod.rs:1940:9)",
-"0x55d9d9eca1ab: <alloc::vec::Vec<T,A> as alloc::vec::spec_extend::SpecExtend<&T,core::slice::iter::Iter<T>>>::spec_extend (src/vec/spec_extend.rs:55:18)",
-"0x55d9d99c0ee4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d99c0ee4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d99c0ee4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d99d4ee8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9a755d7: serde::de::Visitor::visit_u64 (src/de/mod.rs:1421:13)",
-"0x55d9d9cb6528: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:1730:36)",
-"0x55d9d9a7a51e: cedar_policy_core::entities::json::jsonvalue::_::<impl serde::de::Deserialize for cedar_policy_core::entities::json::jsonvalue::JSONValue>::deserialize (entities/json/jsonvalue.rs:38:39)",
-"0x55d9d9bb4235: <cedar_policy_core::extensions::decimal::names::GREATER_THAN_OR_EQUAL as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/decimal.rs:51:55)",
-"0x55d9d9bb4235: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9bdc001: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
-"0x55d9d9b68808: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
-"0x55d9d9d5a52d: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
-"0x55d9d9905078: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9905078: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_entities_satisfying_constraint (cedar-policy-validator/src/rbac.rs:416:17)",
-"0x55d9d9ad0d06: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9ad0d06: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
-"0x55d9d9b0ae56: <cedar_policy_core::ast::value::Set as core::iter::traits::collect::FromIterator<cedar_policy_core::ast::value::Value>>::from_iter (src/ast/value.rs:214:32)",
-"0x55d9d9b933ca: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9b6a569: cedar_policy_core::evaluator::RestrictedEvaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:108:59)",
-"0x55d9d9dc5dc9: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
-"0x55d9d9dc463c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9a595fd: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a595fd: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a595fd: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:162:25)",
-"0x55d9d9945c78: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
-"0x55d9d9945c78: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
-"0x55d9d9945c78: <alloc::vec::Vec<T,A> as core::clone::Clone>::clone (src/vec/mod.rs:2643:9)",
-"0x55d9d9946377: <alloc::vec::ExtendElement<T> as alloc::vec::ExtendWith<T>>::next (src/vec/mod.rs:2481:9)",
-"0x55d9d993ea6a: alloc::vec::Vec<T,A>::extend_with (src/vec/mod.rs:2503:33)",
-"0x55d9d9945868: <T as alloc::vec::spec_from_elem::SpecFromElem>::from_elem (src/vec/spec_from_elem.rs:16:9)",
-"0x55d9d9c14e7b: cedar_policy_core::ast::extension::ExtensionFunction::unary (src/ast/extension.rs:216:13)",
-"0x55d9d9f38f33: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9f43639: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9ee384d: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9ef6031: regex_automata::nfa::thompson::compiler::Utf8Node::set_last_transition (nfa/thompson/compiler.rs:1860:13)",
-"0x55d9d9ef5f9c: regex_automata::nfa::thompson::compiler::Utf8Compiler::top_last_freeze (nfa/thompson/compiler.rs:1853:9)",
-"0x55d9da147cac: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9da13cacd: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9da13cacd: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9da13cacd: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:162:25)",
-"0x55d9da179e5b: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
-"0x55d9da179e5b: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
-"0x55d9da179e5b: alloc::slice::<impl [T]>::to_vec (alloc/src/slice.rs:416:14)",
-"0x55d9da179e5b: alloc::slice::<impl alloc::borrow::ToOwned for [T]>::to_owned (alloc/src/slice.rs:823:14)",
-"0x55d9d98c8092: alloc::str::<impl alloc::borrow::ToOwned for str>::to_owned (alloc/src/str.rs:209:46)",
-"0x55d9d98c8092: <alloc::string::String as core::convert::From<&str>>::from (alloc/src/string.rs:2650:11)",
-"0x55d9d98cc12e: <serde_json::value::ser::SerializeStructVariant as serde::ser::SerializeStructVariant>::serialize_field (src/value/ser.rs:694:25)",
-"0x55d9d98669a5: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9b0fa75: cedar_policy_core::evaluator::<impl cedar_policy_core::ast::value::Value>::get_as_entity (cedar-policy-core/src/evaluator.rs:803:17)",
-"0x55d9d9b6eb42: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:398:36)",
-"0x55d9d9f3ab53: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9f43a59: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9ee224a: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9ef714f: regex_automata::nfa::thompson::nfa::Inner::add (nfa/thompson/nfa.rs:1382:9)",
-"0x55d9d9f65f71: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:471:34)",
-"0x55d9d99a5313: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d99a7359: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d994455d: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d99138f6: cedar_policy_validator::typecheck::TypecheckAnswer::sequence_all_then_typecheck (cedar-policy-validator/src/typecheck.rs:202:13)",
-"0x55d9d9a28e9d: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:1160:17)",
-"0x55d9da1b5dde: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
-"0x55d9da1b5dde: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
-"0x55d9da1b5dde: alloc::vec::Vec<T,A>::append_elements (src/vec/mod.rs:1940:9)",
-"0x55d9da1b5dde: <alloc::vec::Vec<T,A> as alloc::vec::spec_extend::SpecExtend<&T,core::slice::iter::Iter<T>>>::spec_extend (src/vec/spec_extend.rs:55:18)",
-"0x55d9da1b5dde: alloc::vec::Vec<T,A>::extend_from_slice (src/vec/mod.rs:2386:9)",
-"0x55d9da1b5dde: std::sys::unix::os_str::Buf::push_slice (sys/unix/os_str.rs:168:9)",
-"0x55d9da1b5dde: std::ffi::os_str::OsString::push (src/ffi/os_str.rs:195:9)",
-"0x55d9da1b5dde: std::path::PathBuf::_push (std/src/path.rs:1346:9)",
-"0x55d9d9757de9: std::path::PathBuf::push (std/src/path.rs:1275:9)",
-"0x55d9d9758730: cedar_policy::integration_testing::resolve_integration_test_path (cedar-policy/src/integration_testing.rs:112:9)",
-"0x55d9d9758dfb: cedar_policy::integration_testing::perform_integration_test_from_json_custom (cedar-policy/src/integration_testing.rs:189:23)",
-"0x55d9d9757622: corpus_tests::corpus_tests (cedar-policy/tests/corpus_tests.rs:83:9)",
-"0x55d9d9c858f1: cedar_policy_core::ast::policy::PrincipalOrResourceConstraint::as_expr (src/ast/policy.rs:1257:17)",
-"0x55d9d9c854c4: cedar_policy_core::ast::policy::ResourceConstraint::as_expr (src/ast/policy.rs:1066:9)",
-"0x55d9d9c84c5e: cedar_policy_core::ast::policy::TemplateBody::resource_constraint_expr (src/ast/policy.rs:882:9)",
-"0x55d9d9933017: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9933017: <cedar_policy_validator::schema::PrincipalOrResourceHeadVar as cedar_policy_validator::schema::HeadVar<cedar_policy_core::ast::name::Name>>::get_known_vars (cedar-policy-validator/src/schema.rs:1593:9)",
-"0x55d9d990568f: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_entities_satisfying_constraint (cedar-policy-validator/src/rbac.rs:390:26)",
-"0x55d9d98d90be: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_resources_satisfying_constraint (cedar-policy-validator/src/rbac.rs:367:9)",
-"0x55d9d98d8ce4: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::validate_action_application (cedar-policy-validator/src/rbac.rs:278:13)",
-"0x55d9d9905d1b: cedar_policy_validator::Validator::validate::{{closure}} (cedar-policy-validator/src/lib.rs:88:27)",
-"0x55d9da14c083: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9da152e19: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9da101151: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9da113ca9: regex_syntax::ast::visitor::HeapVisitor::visit_class (src/ast/visitor.rs:322:17)",
-"0x55d9da1131d2: regex_syntax::ast::visitor::HeapVisitor::induct (src/ast/visitor.rs:268:17)",
-"0x55d9d9ebb361: <serde_json::value::de::<impl serde::de::Deserialize for serde_json::value::Value>::deserialize::ValueVisitor as serde::de::Visitor>::visit_str (src/value/de.rs:63:35)",
-"0x55d9d9ebadcc: serde::de::Visitor::visit_borrowed_str (src/de/mod.rs:1508:9)",
-"0x55d9da1bac0d: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
-"0x55d9da1bac0d: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9da1bac0d: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9da1bac0d: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9da1bac0d: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:162:25)",
-"0x55d9da1bac0d: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
-"0x55d9da1bac0d: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
-"0x55d9da1bac0d: alloc::slice::<impl [T]>::to_vec (alloc/src/slice.rs:416:14)",
-"0x55d9da1bac0d: std::sys::unix::os_str::Slice::to_owned (sys/unix/os_str.rs:213:33)",
-"0x55d9da1bac0d: std::ffi::os_str::OsStr::to_os_string (src/ffi/os_str.rs:775:27)",
-"0x55d9da1bac0d: std::path::Path::to_path_buf (std/src/path.rs:2151:34)",
-"0x55d9da1bac0d: std::sys::unix::fs::readdir (sys/unix/fs.rs:1427:20)",
-"0x55d9d97829c0: std::fs::read_dir (std/src/fs.rs:2373:5)",
-"0x55d9d975738b: corpus_tests::corpus_tests (cedar-policy/tests/corpus_tests.rs:51:22)",
-"0x55d9d9be1bf5: cedar_policy_core::ast::expr::ExprBuilder<T>::less (src/ast/expr.rs:955:19)",
-"0x55d9d9c823e4: cedar_policy_core::parser::cst_to_ast::construct_expr_rel (src/parser/cst_to_ast.rs:1990:29)",
-"0x55d9d9c90a56: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Relation>>>::to_expr_or_special::{{closure}} (src/parser/cst_to_ast.rs:1064:54)",
-"0x55d9d9c1e00d: core::option::Option<T>::map (core/src/option.rs:1099:29)",
-"0x55d9d9a6a162: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Relation>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1062:52)",
-"0x55d9d9ccde0c: cedar_policy_core::parser::text_to_cst::grammar::__action163 (src/parser/grammar.rs:59932:5)",
-"0x55d9d9cd35f2: cedar_policy_core::parser::text_to_cst::grammar::__action215 (src/parser/grammar.rs:61359:5)",
-"0x55d9d9d17c9b: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce24 (src/parser/grammar.rs:28448:20)",
-"0x55d9d9d0df8b: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26691:17)",
-"0x55d9d9d0a5f3: <cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__StateMachine as lalrpop_util::state_machine::ParserDefinition>::reduce (src/parser/grammar.rs:25119:13)",
-"0x55d9d9d5059c: lalrpop_util::state_machine::Parser<D,I>::reduce (lalrpop-util-0.20.0/src/state_machine.rs:594:9)",
-"0x55d9da1d69ee: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
-"0x55d9da1d69ee: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9da1d69ee: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9da1d69ee: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9da1d69ee: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:162:25)",
-"0x55d9da1d69ee: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
-"0x55d9da1d69ee: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
-"0x55d9da1d69ee: <alloc::vec::Vec<T,A> as core::clone::Clone>::clone (src/vec/mod.rs:2643:9)",
-"0x55d9da1d69ee: <alloc::string::String as core::clone::Clone>::clone (alloc/src/string.rs:1992:23)",
-"0x55d9d9d53e42: <serde::__private::de::content::Content as core::clone::Clone>::clone (src/private/de.rs:240:16)",
-"0x55d9d9bc8180: core::clone::Clone::clone (core/src/clone.rs:123:5)",
-"0x55d9d99bf7d4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d99bf7d4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d99bf7d4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d99d5d58: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9f41bd3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9f439f9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9ee33aa: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9faf86b: regex_automata::nfa::thompson::range_trie::RangeTrie::add_empty (nfa/thompson/range_trie.rs:445:13)",
-"0x55d9d9fae146: regex_automata::nfa::thompson::range_trie::RangeTrie::clear (nfa/thompson/range_trie.rs:239:9)",
-"0x55d9d99abd6e: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d99abd6e: cedar_policy_validator::types::<impl core::convert::TryFrom<cedar_policy_validator::types::Type> for cedar_policy_core::entities::json::schema_types::SchemaType>::try_from (cedar-policy-validator/src/types.rs:649:29)",
-"0x55d9d99abc89: cedar_policy_validator::types::<impl core::convert::TryFrom<cedar_policy_validator::types::Type> for cedar_policy_core::entities::json::schema_types::SchemaType>::try_from (cedar-policy-validator/src/types.rs:649:38)",
-"0x55d9d999947e: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
-"0x55d9d9932a9f: <cedar_policy_validator::schema::EntityTypeDescription as cedar_policy_core::entities::json::schema::EntityTypeDescription>::attr_type (cedar-policy-validator/src/schema.rs:1352:73)",
-"0x55d9d98522c7: cedar_policy_core::entities::json::entities::EntityJsonParser<S>::parse_ejson::{{closure}} (entities/json/entities.rs:247:54)",
-"0x55d9d983112f: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
-"0x55d9d9be2997: cedar_policy_core::ast::expr::ExprBuilder<T>::contains_all (src/ast/expr.rs:1039:19)",
-"0x55d9d9c8336d: cedar_policy_core::parser::cst_to_ast::construct_method_contains_all (src/parser/cst_to_ast.rs:2049:5)",
-"0x55d9d9cbece3: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::ast::name::Id>::to_meth (src/parser/cst_to_ast.rs:430:22)",
-"0x55d9d9a6e052: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1443:28)",
-"0x55d9d9c90ea0: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Unary>>>::to_expr_or_special::{{closure}} (src/parser/cst_to_ast.rs:1252:33)",
-"0x55d9d9b6c065: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:513:55)",
-"0x55d9d9a7343a: serde::de::Visitor::visit_bool (src/de/mod.rs:1313:13)",
-"0x55d9d9cb6475: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:1726:37)",
-"0x55d9d9cb85a1: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::__deserialize_content (src/private/de.rs:2063:16)",
-"0x55d9d9cbd366: <serde::__private::de::content::Content as serde::de::Deserialize>::deserialize (src/private/de.rs:301:13)",
-"0x55d9d9f359be: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9eddfb8: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9eddfb8: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9eddfb8: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9ef2586: regex_automata::nfa::thompson::compiler::Compiler::c_unicode_class (nfa/thompson/compiler.rs:1380:29)",
-"0x55d9d9eedd0d: regex_automata::nfa::thompson::compiler::Compiler::c (nfa/thompson/compiler.rs:1002:45)",
-"0x55d9d9ef1537: regex_automata::nfa::thompson::compiler::Compiler::c_at_least (nfa/thompson/compiler.rs:1243:32)",
-"0x55d9d9ef06b1: regex_automata::nfa::thompson::compiler::Compiler::c_repetition (nfa/thompson/compiler.rs:1148:28)",
-"0x55d9d9828d84: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d9828d84: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d9828d84: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d982cbf8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9ccb425: cedar_policy_core::parser::text_to_cst::grammar::__action96 (src/parser/grammar.rs:58948:5)",
-"0x55d9d9cd3001: cedar_policy_core::parser::text_to_cst::grammar::__action211 (src/parser/grammar.rs:61243:5)",
-"0x55d9d9d170cf: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce19 (src/parser/grammar.rs:28341:20)",
-"0x55d9d9d0de8c: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26676:17)",
-"0x55d9d9b6dfd2: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:484:30)",
-"0x55d9d9f3b001: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9f43819: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9ee2a42: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9ef6776: regex_automata::nfa::thompson::nfa::Inner::into_nfa (nfa/thompson/nfa.rs:1280:13)",
-"0x55d9d9f67350: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:592:25)",
-"0x55d9d9be2385: cedar_policy_core::ast::expr::ExprBuilder<T>::mul (src/ast/expr.rs:1000:18)",
-"0x55d9d9c93776: cedar_policy_core::parser::cst_to_ast::construct_expr_mul (src/parser/cst_to_ast.rs:2023:16)",
-"0x55d9d9a6b97a: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Mult>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1218:42)",
-"0x55d9d9a6a52b: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Add>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1115:27)",
-"0x55d9d9a69090: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Relation>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1045:35)",
-"0x55d9d9be1ff5: cedar_policy_core::ast::expr::ExprBuilder<T>::add (src/ast/expr.rs:983:19)",
-"0x55d9d9eaf262: alloc::str::<impl alloc::borrow::ToOwned for str>::to_owned (alloc/src/str.rs:209:46)",
-"0x55d9d9ec9601: <serde::de::impls::StringVisitor as serde::de::Visitor>::visit_str (src/de/impls.rs:486:12)",
-"0x55d9d98583e5: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_str (serde_json-1.0.107/src/de.rs:1532:45)",
-"0x55d9d9a4183f: cedar_policy_core::ast::expr::ExprBuilder<T>::is_in (src/ast/expr.rs:1019:19)",
-"0x55d9d991dd4f: cedar_policy_validator::typecheck::Typechecker::typecheck_in::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1639:29)",
-"0x55d9d99123e5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
-"0x55d9d991cd38: cedar_policy_validator::typecheck::Typechecker::typecheck_in::{{closure}} (cedar-policy-validator/src/typecheck.rs:1546:13)",
-"0x55d9d990eda5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
-"0x55d9d9be1a02: cedar_policy_core::ast::expr::ExprBuilder<T>::or (src/ast/expr.rs:946:24)",
-"0x55d9da179dfb: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
-"0x55d9da179dfb: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
-"0x55d9da179dfb: alloc::slice::<impl [T]>::to_vec (alloc/src/slice.rs:416:14)",
-"0x55d9da16f673: regex_syntax::hir::translate::TranslatorI::push_char (src/hir/translate.rs:720:42)",
-"0x55d9da16c64d: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_post (src/hir/translate.rs:398:37)",
-"0x55d9da111acb: regex_syntax::ast::visitor::HeapVisitor::visit (src/ast/visitor.rs:224:13)",
-"0x55d9d9c83f04: <cedar_policy_core::ast::policy::Template as core::convert::From<cedar_policy_core::ast::policy::TemplateBody>>::from (src/ast/policy.rs:233:21)",
-"0x55d9d9c83b40: cedar_policy_core::ast::policy::Template::new (src/ast/policy.rs:83:9)",
-"0x55d9d9be2ac5: cedar_policy_core::ast::expr::ExprBuilder<T>::contains_any (src/ast/expr.rs:1047:19)",
-"0x55d9d9c8353d: cedar_policy_core::parser::cst_to_ast::construct_method_contains_any (src/parser/cst_to_ast.rs:2054:5)",
-"0x55d9d9cbeeb0: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::ast::name::Id>::to_meth (src/parser/cst_to_ast.rs:434:22)",
-"0x55d9d9b6f26e: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:429:62)",
-"0x55d9d99a5c73: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d99a7b28: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
-"0x55d9d9944c40: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
-"0x55d9d9944c40: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
-"0x55d9d99481f4: <alloc::vec::Vec<T,A> as core::iter::traits::collect::Extend<T>>::extend_reserve (src/vec/mod.rs:2796:9)",
-"0x55d9d99370fc: <(ExtendA,ExtendB) as core::iter::traits::collect::Extend<(A,B)>>::extend (iter/traits/collect.rs:436:13)",
-"0x55d9d9b58024: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d9b58024: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d9b58024: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d9b65298: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9b38053: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9b3d039: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9ab9a1a: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9b0aa1b: cedar_policy_core::ast::value::split (src/ast/value.rs:151:21)",
-"0x55d9d9b6c43a: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:558:23)",
-"0x55d9d9b73911: cedar_policy_core::evaluator::Evaluator::get_attr (cedar-policy-core/src/evaluator.rs:708:21)",
-"0x55d9d9b6c00e: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:512:49)",
-"0x55d9d9bb51d2: <cedar_policy_core::extensions::ALL_AVAILABLE_EXTENSIONS as core::ops::deref::Deref>::deref::__static_ref_initialize (cedar-policy-core/src/extensions.rs:33:9)",
-"0x55d9d9bb51d2: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9edc06d: regex::builders::Builder::build_many_string (regex-1.9.5/src/builders.rs:113:9)",
-"0x55d9d9ed7286: regex::builders::string::RegexSetBuilder::build (regex-1.9.5/src/builders.rs:811:13)",
-"0x55d9d9d55da6: regex::regexset::string::RegexSet::new (src/regexset/string.rs:159:9)",
-"0x55d9d9bd5711: lalrpop_util::lexer::MatcherBuilder::new (lalrpop-util-0.20.0/src/lexer.rs:33:32)",
-"0x55d9d9a7aba6: cedar_policy_core::entities::json::jsonvalue::_::<impl serde::de::Deserialize for cedar_policy_core::entities::json::jsonvalue::JSONValue>::deserialize (entities/json/jsonvalue.rs:38:39)",
-"0x55d9d990f0b5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
-"0x55d9d9910725: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d9bb3b75: <cedar_policy_core::extensions::ipaddr::names::IS_LOOPBACK as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/ipaddr.rs:37:45)",
-"0x55d9d9bb3b75: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9bdbd61: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
-"0x55d9d9b68928: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
-"0x55d9d9d575ed: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
-"0x55d9d991d1fc: cedar_policy_validator::typecheck::Typechecker::typecheck_in::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1560:25)",
-"0x55d9d990ef08: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d996f5be: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d996f5be: cedar_policy_validator::schema_file_format::SchemaTypeVisitor::build_schema_type (cedar-policy-validator/src/schema_file_format.rs:398:34)",
-"0x55d9d996b84e: <cedar_policy_validator::schema_file_format::SchemaTypeVisitor as serde::de::Visitor>::visit_map (cedar-policy-validator/src/schema_file_format.rs:330:9)",
-"0x55d9d9a46e40: <serde::__private::de::FlatMapDeserializer<E> as serde::de::Deserializer>::deserialize_map (src/private/de.rs:2658:9)",
-"0x55d9d9a46d86: <serde::__private::de::FlatMapDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:2630:9)",
-"0x55d9d996aa07: <cedar_policy_validator::schema_file_format::SchemaType as serde::de::Deserialize>::deserialize (cedar-policy-validator/src/schema_file_format.rs:206:9)",
-"0x55d9d99798f4: <cedar_policy_validator::schema_file_format::_::<impl serde::de::Deserialize for cedar_policy_validator::schema_file_format::TypeOfAttribute>::deserialize::__Visitor as serde::de::Visitor>::visit_map (cedar-policy-validator/src/schema_file_format.rs:588:46)",
-"0x55d9d9999c2b: cedar_policy_validator::types::<impl core::convert::TryFrom<cedar_policy_validator::types::Type> for cedar_policy_core::entities::json::schema_types::SchemaType>::try_from::{{closure}} (cedar-policy-validator/src/types.rs:669:51)",
-"0x55d9d9bab46b: cedar_policy_core::extensions::ipaddr::ip_from_str (src/extensions/ipaddr.rs:184:15)",
-"0x55d9d9bb17e4: core::ops::function::Fn::call (src/ops/function.rs:79:5)",
-"0x55d9d9eab019: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9eca701: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9ebe47f: serde_json::read::parse_escape (serde_json-1.0.107/src/read.rs:858:17)",
-"0x55d9d9ebd49c: serde_json::read::SliceRead::parse_str_bytes (serde_json-1.0.107/src/read.rs:471:26)",
-"0x55d9d9eb9024: hashbrown::raw::inner::RawTableInner<A>::fallible_with_capacity (src/raw/mod.rs:1614:30)",
-"0x55d9d9eb78f9: hashbrown::raw::inner::RawTableInner<A>::prepare_resize (src/raw/mod.rs:2156:29)",
-"0x55d9d9eb65a7: hashbrown::raw::inner::RawTableInner<A>::resize_inner (src/raw/mod.rs:2229:29)",
-"0x55d9d9eb65a7: hashbrown::raw::inner::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:2206:13)",
-"0x55d9d9eb65a7: hashbrown::raw::inner::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:1120:13)",
-"0x55d9d9eb73fc: hashbrown::raw::inner::RawTable<T,A>::reserve (src/raw/mod.rs:1086:16)",
-"0x55d9d999b6db: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d999b6db: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_in_fixes_resource::{{closure}} (cedar-policy-validator/src/rbac.rs:185:21)",
-"0x55d9d999adab: core::ops::function::impls::<impl core::ops::function::Fn<A> for &F>::call (src/ops/function.rs:263:13)",
-"0x55d9d999b75c: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_none_equal::{{closure}} (cedar-policy-validator/src/rbac.rs:223:17)",
-"0x55d9d99086bb: <core::slice::iter::Iter<T> as core::iter::traits::iterator::Iterator>::any (slice/iter/macros.rs:232:24)",
-"0x55d9d9904c09: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_none_equal (cedar-policy-validator/src/rbac.rs:222:14)",
-"0x55d9d99048d3: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_in_fixes (cedar-policy-validator/src/rbac.rs:207:9)",
-"0x55d9d9b39313: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9b3cf19: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9ab98ca: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9acb57b: <alloc::vec::Vec<T,A> as core::iter::traits::collect::Extend<T>>::extend_one (src/vec/mod.rs:2791:9)",
-"0x55d9d9bdbc0e: core::iter::traits::iterator::Iterator::partition::extend::{{closure}} (iter/traits/iterator.rs:2094:21)",
-"0x55d9d9b1d0fc: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9aa3e29: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa3e29: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa3e29: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9aa3e29: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9ac04fc: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
-"0x55d9d9acc3d7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c5fcb2: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9c5fcb2: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
-"0x55d9d9a929d0: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d9cf497c: cedar_policy_core::est::expr::Expr::and (src/est/expr.rs:345:19)",
-"0x55d9d9cf77cf: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::And>>::try_from (src/est/expr.rs:773:20)",
-"0x55d9d9cf6b88: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Or>>::try_from (src/est/expr.rs:747:24)",
-"0x55d9d9d3c31e: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
-"0x55d9d991981f: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:1079:25)",
-"0x55d9d9a71d0c: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Name>>>::to_var (src/parser/cst_to_ast.rs:1750:17)",
-"0x55d9d9a70cc8: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1637:34)",
-"0x55d9d9916d07: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:808:41)",
-"0x55d9d9c84d2e: cedar_policy_core::ast::policy::TemplateBody::condition (src/ast/policy.rs:901:17)",
-"0x55d9d9be1642: cedar_policy_core::ast::expr::ExprBuilder<T>::and (src/ast/expr.rs:932:24)",
-"0x55d9d99904d2: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d99904d2: cedar_policy_validator::schema::WithUnresolvedTypeDefs<T>::new (cedar-policy-validator/src/schema.rs:167:30)",
-"0x55d9d99905bd: cedar_policy_validator::schema::WithUnresolvedTypeDefs<T>::map (cedar-policy-validator/src/schema.rs:173:17)",
-"0x55d9d99315ee: cedar_policy_validator::schema::ValidatorNamespaceDef::try_schema_type_into_validator_type (cedar-policy-validator/src/schema.rs:691:25)",
-"0x55d9d999181e: cedar_policy_validator::schema::ValidatorNamespaceDef::build_entity_types::{{closure}} (cedar-policy-validator/src/schema.rs:323:38)",
-"0x55d9d99dd913: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
-"0x55d9d995af52: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
-"0x55d9d9ccd98b: cedar_policy_core::parser::text_to_cst::grammar::__action159 (src/parser/grammar.rs:59874:5)",
-"0x55d9d9cd493b: cedar_policy_core::parser::text_to_cst::grammar::__action227 (src/parser/grammar.rs:61713:5)",
-"0x55d9d9bfa848: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce43 (src/parser/grammar.rs:37584:20)",
-"0x55d9d9bee3e4: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35490:17)",
-"0x55d9d98d8cd5: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::validate_action_application (cedar-policy-validator/src/rbac.rs:276:31)",
-"0x55d9d9cc69c1: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9cc69c1: cedar_policy_core::parser::text_to_cst::grammar::__action35 (src/parser/grammar.rs:57903:37)",
-"0x55d9d9cd9b93: cedar_policy_core::parser::text_to_cst::grammar::__action269 (src/parser/grammar.rs:63060:5)",
-"0x55d9d9ce538e: cedar_policy_core::parser::text_to_cst::grammar::__action359 (src/parser/grammar.rs:65951:5)",
-"0x55d9d9c023c6: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce104 (src/parser/grammar.rs:38793:20)",
-"0x55d9d9bef00b: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35673:17)",
-"0x55d9d9d22326: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce104 (src/parser/grammar.rs:30051:20)",
-"0x55d9d9d0ef7b: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26931:17)",
-"0x55d9d990fde8: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d9be2725: cedar_policy_core::ast::expr::ExprBuilder<T>::contains (src/ast/expr.rs:1029:19)",
-"0x55d9d9c8319d: cedar_policy_core::parser::cst_to_ast::construct_method_contains (src/parser/cst_to_ast.rs:2046:5)",
-"0x55d9d9cbeb18: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::ast::name::Id>::to_meth (src/parser/cst_to_ast.rs:426:22)",
-"0x55d9d9a6dc06: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1431:28)",
-"0x55d9d9b1a33d: cedar_policy_core::ast::pattern::Pattern::new (src/ast/pattern.rs:69:20)",
-"0x55d9d9a416a4: cedar_policy_core::ast::expr::ExprBuilder<T>::like (src/ast/expr.rs:1120:22)",
-"0x55d9d9919aa3: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:1097:25)",
-"0x55d9d9911f43: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d9a28c7d: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:1095:17)",
-"0x55d9d9be0f32: cedar_policy_core::ast::expr::ExprBuilder<T>::ite (src/ast/expr.rs:901:24)",
-"0x55d9d9c93e3f: cedar_policy_core::ast::expr::Expr::ite (src/ast/expr.rs:327:9)",
-"0x55d9d9c9a8f8: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:573:22)",
-"0x55d9d9b234de: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9aa457d: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa457d: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa457d: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9aa457d: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9acdb6e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9accd79: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9b0539e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9be3674: cedar_policy_core::ast::expr::ExprBuilder<T>::record (src/ast/expr.rs:1060:29)",
-"0x55d9d9b0d8cf: cedar_policy_core::extensions::decimal::extension (src/extensions/decimal.rs:260:13)",
-"0x55d9da14f8c3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9f453e8: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
-"0x55d9d9ee5330: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
-"0x55d9d9ee5330: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
-"0x55d9d9ed86ce: alloc::vec::Vec<T,A>::extend_trusted (src/vec/mod.rs:2840:13)",
-"0x55d9d9ed89eb: <alloc::vec::Vec<T,A> as alloc::vec::spec_extend::SpecExtend<T,I>>::spec_extend (src/vec/spec_extend.rs:26:9)",
-"0x55d9da125b39: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9da125b39: regex_syntax::ast::parse::ParserI<P>::parse_group (src/ast/parse.rs:1244:26)",
-"0x55d9da11e56a: regex_syntax::ast::parse::ParserI<P>::push_group (src/ast/parse.rs:687:15)",
-"0x55d9da122ab4: regex_syntax::ast::parse::ParserI<P>::parse_with_comments (src/ast/parse.rs:974:33)",
-"0x55d9da1221c3: regex_syntax::ast::parse::ParserI<P>::parse (src/ast/parse.rs:959:9)",
-"0x55d9da11c666: regex_syntax::ast::parse::Parser::parse (src/ast/parse.rs:345:9)",
-"0x55d9d9f7ab9a: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3424:23)",
-"0x55d9d9f23ffb: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
-"0x55d9d9f23ffb: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
-"0x55d9d9f23ffb: alloc::slice::<impl [T]>::to_vec (alloc/src/slice.rs:416:14)",
-"0x55d9d9f66734: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:523:29)",
-"0x55d9d9eed5c5: regex_automata::nfa::thompson::compiler::Compiler::compile (nfa/thompson/compiler.rs:985:19)",
-"0x55d9d9eecb91: regex_automata::nfa::thompson::compiler::Compiler::build_many_from_hir (nfa/thompson/compiler.rs:881:9)",
-"0x55d9d9cccdc3: cedar_policy_core::parser::text_to_cst::grammar::__action149 (src/parser/grammar.rs:59729:5)",
-"0x55d9d9c01b7f: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce101 (src/parser/grammar.rs:38728:20)",
-"0x55d9d9beef72: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35664:17)",
-"0x55d9d9d4d392: lalrpop_util::state_machine::Parser<D,I>::parse (lalrpop-util-0.20.0/src/state_machine.rs:264:38)",
-"0x55d9d9b31de3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d99a73e9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9944406: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d994819b: <alloc::vec::Vec<T,A> as core::iter::traits::collect::Extend<T>>::extend_one (src/vec/mod.rs:2791:9)",
-"0x55d9d9a31c8b: core::iter::traits::iterator::Iterator::partition::extend::{{closure}} (iter/traits/iterator.rs:2094:21)",
-"0x55d9d9b0b4b5: cedar_policy_core::ast::value::Value::set (src/ast/value.rs:436:32)",
-"0x55d9d9b6c92e: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:548:46)",
-"0x55d9d9cf436d: cedar_policy_core::est::expr::Expr::_in (src/est/expr.rs:306:20)",
-"0x55d9d9cf99d6: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Relation>>::try_from (src/est/expr.rs:801:36)",
-"0x55d9d9be245e: cedar_policy_core::ast::expr::ExprBuilder<T>::neg (src/ast/expr.rs:1009:18)",
-"0x55d9d9c9511a: cedar_policy_core::ast::expr::Expr::neg (src/ast/expr.rs:392:9)",
-"0x55d9d9c9fc6c: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:479:20)",
-"0x55d9d9c9fbbc: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:479:35)",
-"0x55d9d9c95021: cedar_policy_core::ast::expr::Expr::mul (src/ast/expr.rs:387:9)",
-"0x55d9d9c9c5ff: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:537:40)",
-"0x55d9d9c9a60e: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:575:17)",
-"0x55d9d9b31933: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9b3cdf9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9abab1a: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d99600bd: cedar_policy_validator::type_error::AttributeAccess::from_expr (cedar-policy-validator/src/type_error.rs:388:17)",
-"0x55d9d991849e: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:963:41)",
-"0x55d9d9b6f7ca: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:416:58)",
-"0x55d9d9c6dd89: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9c6dd89: <cedar_policy_core::ast::entity::Entity as cedar_policy_core::transitive_closure::TCNode<cedar_policy_core::ast::entity::EntityUID>>::out_edges (src/ast/entity.rs:333:9)",
-"0x55d9d99f0586: cedar_policy_core::transitive_closure::add_ancestors_to_set (cedar-policy-core/src/transitive_closure.rs:153:25)",
-"0x55d9d99f06d1: cedar_policy_core::transitive_closure::add_ancestors_to_set (cedar-policy-core/src/transitive_closure.rs:158:17)",
-"0x55d9d99eeec7: cedar_policy_core::transitive_closure::compute_tc_internal (cedar-policy-core/src/transitive_closure.rs:82:9)",
-"0x55d9d9ccca7f: cedar_policy_core::parser::text_to_cst::grammar::__action144 (src/parser/grammar.rs:59656:5)",
-"0x55d9d9cd3fa8: cedar_policy_core::parser::text_to_cst::grammar::__action221 (src/parser/grammar.rs:61533:5)",
-"0x55d9d9bf933d: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce33 (src/parser/grammar.rs:37382:20)",
-"0x55d9d9bee1e6: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35460:17)",
-"0x55d9d9a71b8d: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Name>>>::to_ident (src/parser/cst_to_ast.rs:1735:13)",
-"0x55d9d9a71c01: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Name>>>::to_var (src/parser/cst_to_ast.rs:1742:20)",
-"0x55d9d9a27c9f: cedar_policy_validator::typecheck::Typechecker::typecheck_policy (cedar-policy-validator/src/typecheck.rs:292:61)",
-"0x55d9d9a4164c: cedar_policy_core::ast::expr::ExprBuilder<T>::like (src/ast/expr.rs:1119:19)",
-"0x55d9d9911df5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
-"0x55d9d9c9be25: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:547:17)",
-"0x55d9d9a418b2: cedar_policy_core::ast::expr::ExprBuilder<T>::is_in (src/ast/expr.rs:1020:19)",
-"0x55d9d9c9f067: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:491:17)",
-"0x55d9d9ea91cc: alloc::raw_vec::RawVec<T,A>::grow_exact (alloc/src/raw_vec.rs:423:19)",
-"0x55d9d9eab0b5: alloc::raw_vec::RawVec<T,A>::try_reserve_exact (alloc/src/raw_vec.rs:342:50)",
-"0x55d9d9eca5fe: alloc::vec::Vec<T,A>::try_reserve_exact (src/vec/mod.rs:1018:9)",
-"0x55d9d9eafc47: indexmap::map::core::IndexMapCore<K,V>::reserve_entries (src/map/core.rs:210:36)",
-"0x55d9d9eaf6b8: indexmap::map::core::IndexMapCore<K,V>::push_entry (src/map/core.rs:282:13)",
-"0x55d9d9a402d4: cedar_policy_core::ast::expr::ExprBuilder<T>::or (src/ast/expr.rs:945:23)",
-"0x55d9d9917c8f: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:881:41)",
-"0x55d9d99114f5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
-"0x55d9d9917419: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:859:25)",
-"0x55d9d9912b77: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d9be2267: cedar_policy_core::ast::expr::ExprBuilder<T>::sub (src/ast/expr.rs:993:19)",
-"0x55d9d9c9323f: cedar_policy_core::parser::cst_to_ast::construct_expr_add (src/parser/cst_to_ast.rs:2010:34)",
-"0x55d9d9a6a98d: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Add>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1123:38)",
-"0x55d9d9a68587: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::And>>>::to_expr_or_special (src/parser/cst_to_ast.rs:996:27)",
-"0x55d9d9ed7876: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3424:23)",
-"0x55d9da171b73: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9da171b73: regex_syntax::hir::translate::TranslatorI::hir_capture (src/hir/translate.rs:980:55)",
-"0x55d9da16b5e0: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_post (src/hir/translate.rs:456:42)",
-"0x55d9da169be6: regex_syntax::hir::translate::Translator::translate (src/hir/translate.rs:174:9)",
-"0x55d9d9f7af3c: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3434:23)",
-"0x55d9d9a40aa6: cedar_policy_core::ast::expr::ExprBuilder<T>::ite (src/ast/expr.rs:903:24)",
-"0x55d9d991637e: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}}::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:710:50)",
-"0x55d9d990e785: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
-"0x55d9d9915f2c: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:703:29)",
-"0x55d9d9911038: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9da183b14: regex_syntax::hir::Hir::empty (src/hir/mod.rs:259:21)",
-"0x55d9da1893d6: <regex_syntax::hir::Hir as core::ops::drop::Drop>::drop (src/hir/mod.rs:1864:57)",
-"0x55d9da176127: core::ptr::drop_in_place<regex_syntax::hir::Hir> (src/ptr/mod.rs:490:1)",
-"0x55d9da176c01: core::ptr::drop_in_place<[regex_syntax::hir::Hir]> (src/ptr/mod.rs:490:1)",
-"0x55d9da105dcb: <alloc::vec::Vec<T,A> as core::ops::drop::Drop>::drop (src/vec/mod.rs:3018:13)",
-"0x55d9d9be28f5: cedar_policy_core::ast::expr::ExprBuilder<T>::contains_all (src/ast/expr.rs:1038:19)",
-"0x55d9d9c955b0: cedar_policy_core::ast::expr::Expr::contains_all (src/ast/expr.rs:410:9)",
-"0x55d9d9c9ba73: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:549:75)",
-"0x55d9d9b1a8e5: cedar_policy_core::ast::expr_iterator::ExprIterator<T>::new (src/ast/expr_iterator.rs:35:31)",
-"0x55d9d9bde777: cedar_policy_core::ast::expr::Expr<T>::subexpressions (src/ast/expr.rs:258:9)",
-"0x55d9d9a328ce: cedar_policy_validator::expr_iterator::expr_entity_uids (cedar-policy-validator/src/expr_iterator.rs:23:5)",
-"0x55d9d9a32b1c: cedar_policy_validator::expr_iterator::policy_entity_uids (cedar-policy-validator/src/expr_iterator.rs:39:16)",
-"0x55d9d98d8726: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::validate_entity_types (cedar-policy-validator/src/rbac.rs:68:9)",
-"0x55d9d98d9357: cedar_policy_validator::Validator::validate_policy (cedar-policy-validator/src/lib.rs:103:9)",
-"0x55d9d99278c9: alloc::boxed::Box<T,A>::try_new_uninit_in (alloc/src/boxed.rs:483:19)",
-"0x55d9d992664a: alloc::boxed::Box<T,A>::new_uninit_in (alloc/src/boxed.rs:448:15)",
-"0x55d9d9927fec: <alloc::boxed::Box<T,A> as core::clone::Clone>::clone (alloc/src/boxed.rs:1281:25)",
-"0x55d9d99eccf1: <core::option::Option<T> as core::clone::Clone>::clone (core/src/option.rs:2041:29)",
-"0x55d9d9a3b38f: <cedar_policy_validator::types::Type as core::clone::Clone>::clone (cedar-policy-validator/src/types.rs:73:9)",
-"0x55d9d9922dee: cedar_policy_validator::typecheck::Typechecker::expect_one_of_types::{{closure}} (cedar-policy-validator/src/typecheck.rs:2026:25)",
-"0x55d9d9b1f43c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9aa5cd7: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa5cd7: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa5cd7: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9aa5cd7: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
-"0x55d9d9abf820: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
-"0x55d9d9acbe69: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9af0f5e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a6b491: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Mult>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1188:32)",
-"0x55d9d9c9f92f: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:483:17)",
-"0x55d9d9a9b26e: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a9b26e: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a9b26e: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9a9b26e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9acde9e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acbd29: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c5fb02: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9c5fb02: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
-"0x55d9d9a950f4: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d9cbd570: <serde::__private::de::content::ContentVisitor as serde::de::Visitor>::visit_map (src/private/de.rs:504:17)",
-"0x55d9d9a97776: serde_json::value::de::visit_object (src/value/de.rs:196:20)",
-"0x55d9d9a6005a: serde_json::value::de::<impl serde::de::Deserializer for serde_json::value::Value>::deserialize_any (src/value/de.rs:223:33)",
-"0x55d9d9a60e71: serde::de::Deserializer::__deserialize_content (src/de/mod.rs:1231:9)",
-"0x55d9d9c8599e: cedar_policy_core::ast::policy::PrincipalOrResourceConstraint::as_expr (src/ast/policy.rs:1260:17)",
-"0x55d9da1b6869: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
-"0x55d9da1b6869: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9da1b6869: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9da1b6869: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9da1b6869: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:162:25)",
-"0x55d9da1b6869: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
-"0x55d9da1b6869: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
-"0x55d9da1b6869: alloc::slice::<impl [T]>::to_vec (alloc/src/slice.rs:416:14)",
-"0x55d9da1b6869: std::sys::unix::os_str::Slice::to_owned (sys/unix/os_str.rs:213:33)",
-"0x55d9da1b6869: std::ffi::os_str::OsStr::to_os_string (src/ffi/os_str.rs:775:27)",
-"0x55d9da1b6869: std::path::Path::to_path_buf (std/src/path.rs:2151:34)",
-"0x55d9da1b6869: std::path::Path::_join (std/src/path.rs:2551:23)",
-"0x55d9da1b14a4: std::path::Path::join (std/src/path.rs:2547:9)",
-"0x55d9da1b14a4: std::sys::unix::fs::DirEntry::path (sys/unix/fs.rs:782:9)",
-"0x55d9da1b14a4: std::fs::DirEntry::path (std/src/fs.rs:1661:9)",
-"0x55d9d9778d15: corpus_tests::corpus_tests::{{closure}} (cedar-policy/tests/corpus_tests.rs:58:18)",
-"0x55d9d9763713: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
-"0x55d9d9782af6: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
-"0x55d9d9763493: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
-"0x55d9d975641f: <core::iter::adapters::filter::Filter<I,P> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/filter.rs:93:9)",
-"0x55d9d975646b: core::iter::traits::iterator::Iterator::find (iter/traits/iterator.rs:2773:9)",
-"0x55d9d9cf520b: cedar_policy_core::est::expr::Expr::get_attr (src/est/expr.rs:409:19)",
-"0x55d9d9cfe5cf: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Member>>::try_from (src/est/expr.rs:1261:62)",
-"0x55d9d9b39c73: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9b3cf49: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9abbb7d: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9d4e2eb: lalrpop_util::state_machine::Parser<D,I>::parse (lalrpop-util-0.20.0/src/state_machine.rs:259:21)",
-"0x55d9d9d4c34b: lalrpop_util::state_machine::Parser<D,I>::drive (lalrpop-util-0.20.0/src/state_machine.rs:218:9)",
-"0x55d9d9c151db: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9c151db: cedar_policy_core::ast::extension::ExtensionFunction::binary (src/ast/extension.rs:233:13)",
-"0x55d9d9b0e2e5: cedar_policy_core::extensions::decimal::extension (src/extensions/decimal.rs:281:13)",
-"0x55d9d992d17c: cedar_policy_validator::extensions::decimal::extension_schema (src/extensions/decimal.rs:57:23)",
-"0x55d9d9a5b693: cedar_policy_validator::extensions::all_available_extension_schemas (cedar-policy-validator/src/extensions.rs:35:9)",
-"0x55d9d9b55204: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d9b55204: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d9b55204: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d9b65818: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9999056: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9999056: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9999056: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:139:27)",
-"0x55d9d999961b: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
-"0x55d9d999961b: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
-"0x55d9d999961b: alloc::slice::<impl [T]>::to_vec (alloc/src/slice.rs:416:14)",
-"0x55d9d9922da9: cedar_policy_validator::typecheck::Typechecker::expect_one_of_types::{{closure}} (cedar-policy-validator/src/typecheck.rs:2025:25)",
-"0x55d9d9910419: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d9a2c7e2: cedar_policy_validator::typecheck::Typechecker::expect_one_of_types (cedar-policy-validator/src/typecheck.rs:2005:9)",
-"0x55d9d9be1dc5: cedar_policy_core::ast::expr::ExprBuilder<T>::lesseq (src/ast/expr.rs:964:19)",
-"0x55d9d9c948b0: cedar_policy_core::ast::expr::Expr::lesseq (src/ast/expr.rs:362:9)",
-"0x55d9d9c9e863: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:497:70)",
-"0x55d9d9bac971: cedar_policy_core::extensions::ipaddr::extension (src/extensions/ipaddr.rs:266:9)",
-"0x55d9d9b6775d: std::sync::once::Once::call_once (src/sync/once.rs:149:9)",
-"0x55d9d99053aa: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d99053aa: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_entities_satisfying_constraint (cedar-policy-validator/src/rbac.rs:398:37)",
-"0x55d9d98d8bde: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_in_fixes_resource (cedar-policy-validator/src/rbac.rs:182:14)",
-"0x55d9d98d8deb: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::validate_action_application (cedar-policy-validator/src/rbac.rs:284:37)",
-"0x55d9d99c6374: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d99c6374: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d99c6374: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d99d51a8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9a9a345: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a9a345: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a9a345: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9a9a345: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9acdcce: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acc107: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c2a4ee: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a70deb: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1647:36)",
-"0x55d9da16fb40: regex_syntax::hir::translate::TranslatorI::pop_concat_expr (src/hir/translate.rs:752:44)",
-"0x55d9da16af77: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_post (src/hir/translate.rs:460:40)",
-"0x55d9d9b71ac8: cedar_policy_core::evaluator::Evaluator::eval_in (cedar-policy-core/src/evaluator.rs:586:21)",
-"0x55d9d9cb9aa3: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:146:32)",
-"0x55d9d9ac41e8: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
-"0x55d9d9ac41e8: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
-"0x55d9d9ac41e8: <alloc::vec::Vec<T,A> as core::clone::Clone>::clone (src/vec/mod.rs:2643:9)",
-"0x55d9d9fa22ea: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9fa22ea: regex_automata::util::pool::Pool<T,F>::new (src/util/pool.rs:160:14)",
-"0x55d9d9bad054: cedar_policy_core::extensions::ipaddr::extension (src/extensions/ipaddr.rs:281:13)",
-"0x55d9d9a403d5: cedar_policy_core::ast::expr::ExprBuilder<T>::or (src/ast/expr.rs:946:24)",
-"0x55d9d9917762: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:906:37)",
-"0x55d9d9911658: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d9f66c44: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:482:34)",
-"0x55d9da18542e: regex_syntax::hir::Hir::concat (src/hir/mod.rs:477:22)",
-"0x55d9d9bad864: cedar_policy_core::extensions::ipaddr::extension (src/extensions/ipaddr.rs:302:13)",
-"0x55d9d9b208cc: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9aa2ce1: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa2ce1: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa2ce1: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9aa2ce1: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
-"0x55d9d9acdcfb: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acc0d6: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9af0fdb: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9c86433: cedar_policy_core::ast::policy::ActionConstraint::iter_euids (src/ast/policy.rs:1361:39)",
-"0x55d9d9d4c7cc: lalrpop_util::state_machine::Parser<D,I>::drive (lalrpop-util-0.20.0/src/state_machine.rs:221:21)",
-"0x55d9d9bed592: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::PolicyParser::parse (src/parser/grammar.rs:35300:13)",
-"0x55d9d9bb4d6a: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9b40543: cedar_policy_core::parser::text_to_cst::parse_collect_errors (src/parser/text_to_cst.rs:49:18)",
-"0x55d9d9d074f6: cedar_policy_core::parser::text_to_cst::parse_policy (src/parser/text_to_cst.rs:89:5)",
-"0x55d9d9c70e17: cedar_policy_core::parser::parse_policy_or_template_to_est (cedar-policy-core/src/parser.rs:212:15)",
-"0x55d9d9f700fb: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9f700fb: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
-"0x55d9d9f79919: regex_automata::meta::regex::RegexInfo::new (src/meta/regex.rs:1932:19)",
-"0x55d9d9bdbbb5: core::iter::traits::iterator::Iterator::partition::extend::{{closure}} (iter/traits/iterator.rs:2096:21)",
-"0x55d9d9f71d27: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
-"0x55d9d9f71d27: alloc::sync::Arc<[T]>::allocate_for_slice::{{closure}} (alloc/src/sync.rs:1380:33)",
-"0x55d9d9f6f121: alloc::sync::Arc<T>::try_allocate_for_layout (alloc/src/sync.rs:1322:19)",
-"0x55d9d9f6efbb: alloc::sync::Arc<T>::allocate_for_layout (alloc/src/sync.rs:1304:13)",
-"0x55d9d9f71ca4: alloc::sync::Arc<[T]>::allocate_for_slice (alloc/src/sync.rs:1378:13)",
-"0x55d9d9f71bee: alloc::sync::Arc<[T]>::copy_from_slice (alloc/src/sync.rs:1392:23)",
-"0x55d9d9edd361: <alloc::sync::Arc<[T]> as alloc::sync::ArcFromSlice<T>>::from_slice (alloc/src/sync.rs:1468:18)",
-"0x55d9d9edd361: <alloc::sync::Arc<[T]> as core::convert::From<&[T]>>::from (alloc/src/sync.rs:2672:9)",
-"0x55d9d9edd361: <alloc::sync::Arc<str> as core::convert::From<&str>>::from (alloc/src/sync.rs:2690:19)",
-"0x55d9d9edbad8: regex::builders::Builder::build_one_string (regex-1.9.5/src/builders.rs:78:23)",
-"0x55d9d9b2f863: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9b3ce89: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9aba1dd: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9d4d7a3: lalrpop_util::state_machine::Parser<D,I>::parse (lalrpop-util-0.20.0/src/state_machine.rs:259:21)",
-"0x55d9d9d4c92b: lalrpop_util::state_machine::Parser<D,I>::drive (lalrpop-util-0.20.0/src/state_machine.rs:218:9)",
-"0x55d9d9cf54d1: cedar_policy_core::est::expr::Expr::ite (src/est/expr.rs:433:24)",
-"0x55d9d9cf6296: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Expr>>::try_from (src/est/expr.rs:735:24)",
-"0x55d9d9d3c257: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
-"0x55d9d9cfc282: cedar_policy_core::est::expr::interpret_primary (src/est/expr.rs:1130:41)",
-"0x55d9d9cfdcab: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Member>>::try_from (src/est/expr.rs:1171:24)",
-"0x55d9d9bd48f9: <indexmap::Bucket<K,V> as core::clone::Clone>::clone (indexmap-2.0.1/src/lib.rs:171:18)",
-"0x55d9d9bb21a0: core::ops::function::FnMut::call_mut (src/ops/function.rs:166:5)",
-"0x55d9d9afa10b: core::iter::adapters::map::map_fold::{{closure}} (iter/adapters/map.rs:84:28)",
-"0x55d9d9b9ce08: core::iter::traits::iterator::Iterator::fold (iter/traits/iterator.rs:2482:21)",
-"0x55d9d9aeb63a: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::fold (iter/adapters/map.rs:124:9)",
-"0x55d9d9d08bb3: <core::iter::adapters::cloned::Cloned<I> as core::iter::traits::iterator::Iterator>::fold (iter/adapters/cloned.rs:60:9)",
-"0x55d9d9d08f6a: core::iter::traits::iterator::Iterator::for_each (iter/traits/iterator.rs:857:9)",
-"0x55d9d9f73367: <alloc::sync::Arc<[T]> as alloc::sync::ArcFromSlice<T>>::from_slice (alloc/src/sync.rs:1468:18)",
-"0x55d9d9f733c7: <alloc::sync::Arc<[T]> as core::convert::From<&[T]>>::from (alloc/src/sync.rs:2672:9)",
-"0x55d9d9c142a6: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9c142a6: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9c142a6: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9c142a6: alloc::string::String::with_capacity (alloc/src/string.rs:499:23)",
-"0x55d9d9baa0c0: itertools::Itertools::join (itertools-0.10.5/src/lib.rs:2067:34)",
-"0x55d9d9d5c0ab: cedar_policy_core::evaluator::err::pretty_type_error (src/evaluator/err.rs:279:17)",
-"0x55d9d9d5c72d: <cedar_policy_core::evaluator::err::EvaluationErrorKind as core::fmt::Display>::fmt (src/evaluator/err.rs:213:19)",
-"0x55d9d9d5b6bf: <cedar_policy_core::evaluator::err::EvaluationError as core::fmt::Display>::fmt (src/evaluator/err.rs:36:13)",
-"0x55d9d9c92037: cedar_policy_core::parser::cst_to_ast::construct_expr_or (src/parser/cst_to_ast.rs:1967:17)",
-"0x55d9d9c9053e: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Or>>>::to_expr_or_special::{{closure}} (src/parser/cst_to_ast.rs:957:46)",
-"0x55d9d9c1af8d: core::option::Option<T>::map (core/src/option.rs:1099:29)",
-"0x55d9d9a6818b: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Or>>>::to_expr_or_special (src/parser/cst_to_ast.rs:955:55)",
-"0x55d9d99222ec: cedar_policy_validator::typecheck::Typechecker::entity_in_descendants (cedar-policy-validator/src/typecheck.rs:1920:13)",
-"0x55d9d9921d35: cedar_policy_validator::typecheck::Typechecker::type_of_euid_in_euids (cedar-policy-validator/src/typecheck.rs:1888:13)",
-"0x55d9d9920466: cedar_policy_validator::typecheck::Typechecker::type_of_entity_literal_in_entity_literals (cedar-policy-validator/src/typecheck.rs:1822:25)",
-"0x55d9d991dba9: cedar_policy_validator::typecheck::Typechecker::typecheck_in::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1626:92)",
-"0x55d9d9b1dcbe: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9aa9358: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa9358: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa9358: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9bd5667: lalrpop_util::lexer::MatcherBuilder::new (lalrpop-util-0.20.0/src/lexer.rs:31:29)",
-"0x55d9d9c8f9ee: cedar_policy_core::parser::text_to_cst::grammar::__intern_token::new_builder (src/parser/grammar.rs:57323:9)",
-"0x55d9d9d8a33b: cedar_policy_core::parser::text_to_cst::grammar::__parse__Name::NameParser::new (src/parser/grammar.rs:17781:29)",
-"0x55d9d9bb36d1: <cedar_policy_core::parser::text_to_cst::NAME_PARSER as core::ops::deref::Deref>::deref::__static_ref_initialize (src/parser/text_to_cst.rs:76:51)",
-"0x55d9d9bb36d1: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9da1d63b1: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
-"0x55d9da1d63b1: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9da1d63b1: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9da1d63b1: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9da1d63b1: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9da1d63b1: alloc::string::String::with_capacity (alloc/src/string.rs:499:23)",
-"0x55d9da1d63b1: alloc::fmt::format::format_inner (alloc/src/fmt.rs:611:26)",
-"0x55d9da11a735: alloc::fmt::format::{{closure}} (alloc/src/fmt.rs:616:34)",
-"0x55d9da139eee: core::option::Option<T>::map_or_else (core/src/option.rs:1193:21)",
-"0x55d9d9c16e7d: alloc::fmt::format (alloc/src/fmt.rs:616:5)",
-"0x55d9d9c8fe86: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Policies>>>::with_generated_policyids::{{closure}} (src/parser/cst_to_ast.rs:90:66)",
-"0x55d9d9afa4eb: core::iter::adapters::map::map_fold::{{closure}} (iter/adapters/map.rs:84:28)",
-"0x55d9d9cc01ce: <core::iter::adapters::enumerate::Enumerate<I> as core::iter::traits::iterator::Iterator>::fold::enumerate::{{closure}} (iter/adapters/enumerate.rs:107:27)",
-"0x55d9d9b9c991: core::iter::traits::iterator::Iterator::fold (iter/traits/iterator.rs:2482:21)",
-"0x55d9d9bde7ae: cedar_policy_core::ast::expr::Expr<T>::slots (src/ast/expr.rs:263:9)",
-"0x55d9d9c83f42: <cedar_policy_core::ast::policy::Template as core::convert::From<cedar_policy_core::ast::policy::TemplateBody>>::from (src/ast/policy.rs:233:21)",
-"0x55d9d9b799db: cedar_policy_core::est::Policy::try_into_ast_template (cedar-policy-core/src/est.rs:230:12)",
-"0x55d9d99c1694: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d99c1694: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d99c1694: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d99d5468: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9be27c7: cedar_policy_core::ast::expr::ExprBuilder<T>::contains (src/ast/expr.rs:1030:19)",
-"0x55d9d99be874: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d99be874: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d99be874: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d99d5258: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9b237ce: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9aa1d36: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa1d36: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa1d36: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9aa1d36: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9abde5c: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
-"0x55d9d9acca87: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c5f8c2: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9c5f8c2: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
-"0x55d9d9a95d08: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9da14d7f3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9da152ea9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9da1018ed: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9ed7a1d: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3429:13)",
-"0x55d9d9bacdea: cedar_policy_core::extensions::ipaddr::extension (src/extensions/ipaddr.rs:274:13)",
-"0x55d9d999ce4e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d993bbf4: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d993bbf4: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d993bbf4: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d993bbf4: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d994907e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9948417: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d99dc39e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d98fe3dc: <alloc::collections::btree::map::BTreeMap<K,V> as core::iter::traits::collect::FromIterator<(K,V)>>::from_iter (collections/btree/map.rs:2229:34)",
-"0x55d9d986773a: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9864648: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d999e2de: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d993b4a7: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d993b4a7: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d993b4a7: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d993b4a7: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
-"0x55d9d99490de: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d99486a9: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d99dc15e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a28d25: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:1110:34)",
-"0x55d9d9916af2: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:817:41)",
-"0x55d9d9be2cd7: cedar_policy_core::ast::expr::ExprBuilder<T>::set (src/ast/expr.rs:1054:43)",
-"0x55d9d9bdf4b7: cedar_policy_core::ast::expr::Expr::set (src/ast/expr.rs:420:9)",
-"0x55d9d9b7a3f2: cedar_policy_core::ast::restricted_expr::RestrictedExpr::set (src/ast/restricted_expr.rs:98:29)",
-"0x55d9d98b1978: cedar_policy_core::entities::json::jsonvalue::ValueParser::val_into_rexpr (entities/json/jsonvalue.rs:314:58)",
-"0x55d9d98b8999: cedar_policy_core::entities::json::jsonvalue::ValueParser::val_into_rexpr::{{closure}} (entities/json/jsonvalue.rs:345:43)",
-"0x55d9d9c81843: cedar_policy_core::parser::cst_to_ast::construct_name (src/parser/cst_to_ast.rs:1930:15)",
-"0x55d9d9a718ea: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Name>>>::to_name (src/parser/cst_to_ast.rs:1720:58)",
-"0x55d9d9a71e4d: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Ref>>>::to_ref (src/parser/cst_to_ast.rs:1803:34)",
-"0x55d9d9a72377: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Ref>>>::to_expr (src/parser/cst_to_ast.rs:1832:9)",
-"0x55d9d9a70c66: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1632:37)",
-"0x55d9d998244e: cedar_policy_validator::extensions::ipaddr::get_argument_types (src/extensions/ipaddr.rs:31:24)",
-"0x55d9d9a472fd: cedar_policy_validator::extensions::ipaddr::extension_schema::{{closure}} (src/extensions/ipaddr.rs:71:17)",
-"0x55d9d9a470af: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
-"0x55d9d99e94e2: core::option::Option<T>::map (core/src/option.rs:1099:29)",
-"0x55d9d99d88dd: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::next (iter/adapters/map.rs:103:9)",
-"0x55d9d993809f: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:26:32)",
-"0x55d9d9b0d581: cedar_policy_core::extensions::decimal::extension (src/extensions/decimal.rs:253:13)",
-"0x55d9d9904f80: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9904f80: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_entities_satisfying_constraint (cedar-policy-validator/src/rbac.rs:390:17)",
-"0x55d9d99de7fc: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
-"0x55d9d9b70893: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:307:28)",
-"0x55d9d9c77465: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_ref_or_refs (src/parser/cst_to_ast.rs:1603:61)",
-"0x55d9d9c76912: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_ref_or_refs (src/parser/cst_to_ast.rs:1342:18)",
-"0x55d9d9c914f3: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_expr_or_special::{{closure}} (src/parser/cst_to_ast.rs:1462:49)",
-"0x55d9d9c2558a: core::option::Option<T>::and_then (core/src/option.rs:1440:24)",
-"0x55d9d9f70829: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9f70829: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
-"0x55d9d9fbf84d: regex_automata::util::captures::GroupInfo::new (src/util/captures.rs:1608:22)",
-"0x55d9d9ef7338: regex_automata::nfa::thompson::nfa::Inner::set_captures (nfa/thompson/nfa.rs:1432:27)",
-"0x55d9d9f65bcf: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:439:9)",
-"0x55d9d9a7aac4: cedar_policy_core::entities::json::jsonvalue::_::<impl serde::de::Deserialize for cedar_policy_core::entities::json::jsonvalue::JSONValue>::deserialize (entities/json/jsonvalue.rs:38:39)",
-"0x55d9d9b3f467: <core::marker::PhantomData<T> as serde::de::DeserializeSeed>::deserialize (src/de/mod.rs:794:9)",
-"0x55d9d984651a: <serde::__private::de::content::VariantRefDeserializer<E> as serde::de::VariantAccess>::newtype_variant_seed (src/private/de.rs:2140:32)",
-"0x55d9d9846bc7: serde::de::VariantAccess::newtype_variant (src/de/mod.rs:2119:9)",
-"0x55d9da1b0ca7: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
-"0x55d9da1b0ca7: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9da1b0ca7: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9da1b0ca7: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9da1b0ca7: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9da1b0ca7: alloc::string::String::with_capacity (alloc/src/string.rs:499:23)",
-"0x55d9da1b0ca7: std::fs::read_to_string::inner (std/src/fs.rs:293:26)",
-"0x55d9d97828b1: std::fs::read_to_string (std/src/fs.rs:297:5)",
-"0x55d9d975907f: cedar_policy::integration_testing::perform_integration_test_from_json_custom (cedar-policy/src/integration_testing.rs:223:23)",
-"0x55d9d9ca82d4: serde::ser::Serializer::collect_seq (src/ser/mod.rs:1277:35)",
-"0x55d9d9ac2c86: serde::ser::impls::<impl serde::ser::Serialize for alloc::vec::Vec<T>>::serialize (src/ser/impls.rs:194:17)",
-"0x55d9d9ac2bc9: serde::ser::impls::<impl serde::ser::Serialize for &T>::serialize (src/ser/impls.rs:456:17)",
-"0x55d9da188fde: <regex_syntax::hir::Hir as core::ops::drop::Drop>::drop (src/hir/mod.rs:1853:25)",
-"0x55d9da177987: core::ptr::drop_in_place<alloc::vec::Vec<regex_syntax::hir::Hir>> (src/ptr/mod.rs:490:1)",
-"0x55d9d9f7b19f: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3442:5)",
-"0x55d9d9a60aa6: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a60aa6: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a60aa6: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:139:27)",
-"0x55d9d9ac3c48: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
-"0x55d9d9ac3c48: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
-"0x55d9d9ac3c48: <alloc::vec::Vec<T,A> as core::clone::Clone>::clone (src/vec/mod.rs:2643:9)",
-"0x55d9d9be7db6: <serde_json::value::Value as core::clone::Clone>::clone (src/value/mod.rs:159:11)",
-"0x55d9d9bd4908: <indexmap::Bucket<K,V> as core::clone::Clone>::clone (indexmap-2.0.1/src/lib.rs:172:20)",
-"0x55d9d9c77b85: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_ref_or_refs (src/parser/cst_to_ast.rs:1603:61)",
-"0x55d9d9c76ba2: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_ref_or_refs (src/parser/cst_to_ast.rs:1342:18)",
-"0x55d9d9d0d42b: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::PoliciesParser::new (src/parser/grammar.rs:26540:29)",
-"0x55d9d9bb4421: <cedar_policy_core::parser::text_to_cst::POLICIES_PARSER as core::ops::deref::Deref>::deref::__static_ref_initialize (src/parser/text_to_cst.rs:71:59)",
-"0x55d9d9bb4421: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9c95420: cedar_policy_core::ast::expr::Expr::contains (src/ast/expr.rs:405:9)",
-"0x55d9d9c9bee9: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:545:72)",
-"0x55d9d9be374d: cedar_policy_core::ast::expr::ExprBuilder<T>::call_extension_fn (src/ast/expr.rs:1069:19)",
-"0x55d9d9c9586a: cedar_policy_core::ast::expr::Expr::call_extension_fn (src/ast/expr.rs:431:9)",
-"0x55d9d9c99870: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:606:28)",
-"0x55d9d9c824d1: cedar_policy_core::parser::cst_to_ast::construct_expr_rel (src/parser/cst_to_ast.rs:1991:31)",
-"0x55d9d9d16788: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce15 (src/parser/grammar.rs:28256:20)",
-"0x55d9d9d0ddc0: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26664:17)",
-"0x55d9d9916e96: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:798:45)",
-"0x55d9d9be1e67: cedar_policy_core::ast::expr::ExprBuilder<T>::lesseq (src/ast/expr.rs:965:19)",
-"0x55d9d9b1eb6e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9aa0cd7: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa0cd7: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa0cd7: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9aa0cd7: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
-"0x55d9d9acdfde: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acc637: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c1802e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9ccb689: cedar_policy_core::parser::text_to_cst::grammar::__action99 (src/parser/grammar.rs:58992:5)",
-"0x55d9d9be1079: cedar_policy_core::ast::expr::ExprBuilder<T>::ite (src/ast/expr.rs:903:24)",
-"0x55d9d9ebbe32: <serde_json::value::de::KeyClassifier as serde::de::Visitor>::visit_str (src/value/de.rs:1280:35)",
-"0x55d9d976e3d3: <serde_json::de::MapKey<R> as serde::de::Deserializer>::deserialize_any (serde_json-1.0.107/src/de.rs:2186:37)",
-"0x55d9d9866a77: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9ec7edf: <serde_json::de::MapKey<R> as serde::de::Deserializer>::deserialize_any (serde_json-1.0.107/src/de.rs:2186:37)",
-"0x55d9d9c9ea2c: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:494:17)",
-"0x55d9d9f7cf86: regex_automata::util::determinize::epsilon_closure (util/determinize/mod.rs:360:5)",
-"0x55d9d9f061b1: regex_automata::hybrid::dfa::Lazy::cache_start_one (src/hybrid/dfa.rs:2173:9)",
-"0x55d9d9a41d34: cedar_policy_core::ast::expr::ExprBuilder<T>::get_attr (src/ast/expr.rs:1098:19)",
-"0x55d9d9918234: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:944:42)",
-"0x55d9d99120d5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
-"0x55d9d9a292ff: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:940:17)",
-"0x55d9d9f3a6a3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9f43669: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9ee3fc6: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9f681e1: regex_automata::nfa::thompson::builder::Builder::add (nfa/thompson/builder.rs:1118:9)",
-"0x55d9d9f6769a: regex_automata::nfa::thompson::builder::Builder::add_empty (nfa/thompson/builder.rs:693:9)",
-"0x55d9d9c9ccdb: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:523:17)",
-"0x55d9d990da48: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9da123d62: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9da123d62: regex_syntax::ast::parse::ParserI<P>::parse_uncounted_repetition (src/ast/parse.rs:1067:18)",
-"0x55d9da122cdc: regex_syntax::ast::parse::ParserI<P>::parse_with_comments (src/ast/parse.rs:988:30)",
-"0x55d9d99316a7: cedar_policy_validator::schema::ValidatorNamespaceDef::try_schema_type_into_validator_type (cedar-policy-validator/src/schema.rs:678:17)",
-"0x55d9d9993144: cedar_policy_validator::schema::ValidatorNamespaceDef::parse_record_attributes::{{closure}} (cedar-policy-validator/src/schema.rs:546:25)",
-"0x55d9d99dd50e: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
-"0x55d9d9dc5d5c: <alloc::alloc::Global as core::alloc::Allocator>::allocate_zeroed (alloc/src/alloc.rs:240:9)",
-"0x55d9d9dc465c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:185:38)",
-"0x55d9d9dc3b73: alloc::raw_vec::RawVec<T,A>::with_capacity_zeroed_in (alloc/src/raw_vec.rs:138:9)",
-"0x55d9d9dc3b73: <T as alloc::vec::spec_from_elem::SpecFromElem>::from_elem (src/vec/spec_from_elem.rs:25:31)",
-"0x55d9d9dc3a9b: alloc::vec::from_elem (src/vec/mod.rs:2550:5)",
-"0x55d9d9a44f18: cedar_policy_validator::fuzzy_match::levenshtein_distance (cedar-policy-validator/src/fuzzy_match.rs:38:27)",
-"0x55d9d99c5414: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d99c5414: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d99c5414: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d99d5518: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9b1cb1e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9937306: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9937306: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9937306: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9937306: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d994901e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9948967: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d98ff46e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a39ec5: cedar_policy_validator::types::EntityRecordKind::all_attrs (cedar-policy-validator/src/types.rs:1107:17)",
-"0x55d9d9cbdf0d: cedar_policy_core::ast::name::Name::unqualified_name (src/ast/name.rs:60:19)",
-"0x55d9d9a702c5: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1398:41)",
-"0x55d9d9a6bd28: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Unary>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1255:21)",
-"0x55d9d9a6ac4f: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Mult>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1155:27)",
-"0x55d9d9a9dff6: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a9dff6: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a9dff6: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9a9dff6: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9abfb5c: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
-"0x55d9d9accbe7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c5f9b2: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9c5f9b2: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
-"0x55d9d9a95788: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d9b0f8c1: cedar_policy_core::evaluator::<impl cedar_policy_core::ast::value::Value>::get_as_set (cedar-policy-core/src/evaluator.rs:793:50)",
-"0x55d9d9b6eb87: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:433:40)",
-"0x55d9d9cf460d: cedar_policy_core::est::expr::Expr::lesseq (src/est/expr.rs:322:20)",
-"0x55d9d9cf9648: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Relation>>::try_from (src/est/expr.rs:807:36)",
-"0x55d9d9f3b963: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9f43ae9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9ee2934: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9fc0153: regex_automata::util::captures::GroupInfoInner::add_first_group (src/util/captures.rs:2201:9)",
-"0x55d9d9fbf438: regex_automata::util::captures::GroupInfo::new (src/util/captures.rs:1594:13)",
-"0x55d9d9f24048: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9f24048: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9f24048: <T as alloc::vec::spec_from_elem::SpecFromElem>::from_elem (src/vec/spec_from_elem.rs:15:21)",
-"0x55d9d9ee5b1a: alloc::vec::from_elem (src/vec/mod.rs:2550:5)",
-"0x55d9d9f2591e: regex_automata::dfa::onepass::InternalBuilder::new (src/dfa/onepass.rs:566:28)",
-"0x55d9d9f254f0: regex_automata::dfa::onepass::Builder::build_from_nfa (src/dfa/onepass.rs:413:9)",
-"0x55d9d9fc8600: regex_automata::meta::wrappers::OnePassEngine::new (src/meta/wrappers.rs:402:26)",
-"0x55d9d9f7ad41: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3429:13)",
-"0x55d9da18af43: regex_syntax::hir::Properties::capture (src/hir/mod.rs:2488:16)",
-"0x55d9da184417: regex_syntax::hir::Hir::capture (src/hir/mod.rs:392:21)",
-"0x55d9da171c56: regex_syntax::hir::translate::TranslatorI::hir_capture (src/hir/translate.rs:980:9)",
-"0x55d9d9932a89: <cedar_policy_validator::schema::EntityTypeDescription as cedar_policy_core::entities::json::schema::EntityTypeDescription>::attr_type (cedar-policy-validator/src/schema.rs:1352:73)",
-"0x55d9d9b1e58c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9aa2776: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa2776: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa2776: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9aa2776: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9acdd1e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9accf97: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c2a50e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9b07b59: cedar_policy_core::extensions::Extensions::func (cedar-policy-core/src/extensions.rs:82:56)",
-"0x55d9d9ccc56f: cedar_policy_core::parser::text_to_cst::grammar::__action140 (src/parser/grammar.rs:59598:5)",
-"0x55d9d9d28f8a: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce150 (src/parser/grammar.rs:30976:20)",
-"0x55d9d9d0f935: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:27078:17)",
-"0x55d9d9d52cfe: lalrpop_util::state_machine::Parser<D,I>::parse_eof (lalrpop-util-0.20.0/src/state_machine.rs:295:21)",
-"0x55d9d9d4d976: lalrpop_util::state_machine::Parser<D,I>::parse (lalrpop-util-0.20.0/src/state_machine.rs:240:42)",
-"0x55d9d98689bd: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9bd65df: serde::de::Error::missing_field (src/de/mod.rs:287:17)",
-"0x55d9d9bcf8bb: <serde::__private::de::missing_field::MissingFieldDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:40:17)",
-"0x55d9d9bcfa65: <serde::__private::de::missing_field::MissingFieldDeserializer<E> as serde::de::Deserializer>::deserialize_struct (serde-1.0.188/src/macros.rs:133:13)",
-"0x55d9d9a7ce2b: cedar_policy_core::entities::json::jsonvalue::_::<impl serde::de::Deserialize for cedar_policy_core::entities::json::jsonvalue::TypeAndId>::deserialize (entities/json/jsonvalue.rs:80:39)",
-"0x55d9d9ccd29f: cedar_policy_core::parser::text_to_cst::grammar::__action153 (src/parser/grammar.rs:59787:5)",
-"0x55d9d9cce87c: cedar_policy_core::parser::text_to_cst::grammar::__action178 (src/parser/grammar.rs:60161:5)",
-"0x55d9d9bf5518: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce7 (src/parser/grammar.rs:36837:20)",
-"0x55d9d9bedcb8: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35382:17)",
-"0x55d9d9b51c34: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d9b51c34: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d9b51c34: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d9b65348: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9f65ee7: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:454:34)",
-"0x55d9d99a3ba3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d99a7299: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d994495f: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d991850d: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:961:37)",
-"0x55d9d9bac303: cedar_policy_core::extensions::ipaddr::is_loopback (src/extensions/ipaddr.rs:239:18)",
-"0x55d9d9bb17a4: core::ops::function::Fn::call (src/ops/function.rs:79:5)",
-"0x55d9d9c14182: alloc::str::<impl alloc::borrow::ToOwned for str>::to_owned (alloc/src/str.rs:209:46)",
-"0x55d9d9c14182: <alloc::string::String as core::convert::From<&str>>::from (alloc/src/string.rs:2650:11)",
-"0x55d9d9c14182: <str as alloc::string::ToString>::to_string (alloc/src/string.rs:2596:9)",
-"0x55d9d9d53bf5: regex::builders::Builder::new::{{closure}} (regex-1.9.5/src/builders.rs:66:52)",
-"0x55d9d9d53a5b: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
-"0x55d9d9c9b7cc: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:550:17)",
-"0x55d9da122d69: regex_syntax::ast::parse::ParserI<P>::parse_with_comments (src/ast/parse.rs:994:30)",
-"0x55d9d99cae1d: hashbrown::raw::RawTable<T,A>::new_uninitialized (src/raw/mod.rs:442:20)",
-"0x55d9d99acaf5: <hashbrown::raw::RawTable<T,A> as core::clone::Clone>::clone (src/raw/mod.rs:1606:39)",
-"0x55d9d99866f6: <hashbrown::map::HashMap<K,V,S,A> as core::clone::Clone>::clone (hashbrown-0.12.3/src/map.rs:197:20)",
-"0x55d9d99e2f2d: <hashbrown::set::HashSet<T,S,A> as core::clone::Clone>::clone (hashbrown-0.12.3/src/set.rs:122:18)",
-"0x55d9d9bb2109: core::ops::function::FnMut::call_mut (src/ops/function.rs:166:5)",
-"0x55d9d9cf4b4d: cedar_policy_core::est::expr::Expr::or (src/est/expr.rs:354:20)",
-"0x55d9d9cf7076: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Or>>::try_from (src/est/expr.rs:755:20)",
-"0x55d9d9cf6834: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Expr>>::try_from (src/est/expr.rs:719:28)",
-"0x55d9da172008: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9da172008: regex_syntax::hir::translate::TranslatorI::hir_repetition (src/hir/translate.rs:1005:18)",
-"0x55d9da16b703: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_post (src/hir/translate.rs:450:42)",
-"0x55d9d9ed7c14: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3434:23)",
-"0x55d9d9eec15d: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9eec15d: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9eec15d: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:162:25)",
-"0x55d9d9ee5e68: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
-"0x55d9d9ee5e68: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
-"0x55d9d9ee5e68: <alloc::vec::Vec<T,A> as core::clone::Clone>::clone (src/vec/mod.rs:2643:9)",
-"0x55d9d9ef5801: regex_automata::nfa::thompson::compiler::Utf8Compiler::compile (nfa/thompson/compiler.rs:1804:42)",
-"0x55d9d9ef562a: regex_automata::nfa::thompson::compiler::Utf8Compiler::compile_from (nfa/thompson/compiler.rs:1790:20)",
-"0x55d9d9ef515e: regex_automata::nfa::thompson::compiler::Utf8Compiler::finish (nfa/thompson/compiler.rs:1764:9)",
-"0x55d9d9aa30ae: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa30ae: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa30ae: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9aa30ae: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9acddfe: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acc397: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c17782: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9c17782: <core::option::Option<V> as core::iter::traits::collect::FromIterator<core::option::Option<A>>>::from_iter::{{closure}} (core/src/option.rs:2505:51)",
-"0x55d9d9a94a82: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d99bc204: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d99bc204: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d99bc204: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d99d4f98: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9cbefa8: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::ast::name::Id>::to_meth (src/parser/cst_to_ast.rs:440:45)",
-"0x55d9d975901f: cedar_policy::integration_testing::perform_integration_test_from_json_custom (cedar-policy/src/integration_testing.rs:222:23)",
-"0x55d9d991d479: cedar_policy_validator::typecheck::Typechecker::typecheck_in::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1566:25)",
-"0x55d9d9912548: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d98661f5: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9932e2d: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9932e2d: <cedar_policy_validator::schema::ValidatorEntityType as cedar_policy_core::transitive_closure::TCNode<cedar_policy_core::ast::name::Name>>::out_edges (cedar-policy-validator/src/schema.rs:1445:9)",
-"0x55d9d99f00c6: cedar_policy_core::transitive_closure::add_ancestors_to_set (cedar-policy-core/src/transitive_closure.rs:153:25)",
-"0x55d9d99ef2f7: cedar_policy_core::transitive_closure::compute_tc_internal (cedar-policy-core/src/transitive_closure.rs:82:9)",
-"0x55d9d99ee5ff: cedar_policy_core::transitive_closure::compute_tc (cedar-policy-core/src/transitive_closure.rs:59:15)",
-"0x55d9d9995667: cedar_policy_validator::schema::ValidatorSchema::from_schema_fragments (cedar-policy-validator/src/schema.rs:963:9)",
-"0x55d9d9931b19: <cedar_policy_validator::schema::ValidatorSchema as core::convert::TryFrom<cedar_policy_validator::schema_file_format::SchemaFragment>>::try_from (cedar-policy-validator/src/schema.rs:808:9)",
-"0x55d9d9b2291e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9a9cf27: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a9cf27: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a9cf27: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9a9cf27: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
-"0x55d9d9acdcae: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acbde7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9af11fe: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a6ca86: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1358:37)",
-"0x55d9d9b71106: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:280:28)",
-"0x55d9d9f72679: <alloc::sync::Arc<T> as core::default::Default>::default (alloc/src/sync.rs:2624:9)",
-"0x55d9d9fc34f7: <regex_automata::util::captures::GroupInfo as core::default::Default>::default (src/util/captures.rs:1450:22)",
-"0x55d9d9efb514: <regex_automata::nfa::thompson::nfa::Inner as core::default::Default>::default (nfa/thompson/nfa.rs:1214:5)",
-"0x55d9d9f659ab: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:423:23)",
-"0x55d9d9eec24b: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
-"0x55d9d9eec24b: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
-"0x55d9d9eec24b: alloc::slice::<impl [T]>::to_vec (alloc/src/slice.rs:416:14)",
-"0x55d9d9f66d82: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:464:33)",
-"0x55d9d999ee9c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d993a381: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d993a381: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d993a381: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d993a381: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9948e5e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9948457: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d99dc05e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d98d8bf6: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_in_fixes_resource (cedar-policy-validator/src/rbac.rs:182:14)",
-"0x55d9d9863a29: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d98cbffe: <serde_json::value::ser::SerializeStructVariant as serde::ser::SerializeStructVariant>::serialize_field (src/value/ser.rs:694:25)",
-"0x55d9d986442e: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9863fed: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d99c3554: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d99c3554: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d99c3554: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d99d5308: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9a2b5f4: cedar_policy_validator::typecheck::Typechecker::typecheck_in (cedar-policy-validator/src/typecheck.rs:1536:17)",
-"0x55d9d9a2a3d3: cedar_policy_validator::typecheck::Typechecker::typecheck_binary (cedar-policy-validator/src/typecheck.rs:1312:17)",
-"0x55d9d9a28a58: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:920:17)",
-"0x55d9d9a2a14e: cedar_policy_validator::typecheck::Typechecker::typecheck_binary (cedar-policy-validator/src/typecheck.rs:1225:30)",
-"0x55d9d9b20bbe: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9a99841: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a99841: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a99841: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9a99841: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
-"0x55d9d9acdbdb: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9accf66: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9af102b: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a626b8: <cedar_policy_core::est::head_constraints::ActionConstraint as core::convert::From<cedar_policy_core::ast::policy::ActionConstraint>>::from (src/est/head_constraints.rs:376:31)",
-"0x55d9da1506d3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9da152fc9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9da100df1: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9f7b144: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3439:13)",
-"0x55d9d9f3da33: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9f437b9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9ee3ac1: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9fc0182: regex_automata::util::captures::GroupInfoInner::add_first_group (src/util/captures.rs:2202:9)",
-"0x55d9d9916017: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}}::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:706:37)",
-"0x55d9d9910ed5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
-"0x55d9d9915c06: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:702:25)",
-"0x55d9d9910115: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d9771fc6: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_any (serde_json-1.0.107/src/de.rs:1421:45)",
-"0x55d9d9a40d52: cedar_policy_core::ast::expr::ExprBuilder<T>::neg (src/ast/expr.rs:1009:18)",
-"0x55d9d9922b14: cedar_policy_validator::typecheck::Typechecker::typecheck_unary::{{closure}} (cedar-policy-validator/src/typecheck.rs:1984:25)",
-"0x55d9d990fafc: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d9a2c6e0: cedar_policy_validator::typecheck::Typechecker::typecheck_unary (cedar-policy-validator/src/typecheck.rs:1982:17)",
-"0x55d9d9a28a1e: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:917:17)",
-"0x55d9d986574c: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d99eff33: cedar_policy_core::transitive_closure::enforce_dag_from_tc (cedar-policy-core/src/transitive_closure.rs:177:12)",
-"0x55d9d99ee7a1: cedar_policy_core::transitive_closure::compute_tc (cedar-policy-core/src/transitive_closure.rs:61:16)",
-"0x55d9d9880537: cedar_policy_core::entities::Entities::from_entities (cedar-policy-core/src/entities.rs:152:17)",
-"0x55d9d98541b5: cedar_policy_core::entities::json::entities::EntityJsonParser<S>::parse_ejsons (entities/json/entities.rs:165:9)",
-"0x55d9d977a35e: cedar_policy_core::entities::json::entities::EntityJsonParser<S>::from_json_file (entities/json/entities.rs:117:9)",
-"0x55d9d9cbd0a2: serde::__private::de::content::ContentRefDeserializer<E>::invalid_type (src/private/de.rs:1638:13)",
-"0x55d9d9cbd112: serde::__private::de::content::ContentRefDeserializer<E>::deserialize_integer (src/private/de.rs:1654:26)",
-"0x55d9d9cb7956: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_i64 (src/private/de.rs:1788:13)",
-"0x55d9d9b0afcd: <cedar_policy_core::ast::value::Set as core::iter::traits::collect::FromIterator<cedar_policy_core::ast::value::Value>>::from_iter (src/ast/value.rs:235:32)",
-"0x55d9d9c5a1e7: cedar_policy_core::entities::build_evaluated_entities::{{closure}}::{{closure}} (cedar-policy-core/src/entities.rs:322:41)",
-"0x55d9d9af50d0: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
-"0x55d9d9c82972: cedar_policy_core::parser::cst_to_ast::construct_expr_rel (src/parser/cst_to_ast.rs:1996:27)",
-"0x55d9d98b3679: cedar_policy_core::entities::json::jsonvalue::ValueParser::val_into_rexpr (entities/json/jsonvalue.rs:366:24)",
-"0x55d9d98d763c: cedar_policy_core::entities::json::context::ContextJsonParser<S>::from_json_value (entities/json/context.rs:80:21)",
-"0x55d9d9a9c982: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a9c982: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a9c982: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9a9c982: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9acda6e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acd057: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c2a3ee: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a70e8e: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1655:35)",
-"0x55d9da185465: regex_syntax::hir::Hir::concat (src/hir/mod.rs:477:13)",
-"0x55d9da11e230: regex_syntax::ast::parse::ParserI<P>::push_or_add_alternation (src/ast/parse.rs:667:19)",
-"0x55d9da11df0a: regex_syntax::ast::parse::ParserI<P>::push_alternate (src/ast/parse.rs:650:9)",
-"0x55d9da122ba8: regex_syntax::ast::parse::ParserI<P>::parse_with_comments (src/ast/parse.rs:976:33)",
-"0x55d9d9b1dfae: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9a9ab4b: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a9ab4b: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a9ab4b: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9a9ab4b: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9acdebe: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acc357: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c2a42e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a716b1: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Name>>>::to_name (src/parser/cst_to_ast.rs:1711:28)",
-"0x55d9d9ca0206: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9ca0206: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9ca0206: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:139:27)",
-"0x55d9d9ac44b8: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
-"0x55d9d9ac44b8: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
-"0x55d9d9ac44b8: <alloc::vec::Vec<T,A> as core::clone::Clone>::clone (src/vec/mod.rs:2643:9)",
-"0x55d9d9d0138e: <cedar_policy_core::est::expr::ExprNoExt as core::clone::Clone>::clone (src/est/expr.rs:233:9)",
-"0x55d9d9d00a27: <cedar_policy_core::est::expr::Expr as core::clone::Clone>::clone (src/est/expr.rs:37:15)",
-"0x55d9d9c9da22: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:511:17)",
-"0x55d9d9a2a613: cedar_policy_validator::typecheck::Typechecker::typecheck_binary (cedar-policy-validator/src/typecheck.rs:1226:30)",
-"0x55d9d9905aa4: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9905aa4: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_entities_satisfying_constraint (cedar-policy-validator/src/rbac.rs:398:37)",
-"0x55d9d99047bf: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
-"0x55d9d9d3d16a: <indexmap::map::core::IndexMapCore<K,V> as core::clone::Clone>::clone_from (src/map/core.rs:75:13)",
-"0x55d9d9bad504: cedar_policy_core::extensions::ipaddr::extension (src/extensions/ipaddr.rs:295:13)",
-"0x55d9d9a5d22e: cedar_policy_validator::extensions::partial_evaluation::get_argument_types (src/extensions/partial_evaluation.rs:27:22)",
-"0x55d9d9a5a076: cedar_policy_validator::extensions::partial_evaluation::extension_schema::{{closure}} (src/extensions/partial_evaluation.rs:56:17)",
-"0x55d9d9a59e5f: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
-"0x55d9d99e7152: core::option::Option<T>::map (core/src/option.rs:1099:29)",
-"0x55d9d99d8d59: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::next (iter/adapters/map.rs:103:9)",
-"0x55d9d994162c: alloc::vec::Vec<T,A>::extend_desugared (src/vec/mod.rs:2812:35)",
-"0x55d9d9b2c983: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9b3d189: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9abae7a: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9cbe1a9: cedar_policy_core::ast::name::Name::type_in_namespace (src/ast/name.rs:77:9)",
-"0x55d9d9930915: cedar_policy_validator::schema::ValidatorNamespaceDef::parse_action_id_with_namespace (cedar-policy-validator/src/schema.rs:654:36)",
-"0x55d9da18b24a: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9da18b24a: regex_syntax::hir::Properties::capture (src/hir/mod.rs:2481:20)",
-"0x55d9d9be21c5: cedar_policy_core::ast::expr::ExprBuilder<T>::sub (src/ast/expr.rs:992:19)",
-"0x55d9d9c94ef0: cedar_policy_core::ast::expr::Expr::sub (src/ast/expr.rs:382:9)",
-"0x55d9d9c9cd9f: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:521:67)",
-"0x55d9d999b65b: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d999b65b: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_in_fixes_principal::{{closure}} (cedar-policy-validator/src/rbac.rs:175:21)",
-"0x55d9d999ad8b: core::ops::function::impls::<impl core::ops::function::Fn<A> for &F>::call (src/ops/function.rs:263:13)",
-"0x55d9d999b9dc: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_any_contain::{{closure}} (cedar-policy-validator/src/rbac.rs:245:17)",
-"0x55d9d9908a7b: <core::slice::iter::Iter<T> as core::iter::traits::iterator::Iterator>::any (slice/iter/macros.rs:232:24)",
-"0x55d9d9904d07: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_any_contain (cedar-policy-validator/src/rbac.rs:244:13)",
-"0x55d9d9904a5d: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_in_fixes (cedar-policy-validator/src/rbac.rs:208:16)",
-"0x55d9d992cc0e: cedar_policy_validator::extensions::decimal::get_argument_types (src/extensions/decimal.rs:29:22)",
-"0x55d9d9a5ba7d: cedar_policy_validator::extensions::decimal::extension_schema::{{closure}} (src/extensions/decimal.rs:72:17)",
-"0x55d9d9a5b82f: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
-"0x55d9d99e6192: core::option::Option<T>::map (core/src/option.rs:1099:29)",
-"0x55d9d99d8d0d: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::next (iter/adapters/map.rs:103:9)",
-"0x55d9d994292c: alloc::vec::Vec<T,A>::extend_desugared (src/vec/mod.rs:2812:35)",
-"0x55d9d9938d7f: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:26:32)",
-"0x55d9d9ad0595: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9ad0595: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
-"0x55d9d9b0b621: cedar_policy_core::ast::value::Value::set (src/ast/value.rs:437:28)",
-"0x55d9d9a751e0: serde::de::Visitor::visit_str (src/de/mod.rs:1491:13)",
-"0x55d9d9cb6a9b: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:1738:43)",
-"0x55d9d9dc12b9: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
-"0x55d9d9dc012c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9dbf9bd: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9dbf9bd: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9dbf9bd: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:162:25)",
-"0x55d9d9dbfe3b: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
-"0x55d9d9dbfe3b: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
-"0x55d9d9dbfe3b: alloc::slice::<impl [T]>::to_vec (alloc/src/slice.rs:416:14)",
-"0x55d9d9dbfe3b: alloc::slice::<impl alloc::borrow::ToOwned for [T]>::to_owned (alloc/src/slice.rs:823:14)",
-"0x55d9d9dbfab2: alloc::str::<impl alloc::borrow::ToOwned for str>::to_owned (alloc/src/str.rs:209:46)",
-"0x55d9d9dbfab2: <alloc::string::String as core::convert::From<&str>>::from (alloc/src/string.rs:2650:11)",
-"0x55d9d9dbfcba: <T as core::convert::Into<U>>::into (src/convert/mod.rs:727:9)",
-"0x55d9d9babf4a: cedar_policy_core::extensions::ipaddr::as_ipaddr (src/extensions/ipaddr.rs:211:13)",
-"0x55d9da188ff0: <regex_syntax::hir::Hir as core::ops::drop::Drop>::drop (src/hir/mod.rs:1853:49)",
-"0x55d9d99381e8: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d99381e8: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d99381e8: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d99381e8: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d994911e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d99487e9: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d99dc07e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9982959: cedar_policy_validator::extensions::ipaddr::extension_schema (src/extensions/ipaddr.rs:59:47)",
-"0x55d9d9a9d7bb: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a9d7bb: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a9d7bb: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9a9d7bb: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9acde1e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acbf67: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9af155e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9c5bd6b: cedar_policy_core::evaluator::Evaluator::get_attr::{{closure}} (cedar-policy-core/src/evaluator.rs:679:25)",
-"0x55d9d9c83643: cedar_policy_core::parser::cst_to_ast::construct_ext_meth (src/parser/cst_to_ast.rs:2062:16)",
-"0x55d9d9cbeffe: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::ast::name::Id>::to_meth (src/parser/cst_to_ast.rs:440:26)",
-"0x55d9d9b2ea51: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9b3cee9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9abb912: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9d3da0b: cedar_policy_core::parser::unescape::to_pattern::{{closure}} (src/parser/unescape.rs:56:13)",
-"0x55d9d9be7924: rustc_lexer::unescape::unescape_str_or_byte_str (rustc_lexer-0.1.0/src/unescape.rs:257:9)",
-"0x55d9da11fa84: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9da11fa84: regex_syntax::ast::parse::ParserI<P>::pop_group (src/ast/parse.rs:764:29)",
-"0x55d9da122b2e: regex_syntax::ast::parse::ParserI<P>::parse_with_comments (src/ast/parse.rs:975:33)",
-"0x55d9d9c9e5bc: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:498:17)",
-"0x55d9da1800b1: <regex_syntax::ast::Ast as core::ops::drop::Drop>::drop (src/ast/mod.rs:1564:25)",
-"0x55d9da175f87: core::ptr::drop_in_place<regex_syntax::ast::Ast> (src/ptr/mod.rs:490:1)",
-"0x55d9da176b40: core::ptr::drop_in_place<[regex_syntax::ast::Ast]> (src/ptr/mod.rs:490:1)",
-"0x55d9da105e7b: <alloc::vec::Vec<T,A> as core::ops::drop::Drop>::drop (src/vec/mod.rs:3018:13)",
-"0x55d9da177927: core::ptr::drop_in_place<alloc::vec::Vec<regex_syntax::ast::Ast>> (src/ptr/mod.rs:490:1)",
-"0x55d9d9ed7e87: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3442:5)",
-"0x55d9d9ec7d7f: <serde_json::de::MapKey<R> as serde::de::Deserializer>::deserialize_any (serde_json-1.0.107/src/de.rs:2186:37)",
-"0x55d9d9c9d5c7: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:515:17)",
-"0x55d9d9fc019f: regex_automata::util::captures::GroupInfoInner::add_first_group (src/util/captures.rs:2203:33)",
-"0x55d9da1b0420: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
-"0x55d9da1b0420: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9da1b0420: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9da1b0420: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9da1b0420: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:162:25)",
-"0x55d9da1b0420: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
-"0x55d9da1b0420: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
-"0x55d9da1b0420: alloc::slice::<impl [T]>::to_vec (alloc/src/slice.rs:416:14)",
-"0x55d9da1b0420: std::sys::unix::os::getenv (sys/unix/os.rs:571:76)",
-"0x55d9da1b0420: std::env::_var_os (std/src/env.rs:266:5)",
-"0x55d9da1b0213: std::env::var_os (std/src/env.rs:262:5)",
-"0x55d9da1b0213: std::env::_var (std/src/env.rs:232:11)",
-"0x55d9d9dc5ee6: std::env::var (std/src/env.rs:228:5)",
-"0x55d9d9758682: cedar_policy::integration_testing::resolve_integration_test_path (cedar-policy/src/integration_testing.rs:110:28)",
-"0x55d9d9919e25: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:1130:29)",
-"0x55d9d991402b: cedar_policy_validator::typecheck::TypecheckAnswer::sequence_all_then_typecheck (cedar-policy-validator/src/typecheck.rs:217:19)",
-"0x55d9d9be3c6d: cedar_policy_core::ast::expr::ExprBuilder<T>::get_attr (src/ast/expr.rs:1098:19)",
-"0x55d9d9c959c0: cedar_policy_core::ast::expr::Expr::get_attr (src/ast/expr.rs:451:9)",
-"0x55d9d9c9b1f5: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:558:20)",
-"0x55d9d98b445f: cedar_policy_core::entities::json::jsonvalue::ValueParser::val_into_rexpr (entities/json/jsonvalue.rs:314:58)",
-"0x55d9d98b8401: cedar_policy_core::entities::json::jsonvalue::ValueParser::val_into_rexpr::{{closure}} (entities/json/jsonvalue.rs:345:43)",
-"0x55d9d97589bd: cedar_policy::integration_testing::resolve_integration_test_path (cedar-policy/src/integration_testing.rs:112:24)",
-"0x55d9d9757374: corpus_tests::corpus_tests (cedar-policy/tests/corpus_tests.rs:50:31)",
-"0x55d9d9ebe4be: serde_json::read::parse_escape (serde_json-1.0.107/src/read.rs:861:17)",
-"0x55d9d9759162: cedar_policy::integration_testing::perform_integration_test_from_json_custom (cedar-policy/src/integration_testing.rs:227:23)",
-"0x55d9d9993b22: cedar_policy_validator::schema::ValidatorNamespaceDef::parse_unqualified_name_with_namespace (cedar-policy-validator/src/schema.rs:630:35)",
-"0x55d9d97c6f49: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
-"0x55d9d97c1488: hashbrown::raw::alloc::inner::do_alloc (src/raw/alloc.rs:11:15)",
-"0x55d9d97bf05e: hashbrown::raw::RawTableInner<A>::new_uninitialized (src/raw/mod.rs:1080:38)",
-"0x55d9d97800bd: hashbrown::raw::RawTable<T,A>::new_uninitialized (src/raw/mod.rs:442:20)",
-"0x55d9d977dc11: <hashbrown::raw::RawTable<T,A> as core::clone::Clone>::clone (src/raw/mod.rs:1606:39)",
-"0x55d9d9779792: <hashbrown::map::HashMap<K,V,S,A> as core::clone::Clone>::clone (hashbrown-0.12.3/src/map.rs:197:20)",
-"0x55d9d9763e0c: <std::collections::hash::map::HashMap<K,V,S> as core::clone::Clone>::clone (collections/hash/map.rs:1267:22)",
-"0x55d9d9a409bf: cedar_policy_core::ast::expr::ExprBuilder<T>::ite (src/ast/expr.rs:901:24)",
-"0x55d9da184a67: regex_syntax::hir::Hir::concat (src/hir/mod.rs:472:21)",
-"0x55d9d9edda77: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9edda77: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9edda77: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9edda77: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
-"0x55d9d9eea1fe: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9ee9d47: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9f1664e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9facb5b: regex_automata::dfa::remapper::Remapper::new (src/dfa/remapper.rs:93:19)",
-"0x55d9d98c8ba5: cedar_policy::api::LosslessPolicy::policy_or_template_text (cedar-policy/src/api.rs:2429:19)",
-"0x55d9d9905ba0: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9905ba0: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_entities_satisfying_constraint (cedar-policy-validator/src/rbac.rs:406:17)",
-"0x55d9d9cf3fe1: cedar_policy_core::est::expr::Expr::neg (src/est/expr.rs:283:47)",
-"0x55d9d9cfb9c0: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Unary>>::try_from (src/est/expr.rs:1020:29)",
-"0x55d9d9cfabf0: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Mult>>::try_from (src/est/expr.rs:960:24)",
-"0x55d9d9d3c2be: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
-"0x55d9d9a31ea6: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9a31ea6: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
-"0x55d9d9a3ffd1: cedar_policy_core::ast::expr::ExprBuilder<T>::call_extension_fn (src/ast/expr.rs:1069:19)",
-"0x55d9d9a2d7e6: cedar_policy_validator::typecheck::Typechecker::typecheck_extension (cedar-policy-validator/src/typecheck.rs:2189:29)",
-"0x55d9d9a28acc: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:926:17)",
-"0x55d9d9a291d4: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:932:30)",
-"0x55d9d9a40a32: cedar_policy_core::ast::expr::ExprBuilder<T>::ite (src/ast/expr.rs:902:24)",
-"0x55d9d97d8202: alloc::raw_vec::finish_grow (alloc/src/raw_vec.rs:0:0)",
-"0x55d9d97d8621: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d97d8621: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d97ff10d: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d97ff10d: test::run_tests::get_timed_out_tests (test/src/lib.rs:362:17)",
-"0x55d9d97e205b: test::run_tests (test/src/lib.rs:417:33)",
-"0x55d9d97e205b: test::console::run_tests_console (test/src/console.rs:329:5)",
-"0x55d9d97fdc8e: test::test_main (test/src/lib.rs:139:15)",
-"0x55d9d97febc1: test::test_main_static (test/src/lib.rs:158:5)",
-"0x55d9d97578c3: corpus_tests::main (cedar-policy/tests/corpus_tests.rs:1:1)",
-"0x55d9d977b8cb: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d991c6c9: cedar_policy_validator::typecheck::Typechecker::typecheck_binary::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1362:41)",
-"0x55d9d9911348: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d991c427: cedar_policy_validator::typecheck::Typechecker::typecheck_binary::{{closure}} (cedar-policy-validator/src/typecheck.rs:1358:25)",
-"0x55d9d9911c65: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d9c5b6a5: cedar_policy_core::evaluator::Evaluator::partial_interpret::{{closure}} (cedar-policy-core/src/evaluator.rs:499:32)",
-"0x55d9d9af3adf: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
-"0x55d9d9b9efb8: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
-"0x55d9d9aee97f: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
-"0x55d9d9924130: <serde::de::impls::<impl serde::de::Deserialize for alloc::vec::Vec<T>>::deserialize::VecVisitor<T> as serde::de::Visitor>::visit_seq (src/de/impls.rs:1035:21)",
-"0x55d9d9a059b1: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_seq (serde_json-1.0.107/src/de.rs:1740:31)",
-"0x55d9d9c82cbd: cedar_policy_core::parser::cst_to_ast::construct_expr_attr (src/parser/cst_to_ast.rs:2033:5)",
-"0x55d9d9a6f3b0: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1526:38)",
-"0x55d9d9b0af1a: <cedar_policy_core::ast::value::Set as core::iter::traits::collect::FromIterator<cedar_policy_core::ast::value::Value>>::from_iter (src/ast/value.rs:215:28)",
-"0x55d9d9d21adf: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce101 (src/parser/grammar.rs:29986:20)",
-"0x55d9d9d0eee2: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26922:17)",
-"0x55d9d9d4df06: lalrpop_util::state_machine::Parser<D,I>::parse (lalrpop-util-0.20.0/src/state_machine.rs:264:38)",
-"0x55d9d9900928: alloc::collections::btree::map::BTreeMap<K,V,A>::bulk_build_from_sorted_iter (collections/btree/map.rs:1508:24)",
-"0x55d9d9b205de: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9aa93f8: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa93f8: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa93f8: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9cbd7e0: <serde::__private::de::content::ContentVisitor as serde::de::Visitor>::visit_seq (src/private/de.rs:492:17)",
-"0x55d9d9a9742d: serde_json::value::de::visit_array (src/value/de.rs:178:20)",
-"0x55d9d9a60030: serde_json::value::de::<impl serde::de::Deserializer for serde_json::value::Value>::deserialize_any (src/value/de.rs:222:32)",
-"0x55d9d9be2e08: cedar_policy_core::ast::expr::ExprBuilder<T>::set (src/ast/expr.rs:1054:43)",
-"0x55d9d9bdf6c7: cedar_policy_core::ast::expr::Expr::set (src/ast/expr.rs:420:9)",
-"0x55d9d9c5aac2: cedar_policy_core::ast::policy::ActionConstraint::euids_into_expr (src/ast/policy.rs:1339:9)",
-"0x55d9d9c8635f: cedar_policy_core::ast::policy::ActionConstraint::as_expr (src/ast/policy.rs:1348:17)",
-"0x55d9d9c84c17: cedar_policy_core::ast::policy::TemplateBody::action_constraint_expr (src/ast/policy.rs:870:9)",
-"0x55d9d9cf49fd: cedar_policy_core::est::expr::Expr::and (src/est/expr.rs:346:20)",
-"0x55d9d9bb51bf: <cedar_policy_core::extensions::ALL_AVAILABLE_EXTENSIONS as core::ops::deref::Deref>::deref::__static_ref_initialize (cedar-policy-core/src/extensions.rs:31:59)",
-"0x55d9d9bb51bf: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9b081fa: lazy_static::lazy::Lazy<T>::get (lazy_static-1.4.0/src/inline_lazy.rs:30:9)",
-"0x55d9d9b081fa: <cedar_policy_core::extensions::ALL_AVAILABLE_EXTENSIONS as core::ops::deref::Deref>::deref::__stability (lazy_static-1.4.0/src/lib.rs:142:21)",
-"0x55d9d9b081fa: <cedar_policy_core::extensions::ALL_AVAILABLE_EXTENSIONS as core::ops::deref::Deref>::deref (lazy_static-1.4.0/src/lib.rs:144:17)",
-"0x55d9d9aa51a7: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa51a7: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa51a7: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9aa51a7: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
-"0x55d9d9ac01c0: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
-"0x55d9d9acca49: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9af127e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9c5aa38: cedar_policy_core::ast::policy::ActionConstraint::is_in (src/ast/policy.rs:1330:30)",
-"0x55d9d9932efd: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9932efd: <cedar_policy_validator::schema::ValidatorActionId as cedar_policy_core::transitive_closure::TCNode<cedar_policy_core::ast::entity::EntityUID>>::out_edges (cedar-policy-validator/src/schema.rs:1501:9)",
-"0x55d9d99f0346: cedar_policy_core::transitive_closure::add_ancestors_to_set (cedar-policy-core/src/transitive_closure.rs:153:25)",
-"0x55d9d99ef767: cedar_policy_core::transitive_closure::compute_tc_internal (cedar-policy-core/src/transitive_closure.rs:82:9)",
-"0x55d9d99ee4f0: cedar_policy_core::transitive_closure::compute_tc (cedar-policy-core/src/transitive_closure.rs:59:15)",
-"0x55d9d9995781: cedar_policy_validator::schema::ValidatorSchema::from_schema_fragments (cedar-policy-validator/src/schema.rs:966:9)",
-"0x55d9d999b80c: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_none_equal::{{closure}} (cedar-policy-validator/src/rbac.rs:223:17)",
-"0x55d9d99089bb: <core::slice::iter::Iter<T> as core::iter::traits::iterator::Iterator>::any (slice/iter/macros.rs:232:24)",
-"0x55d9d9904b49: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_none_equal (cedar-policy-validator/src/rbac.rs:222:14)",
-"0x55d9d9904a13: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_in_fixes (cedar-policy-validator/src/rbac.rs:207:9)",
-"0x55d9d9ca04fc: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:146:32)",
-"0x55d9d99339e1: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d99339e1: <cedar_policy_validator::schema::ActionHeadVar as cedar_policy_validator::schema::HeadVar<cedar_policy_core::ast::entity::EntityUID>>::get_descendants_if_present (cedar-policy-validator/src/schema.rs:1669:37)",
-"0x55d9d9997ee6: cedar_policy_validator::schema::ValidatorSchema::get_entities_in (cedar-policy-validator/src/schema.rs:1167:9)",
-"0x55d9d999829a: cedar_policy_validator::schema::ValidatorSchema::get_entities_in_set::{{closure}} (cedar-policy-validator/src/schema.rs:1187:32)",
-"0x55d9d99de11b: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
-"0x55d9d98deeef: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
-"0x55d9d99d8feb: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
-"0x55d9d9ef71f2: regex_automata::nfa::thompson::nfa::Inner::set_starts (nfa/thompson/nfa.rs:1400:30)",
-"0x55d9d9f65b81: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:438:9)",
-"0x55d9d9cf4ebc: cedar_policy_core::est::expr::Expr::mul (src/est/expr.rs:377:19)",
-"0x55d9d9cfb183: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Mult>>::try_from (src/est/expr.rs:970:28)",
-"0x55d9d9cf9c79: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Add>>::try_from (src/est/expr.rs:874:24)",
-"0x55d9d9d3c29e: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
-"0x55d9d9a40ed2: cedar_policy_core::ast::expr::ExprBuilder<T>::not (src/ast/expr.rs:911:18)",
-"0x55d9d99227de: cedar_policy_validator::typecheck::Typechecker::typecheck_unary::{{closure}} (cedar-policy-validator/src/typecheck.rs:1958:29)",
-"0x55d9d990e4b3: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
-"0x55d9d9a2c64b: cedar_policy_validator::typecheck::Typechecker::typecheck_unary (cedar-policy-validator/src/typecheck.rs:1951:17)",
-"0x55d9d9f66866: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:517:38)",
-"0x55d9d9866850: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9c8383b: cedar_policy_core::parser::cst_to_ast::construct_expr_set (src/parser/cst_to_ast.rs:2069:5)",
-"0x55d9d9a711a0: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1649:46)",
-"0x55d9d9a6c99d: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1355:26)",
-"0x55d9d9856ad7: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
-"0x55d9d9856ad7: alloc::sync::Arc<T>::allocate_for_ptr::{{closure}} (alloc/src/sync.rs:1343:33)",
-"0x55d9d9856d0d: alloc::sync::Arc<T>::try_allocate_for_layout (alloc/src/sync.rs:1322:19)",
-"0x55d9d9856bc3: alloc::sync::Arc<T>::allocate_for_layout (alloc/src/sync.rs:1304:13)",
-"0x55d9d9856aa2: alloc::sync::Arc<T>::allocate_for_ptr (alloc/src/sync.rs:1341:13)",
-"0x55d9d9856f28: alloc::sync::Arc<T>::from_box (alloc/src/sync.rs:1356:23)",
-"0x55d9d98571ab: <alloc::sync::Arc<T> as core::convert::From<alloc::boxed::Box<T>>>::from (alloc/src/sync.rs:2729:9)",
-"0x55d9d989272b: <T as core::convert::Into<U>>::into (src/convert/mod.rs:727:9)",
-"0x55d9d9865532: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9b70c88: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:311:35)",
-"0x55d9d9ed7e77: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3442:5)",
-"0x55d9d999943b: <T as alloc::alloc::WriteCloneIntoRaw>::write_clone_into_raw (alloc/src/alloc.rs:427:31)",
-"0x55d9d9919f54: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:1138:57)",
-"0x55d9d9a28daf: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:1120:17)",
-"0x55d9d9919b9f: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:1112:33)",
-"0x55d9d99e0a7e: core::iter::adapters::map::map_fold::{{closure}} (iter/adapters/map.rs:84:28)",
-"0x55d9d98c2426: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d98c2426: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d98c2426: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:139:27)",
-"0x55d9d9890268: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
-"0x55d9d9890268: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
-"0x55d9d9890268: <alloc::vec::Vec<T,A> as core::clone::Clone>::clone (src/vec/mod.rs:2643:9)",
-"0x55d9d98d45d8: <cedar_policy_core::est::head_constraints::ActionInConstraint as core::clone::Clone>::clone (src/est/head_constraints.rs:115:9)",
-"0x55d9d98d4525: <cedar_policy_core::est::head_constraints::ActionConstraint as core::clone::Clone>::clone (src/est/head_constraints.rs:51:8)",
-"0x55d9d985745e: <cedar_policy_core::est::Policy as core::clone::Clone>::clone (cedar-policy-core/src/est.rs:45:5)",
-"0x55d9d9cf4ded: cedar_policy_core::est::expr::Expr::sub (src/est/expr.rs:370:20)",
-"0x55d9d9cfa27e: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Add>>::try_from (src/est/expr.rs:887:28)",
-"0x55d9d9cf8fbd: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Relation>>::try_from (src/est/expr.rs:785:32)",
-"0x55d9d992205c: cedar_policy_validator::typecheck::Typechecker::entity_in_descendants (cedar-policy-validator/src/typecheck.rs:1920:13)",
-"0x55d9d9921896: cedar_policy_validator::typecheck::Typechecker::type_of_euid_in_euids (cedar-policy-validator/src/typecheck.rs:1888:13)",
-"0x55d9d99211ae: cedar_policy_validator::typecheck::Typechecker::type_of_entity_literal_in_entity_literals (cedar-policy-validator/src/typecheck.rs:1831:25)",
-"0x55d9d991de89: cedar_policy_validator::typecheck::Typechecker::typecheck_in::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1616:30)",
-"0x55d9d9a4104b: cedar_policy_core::ast::expr::ExprBuilder<T>::set (src/ast/expr.rs:1054:43)",
-"0x55d9d991a01e: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:1138:29)",
-"0x55d9d9b3e5a8: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
-"0x55d9d9abd3f0: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
-"0x55d9d9abd3f0: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
-"0x55d9d9abc6ca: alloc::vec::Vec<T,A>::insert (src/vec/mod.rs:1446:13)",
-"0x55d9d9cbef89: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::ast::name::Id>::to_meth (src/parser/cst_to_ast.rs:438:21)",
-"0x55d9d9ccdbdf: cedar_policy_core::parser::text_to_cst::grammar::__action161 (src/parser/grammar.rs:59903:5)",
-"0x55d9d9d2414f: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce120 (src/parser/grammar.rs:30344:20)",
-"0x55d9d9d0f33b: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26988:17)",
-"0x55d9d9b20eae: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9a9c0d5: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a9c0d5: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a9c0d5: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9a9c0d5: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9acdabe: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acc837: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c5f9e2: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9c5f9e2: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
-"0x55d9d9a93c60: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d9d1a7a8: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce43 (src/parser/grammar.rs:28842:20)",
-"0x55d9d9d0e354: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26748:17)",
-"0x55d9d99c5bc4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d99c5bc4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d99c5bc4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d99d5b48: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9ccd73f: cedar_policy_core::parser::text_to_cst::grammar::__action157 (src/parser/grammar.rs:59845:5)",
-"0x55d9d9cd4291: cedar_policy_core::parser::text_to_cst::grammar::__action223 (src/parser/grammar.rs:61591:5)",
-"0x55d9d9d19d18: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce38 (src/parser/grammar.rs:28741:20)",
-"0x55d9d9d0e255: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26733:17)",
-"0x55d9d9c9b111: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:558:40)",
-"0x55d9d99907b3: cedar_policy_validator::schema::WithUnresolvedTypeDefs<T>::map (cedar-policy-validator/src/schema.rs:175:85)",
-"0x55d9d993177d: cedar_policy_validator::schema::ValidatorNamespaceDef::try_schema_type_into_validator_type (cedar-policy-validator/src/schema.rs:678:17)",
-"0x55d9d9c85324: cedar_policy_core::ast::policy::PrincipalConstraint::as_expr (src/ast/policy.rs:980:9)",
-"0x55d9d9c84bde: cedar_policy_core::ast::policy::TemplateBody::principal_constraint_expr (src/ast/policy.rs:858:9)",
-"0x55d9d976e283: <serde_json::de::MapKey<R> as serde::de::Deserializer>::deserialize_any (serde_json-1.0.107/src/de.rs:2186:37)",
-"0x55d9d9b6a092: cedar_policy_core::evaluator::RestrictedEvaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:119:23)",
-"0x55d9d9b0b4f2: cedar_policy_core::ast::value::Value::set (src/ast/value.rs:441:32)",
-"0x55d9d9c5b1c6: cedar_policy_core::evaluator::RestrictedEvaluator::partial_interpret::{{closure}} (cedar-policy-core/src/evaluator.rs:105:33)",
-"0x55d9d9af49bf: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
-"0x55d9d9867eea: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d98d8866: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::validate_action_ids (cedar-policy-validator/src/rbac.rs:108:9)",
-"0x55d9d98d936e: cedar_policy_validator::Validator::validate_policy (cedar-policy-validator/src/lib.rs:104:20)",
-"0x55d9d9b1f14e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9a9c377: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a9c377: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a9c377: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9a9c377: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
-"0x55d9d9abf190: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
-"0x55d9d9accdf9: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9af110e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9c6aad3: cedar_policy_core::authorizer::Authorizer::is_authorized_core (cedar-policy-core/src/authorizer.rs:181:22)",
-"0x55d9d9b37ba3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9b3d399: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9abc0fd: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9d504e7: lalrpop_util::state_machine::Parser<D,I>::parse (lalrpop-util-0.20.0/src/state_machine.rs:259:21)",
-"0x55d9d9d4cc1b: lalrpop_util::state_machine::Parser<D,I>::drive (lalrpop-util-0.20.0/src/state_machine.rs:218:9)",
-"0x55d9d9ab6804: alloc::vec::Vec<T,A>::extend_desugared (src/vec/mod.rs:2816:17)",
-"0x55d9d9acd70b: <alloc::vec::Vec<T,A> as alloc::vec::spec_extend::SpecExtend<T,I>>::spec_extend (src/vec/spec_extend.rs:17:9)",
-"0x55d9d9b1bc6c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9a9cc51: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a9cc51: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a9cc51: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9a9cc51: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
-"0x55d9d9acdf8b: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acc5c6: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9d08e6b: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9b1a332: cedar_policy_core::ast::pattern::Pattern::new (src/ast/pattern.rs:69:29)",
-"0x55d9d9c8fdeb: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
-"0x55d9d9c1aae7: core::option::Option<T>::map (core/src/option.rs:1099:29)",
-"0x55d9d9aecda9: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::next (iter/adapters/map.rs:103:9)",
-"0x55d9da18515c: regex_syntax::hir::Hir::concat (src/hir/mod.rs:439:42)",
-"0x55d9d9b51484: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d9b51484: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d9b51484: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d9b65ad8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9863afb: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9a754d7: serde::de::Visitor::visit_u64 (src/de/mod.rs:1421:13)",
-"0x55d9d9cb7368: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:1730:36)",
-"0x55d9d9a7a5b5: cedar_policy_core::entities::json::jsonvalue::_::<impl serde::de::Deserialize for cedar_policy_core::entities::json::jsonvalue::JSONValue>::deserialize (entities/json/jsonvalue.rs:38:39)",
-"0x55d9d9864a89: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9864cb0: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d99f28f2: <serde::__private::de::content::ContentVisitor as serde::de::Visitor>::visit_str (src/private/de.rs:421:32)",
-"0x55d9d9a74d57: serde::de::Visitor::visit_i64 (src/de/mod.rs:1359:13)",
-"0x55d9d9cb741b: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:1734:36)",
-"0x55d9d9b0c6da: cedar_policy_core::extensions::decimal::as_decimal (src/extensions/decimal.rs:202:13)",
-"0x55d9d9b73ac7: cedar_policy_core::evaluator::Evaluator::get_attr (cedar-policy-core/src/evaluator.rs:710:43)",
-"0x55d9d9babc51: cedar_policy_core::extensions::ipaddr::as_ipaddr (src/extensions/ipaddr.rs:207:13)",
-"0x55d9d9bac5e8: cedar_policy_core::extensions::ipaddr::is_in_range (src/extensions/ipaddr.rs:254:20)",
-"0x55d9d9bb16a8: core::ops::function::Fn::call (src/ops/function.rs:79:5)",
-"0x55d9d9b34363: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9b3cfd9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9abbe3d: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9d4f98b: lalrpop_util::state_machine::Parser<D,I>::parse (lalrpop-util-0.20.0/src/state_machine.rs:259:21)",
-"0x55d9d9d4c05b: lalrpop_util::state_machine::Parser<D,I>::drive (lalrpop-util-0.20.0/src/state_machine.rs:218:9)",
-"0x55d9d9b36d91: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9b3d129: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9ab9b38: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9c6c4b8: cedar_policy_core::authorizer::Authorizer::evaluate_policies (cedar-policy-core/src/authorizer.rs:297:25)",
-"0x55d9d991907f: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:1025:37)",
-"0x55d9d990f6c5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
-"0x55d9d9bf7d3b: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce24 (src/parser/grammar.rs:37190:20)",
-"0x55d9d9bee01b: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35433:17)",
-"0x55d9d9c934e1: cedar_policy_core::parser::cst_to_ast::construct_expr_mul (src/parser/cst_to_ast.rs:2023:16)",
-"0x55d9d9a6b74f: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Mult>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1206:42)",
-"0x55d9d9c9bc42: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:546:17)",
-"0x55d9d9b21a6e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9aa59c7: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa59c7: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa59c7: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9aa59c7: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
-"0x55d9d9abf4f3: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
-"0x55d9d9acbe27: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9b1811e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a8242c: <alloc::collections::btree::map::BTreeMap<K,V> as core::iter::traits::collect::FromIterator<(K,V)>>::from_iter (collections/btree/map.rs:2229:34)",
-"0x55d9d9a5e256: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a5e256: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a5e256: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:139:27)",
-"0x55d9d9ac3f18: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
-"0x55d9d9ac3f18: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
-"0x55d9d9ac3f18: <alloc::vec::Vec<T,A> as core::clone::Clone>::clone (src/vec/mod.rs:2643:9)",
-"0x55d9d9a5edc9: cedar_policy_core::ast::name::unwrap_or_clone::{{closure}} (src/ast/name.rs:32:47)",
-"0x55d9d9c617e7: core::result::Result<T,E>::unwrap_or_else (core/src/result.rs:1464:23)",
-"0x55d9d9a5ed5e: cedar_policy_core::ast::name::unwrap_or_clone (src/ast/name.rs:32:5)",
-"0x55d9d978036d: hashbrown::raw::RawTable<T,A>::new_uninitialized (src/raw/mod.rs:442:20)",
-"0x55d9d977df31: <hashbrown::raw::RawTable<T,A> as core::clone::Clone>::clone (src/raw/mod.rs:1606:39)",
-"0x55d9d9779632: <hashbrown::map::HashMap<K,V,S,A> as core::clone::Clone>::clone (hashbrown-0.12.3/src/map.rs:197:20)",
-"0x55d9d9784f7c: <hashbrown::set::HashSet<T,S,A> as core::clone::Clone>::clone (hashbrown-0.12.3/src/set.rs:122:18)",
-"0x55d9d99ee710: cedar_policy_core::transitive_closure::compute_tc (cedar-policy-core/src/transitive_closure.rs:59:15)",
-"0x55d9d982ac2d: hashbrown::raw::RawTable<T,A>::fallible_with_capacity (src/raw/mod.rs:460:20)",
-"0x55d9d982a5e3: hashbrown::raw::RawTable<T,A>::with_capacity_in (src/raw/mod.rs:481:15)",
-"0x55d9d98269e7: hashbrown::raw::RawTable<T>::with_capacity (src/raw/mod.rs:411:9)",
-"0x55d9d9829534: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d9829534: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d9829534: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d982cca8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d99c2da4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d99c2da4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d99c2da4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d99d57d8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9acd8fb: <alloc::vec::Vec<T,A> as core::iter::traits::collect::Extend<&T>>::extend_one (src/vec/mod.rs:2981:9)",
-"0x55d9d9bdbabb: core::iter::traits::iterator::Iterator::partition::extend::{{closure}} (iter/traits/iterator.rs:2094:21)",
-"0x55d9d9b1c82e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d988c5e8: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d988c5e8: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d988c5e8: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9854e08: <serde::de::impls::<impl serde::de::Deserialize for alloc::vec::Vec<T>>::deserialize::VecVisitor<T> as serde::de::Visitor>::visit_seq (src/de/impls.rs:1032:34)",
-"0x55d9d9815bbd: serde_json::value::de::visit_array (src/value/de.rs:178:20)",
-"0x55d9d98c9624: serde_json::value::de::<impl serde::de::Deserializer for serde_json::value::Value>::deserialize_seq (src/value/de.rs:392:32)",
-"0x55d9d988ffd2: serde::de::impls::<impl serde::de::Deserialize for alloc::vec::Vec<T>>::deserialize (src/de/impls.rs:1045:9)",
-"0x55d9d9bcf9bb: <serde::__private::de::missing_field::MissingFieldDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:40:17)",
-"0x55d9d9bcfacb: serde::de::Deserializer::__deserialize_content (src/de/mod.rs:1231:9)",
-"0x55d9d9cbd33c: <serde::__private::de::content::Content as serde::de::Deserialize>::deserialize (src/private/de.rs:301:13)",
-"0x55d9da18a954: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9da18a954: regex_syntax::hir::Properties::look (src/hir/mod.rs:2421:20)",
-"0x55d9da183fa4: regex_syntax::hir::Hir::look (src/hir/mod.rs:356:21)",
-"0x55d9da171959: regex_syntax::hir::translate::TranslatorI::hir_assertion (src/hir/translate.rs:937:46)",
-"0x55d9da16ad80: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_post (src/hir/translate.rs:409:42)",
-"0x55d9d9d15478: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce7 (src/parser/grammar.rs:28095:20)",
-"0x55d9d9d0dc28: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26640:17)",
-"0x55d9d9a28f99: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:992:30)",
-"0x55d9d9f279cc: regex_automata::dfa::onepass::InternalBuilder::add_start_state (src/dfa/onepass.rs:822:9)",
-"0x55d9d9f260c6: regex_automata::dfa::onepass::InternalBuilder::build (src/dfa/onepass.rs:610:9)",
-"0x55d9d9867668: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d986486f: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d999ebae: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d993b927: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d993b927: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d993b927: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d993b927: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
-"0x55d9d9948f9e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9948557: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9a3e7ce: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a41a58: cedar_policy_core::ast::expr::ExprBuilder<T>::record (src/ast/expr.rs:1060:29)",
-"0x55d9d9c86fd9: cedar_policy_core::est::head_constraints::<impl core::convert::TryFrom<cedar_policy_core::est::head_constraints::ResourceConstraint> for cedar_policy_core::ast::policy::PrincipalOrResourceConstraint>::try_from (src/est/head_constraints.rs:333:83)",
-"0x55d9d9c59d1e: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
-"0x55d9d9c866fc: cedar_policy_core::est::head_constraints::<impl core::convert::TryFrom<cedar_policy_core::est::head_constraints::ResourceConstraint> for cedar_policy_core::ast::policy::ResourceConstraint>::try_from (src/est/head_constraints.rs:226:9)",
-"0x55d9d9c59d7e: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
-"0x55d9d9b7970d: cedar_policy_core::est::Policy::try_into_ast_template (cedar-policy-core/src/est.rs:236:13)",
-"0x55d9d9c9ac5a: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:565:55)",
-"0x55d9d9ccd4eb: cedar_policy_core::parser::text_to_cst::grammar::__action155 (src/parser/grammar.rs:59816:5)",
-"0x55d9d9cd4feb: cedar_policy_core::parser::text_to_cst::grammar::__action231 (src/parser/grammar.rs:61835:5)",
-"0x55d9d9d1b238: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce48 (src/parser/grammar.rs:28943:20)",
-"0x55d9d9d0e453: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26763:17)",
-"0x55d9d997135e: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d997135e: cedar_policy_validator::schema_file_format::SchemaTypeVisitor::build_schema_type (cedar-policy-validator/src/schema_file_format.rs:398:34)",
-"0x55d9d996c37e: <cedar_policy_validator::schema_file_format::SchemaTypeVisitor as serde::de::Visitor>::visit_map (cedar-policy-validator/src/schema_file_format.rs:330:9)",
-"0x55d9d99f1ac0: serde::__private::de::content::visit_content_map_ref (src/private/de.rs:1708:26)",
-"0x55d9d99f0c3c: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:1749:40)",
-"0x55d9d996aa37: <cedar_policy_validator::schema_file_format::SchemaType as serde::de::Deserialize>::deserialize (cedar-policy-validator/src/schema_file_format.rs:206:9)",
-"0x55d9d98e9c47: <core::marker::PhantomData<T> as serde::de::DeserializeSeed>::deserialize (src/de/mod.rs:794:9)",
-"0x55d9d9b70d77: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:319:62)",
-"0x55d9d9d4c1ec: lalrpop_util::state_machine::Parser<D,I>::drive (lalrpop-util-0.20.0/src/state_machine.rs:221:21)",
-"0x55d9d9d0d502: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::PoliciesParser::parse (src/parser/grammar.rs:26558:13)",
-"0x55d9d9bb5b6a: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9b3fe83: cedar_policy_core::parser::text_to_cst::parse_collect_errors (src/parser/text_to_cst.rs:49:18)",
-"0x55d9d9d074a6: cedar_policy_core::parser::text_to_cst::parse_policies (src/parser/text_to_cst.rs:84:5)",
-"0x55d9d9c708ec: cedar_policy_core::parser::parse_policyset_and_also_return_policy_text (cedar-policy-core/src/parser.rs:66:15)",
-"0x55d9d98d94c0: cedar_policy_validator::Validator::validate_policy (cedar-policy-validator/src/lib.rs:107:20)",
-"0x55d9d992383f: cedar_policy_validator::typecheck::Typechecker::typecheck_extension::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:2152:21)",
-"0x55d9d99dea0f: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
-"0x55d9d9863dc6: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9867954: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9a2d52d: cedar_policy_validator::typecheck::Typechecker::typecheck_extension (cedar-policy-validator/src/typecheck.rs:2182:21)",
-"0x55d9d9ad14eb: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9ad14eb: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
-"0x55d9d9c83d3d: cedar_policy_core::ast::policy::Template::link_static_policy (src/ast/policy.rs:211:17)",
-"0x55d9d9c84af4: <cedar_policy_core::ast::policy::Policy as core::convert::From<cedar_policy_core::ast::policy::StaticPolicy>>::from (src/ast/policy.rs:778:27)",
-"0x55d9d9c5a60e: <T as core::convert::Into<U>>::into (src/convert/mod.rs:727:9)",
-"0x55d9d9bb3d80: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9c61ceb: core::result::Result<T,E>::map (core/src/result.rs:759:25)",
-"0x55d9d9b57874: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d9b57874: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d9b57874: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d9b65768: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d988c548: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d988c548: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d988c548: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9855288: <serde::de::impls::<impl serde::de::Deserialize for alloc::vec::Vec<T>>::deserialize::VecVisitor<T> as serde::de::Visitor>::visit_seq (src/de/impls.rs:1032:34)",
-"0x55d9d984af00: serde::__private::de::content::visit_content_seq_ref (src/private/de.rs:1688:26)",
-"0x55d9d983d103: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_seq (src/private/de.rs:1936:40)",
-"0x55d9d988fff6: serde::de::impls::<impl serde::de::Deserialize for alloc::vec::Vec<T>>::deserialize (src/de/impls.rs:1045:9)",
-"0x55d9d9cb97a6: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9cb97a6: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9cb97a6: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:139:27)",
-"0x55d9d9d53fa3: <serde::__private::de::content::Content as core::clone::Clone>::clone (src/private/de.rs:250:13)",
-"0x55d9d9a27fbe: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9a27fbe: cedar_policy_validator::typecheck::Typechecker::possible_slot_instantiations (cedar-policy-validator/src/typecheck.rs:493:13)",
-"0x55d9d991513a: cedar_policy_validator::typecheck::Typechecker::link_request_env::{{closure}} (cedar-policy-validator/src/typecheck.rs:437:13)",
-"0x55d9d990d4df: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
-"0x55d9d99e566a: core::option::Option<T>::map (core/src/option.rs:1099:29)",
-"0x55d9d99d86fc: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::next (iter/adapters/map.rs:103:9)",
-"0x55d9d98ed39b: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9da14b273: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9da152cc9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9da1022e3: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9da11201f: regex_syntax::ast::visitor::HeapVisitor::visit (src/ast/visitor.rs:218:17)",
-"0x55d9d9868d04: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9da1d6248: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
-"0x55d9da1d6248: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9da1d6248: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9da1d6248: alloc::raw_vec::RawVec<T>::with_capacity (alloc/src/raw_vec.rs:92:9)",
-"0x55d9da1d6248: <alloc::boxed::Box<[T]> as core::convert::From<&[T]>>::from (alloc/src/boxed.rs:1485:19)",
-"0x55d9da1d6248: <T as core::convert::Into<U>>::into (src/convert/mod.rs:727:9)",
-"0x55d9da1d6248: alloc::ffi::c_str::<impl alloc::borrow::ToOwned for core::ffi::c_str::CStr>::to_owned (src/ffi/c_str.rs:1015:51)",
-"0x55d9da1d6248: <alloc::ffi::c_str::CString as core::convert::From<&core::ffi::c_str::CStr>>::from (src/ffi/c_str.rs:1028:9)",
-"0x55d9da1ba8d5: <std::sys::unix::fs::ReadDir as core::iter::traits::iterator::Iterator>::next (sys/unix/fs.rs:722:27)",
-"0x55d9da1b1423: <std::fs::ReadDir as core::iter::traits::iterator::Iterator>::next (std/src/fs.rs:1625:9)",
-"0x55d9d9782a5d: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2303:29)",
-"0x55d9d975638c: <core::iter::adapters::filter::Filter<I,P> as core::iter::traits::iterator::Iterator>::next (iter/adapters/filter.rs:56:9)",
-"0x55d9d9a75160: serde::de::Visitor::visit_str (src/de/mod.rs:1491:13)",
-"0x55d9d9cb78db: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:1738:43)",
-"0x55d9d984ef14: <serde::__private::de::content::TaggedContentVisitor<T> as serde::de::Visitor>::visit_map (src/private/de.rs:865:27)",
-"0x55d9d981726f: serde_json::value::de::visit_object (src/value/de.rs:196:20)",
-"0x55d9d98c92a6: serde_json::value::de::<impl serde::de::Deserializer for serde_json::value::Value>::deserialize_any (src/value/de.rs:223:33)",
-"0x55d9d98977f4: cedar_policy_core::est::head_constraints::_::<impl serde::de::Deserialize for cedar_policy_core::est::head_constraints::ResourceConstraint>::deserialize (src/est/head_constraints.rs:55:46)",
-"0x55d9d9863bb1: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9a32006: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9a32006: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
-"0x55d9d9a41a6b: cedar_policy_core::ast::expr::ExprBuilder<T>::record (src/ast/expr.rs:1060:20)",
-"0x55d9d991a74e: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:1186:37)",
-"0x55d9d99139e9: cedar_policy_validator::typecheck::TypecheckAnswer::sequence_all_then_typecheck (cedar-policy-validator/src/typecheck.rs:217:19)",
-"0x55d9d9939d2e: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9939d2e: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9939d2e: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9939d2e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9948f7e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9948297: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d99e3972: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d99e3972: <core::option::Option<V> as core::iter::traits::collect::FromIterator<core::option::Option<A>>>::from_iter::{{closure}} (core/src/option.rs:2505:51)",
-"0x55d9d98e77fe: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d99a2d93: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d99a7389: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d99442aa: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9914e31: cedar_policy_validator::typecheck::Typechecker::apply_typecheck_fn_by_request_env (cedar-policy-validator/src/typecheck.rs:350:13)",
-"0x55d9d9a27d05: cedar_policy_validator::typecheck::Typechecker::typecheck_by_request_env (cedar-policy-validator/src/typecheck.rs:307:9)",
-"0x55d9d9932c04: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9932c04: <cedar_policy_validator::schema::EntityTypeDescription as cedar_policy_core::entities::json::schema::EntityTypeDescription>::required_attrs (cedar-policy-validator/src/schema.rs:1361:9)",
-"0x55d9d9850c32: cedar_policy_core::entities::json::entities::EntityJsonParser<S>::parse_ejson (entities/json/entities.rs:218:38)",
-"0x55d9d985427a: cedar_policy_core::entities::json::entities::EntityJsonParser<S>::parse_ejsons::{{closure}} (entities/json/entities.rs:163:26)",
-"0x55d9d9831872: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
-"0x55d9d9884c73: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
-"0x55d9d982e330: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
-"0x55d9d9f0217f: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9f0217f: regex_syntax::hir::Properties::union (src/hir/mod.rs:2313:20)",
-"0x55d9d9f7976d: regex_automata::meta::regex::RegexInfo::new (src/meta/regex.rs:1930:27)",
-"0x55d9d9ebe440: serde_json::read::parse_escape (serde_json-1.0.107/src/read.rs:855:17)",
-"0x55d9d9a9a83b: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a9a83b: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a9a83b: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9a9a83b: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9acddbe: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9accfd7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c2a48e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a71ac7: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Name>>>::to_ident (src/parser/cst_to_ast.rs:1729:28)",
-"0x55d9d99232dc: cedar_policy_validator::typecheck::Typechecker::least_upper_bound_or_error::{{closure}} (cedar-policy-validator/src/typecheck.rs:2085:21)",
-"0x55d9d99ebd15: core::option::Option<T>::and_then (core/src/option.rs:1440:24)",
-"0x55d9d9922e6f: cedar_policy_validator::typecheck::Typechecker::expect_one_of_types::{{closure}} (cedar-policy-validator/src/typecheck.rs:2023:21)",
-"0x55d9d99102a5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
-"0x55d9d9c862a0: cedar_policy_core::ast::policy::ActionConstraint::as_expr (src/ast/policy.rs:1351:17)",
-"0x55d9d9c84ce4: cedar_policy_core::ast::policy::TemplateBody::condition (src/ast/policy.rs:903:21)",
-"0x55d9d9c8610f: cedar_policy_core::ast::policy::ActionConstraint::is_eq (src/ast/policy.rs:1335:30)",
-"0x55d9d9a666bf: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::VariableDef>>>::to_action_constraint (src/parser/cst_to_ast.rs:571:26)",
-"0x55d9d9d33682: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::cst::Policy>::extract_head (src/parser/cst_to_ast.rs:277:13)",
-"0x55d9d9b77298: <cedar_policy_core::est::Policy as core::convert::TryFrom<cedar_policy_core::parser::cst::Policy>>::try_from (cedar-policy-core/src/est.rs:111:45)",
-"0x55d9d9d3c2fe: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
-"0x55d9d9d05eb9: alloc::boxed::Box<T,A>::try_new_uninit_in (alloc/src/boxed.rs:483:19)",
-"0x55d9d9d0475a: alloc::boxed::Box<T,A>::new_uninit_in (alloc/src/boxed.rs:448:15)",
-"0x55d9d9adde7d: alloc::collections::btree::node::LeafNode<K,V>::new (collections/btree/node.rs:83:28)",
-"0x55d9d9ad555a: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::Leaf>::new_leaf (collections/btree/node.rs:217:29)",
-"0x55d9d9ad79fa: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::LeafOrInternal>::new (collections/btree/node.rs:584:9)",
-"0x55d9d9a83aa8: alloc::collections::btree::map::BTreeMap<K,V,A>::bulk_build_from_sorted_iter (collections/btree/map.rs:1508:24)",
-"0x55d9d97586f0: cedar_policy::integration_testing::resolve_integration_test_path (cedar-policy/src/integration_testing.rs:112:24)",
-"0x55d9d9c85627: cedar_policy_core::ast::policy::EntityReference::euid (src/ast/policy.rs:1140:20)",
-"0x55d9d9c87872: <cedar_policy_core::ast::policy::EntityReference as cedar_policy_core::parser::cst_to_ast::RefKind>::create_single_ref (src/parser/cst_to_ast.rs:905:14)",
-"0x55d9d9c7717e: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_ref_or_refs (src/parser/cst_to_ast.rs:1603:40)",
-"0x55d9d9c76a53: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_ref_or_refs (src/parser/cst_to_ast.rs:1342:18)",
-"0x55d9d9c76614: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Unary>>>::to_ref_or_refs (src/parser/cst_to_ast.rs:1239:21)",
-"0x55d9d9c93135: cedar_policy_core::parser::cst_to_ast::construct_expr_add (src/parser/cst_to_ast.rs:2009:33)",
-"0x55d9d9c82e5d: cedar_policy_core::parser::cst_to_ast::construct_expr_like (src/parser/cst_to_ast.rs:2036:5)",
-"0x55d9d9a69520: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Relation>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1085:50)",
-"0x55d9d98fffa5: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
-"0x55d9d99d92d7: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
-"0x55d9da16b456: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_post (src/hir/translate.rs:472:21)",
-"0x55d9d990016f: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
-"0x55d9d9f27b2e: regex_automata::dfa::onepass::InternalBuilder::add_dfa_state_for_nfa_state (src/dfa/onepass.rs:853:9)",
-"0x55d9d9f2793c: regex_automata::dfa::onepass::InternalBuilder::add_start_state (src/dfa/onepass.rs:821:22)",
-"0x55d9d99efd23: cedar_policy_core::transitive_closure::enforce_dag_from_tc (cedar-policy-core/src/transitive_closure.rs:177:12)",
-"0x55d9d99ee581: cedar_policy_core::transitive_closure::compute_tc (cedar-policy-core/src/transitive_closure.rs:61:16)",
-"0x55d9d9969ffe: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
-"0x55d9d9b6929c: cedar_policy_core::extensions::partial_evaluation::extension (src/extensions/partial_evaluation.rs:45:9)",
-"0x55d9d9a5d3cc: cedar_policy_validator::extensions::partial_evaluation::extension_schema (src/extensions/partial_evaluation.rs:42:18)",
-"0x55d9d9a5b6c8: cedar_policy_validator::extensions::all_available_extension_schemas (cedar-policy-validator/src/extensions.rs:36:9)",
-"0x55d9d9edd147: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
-"0x55d9d9edd147: alloc::sync::Arc<[T]>::allocate_for_slice::{{closure}} (alloc/src/sync.rs:1380:33)",
-"0x55d9d9edc9d1: alloc::sync::Arc<T>::try_allocate_for_layout (alloc/src/sync.rs:1322:19)",
-"0x55d9d9edc86b: alloc::sync::Arc<T>::allocate_for_layout (alloc/src/sync.rs:1304:13)",
-"0x55d9d9edd116: alloc::sync::Arc<[T]>::allocate_for_slice (alloc/src/sync.rs:1378:13)",
-"0x55d9d9edcd37: alloc::sync::Arc<[T]>::from_iter_exact (alloc/src/sync.rs:1427:23)",
-"0x55d9d9edd3cd: <alloc::sync::Arc<[T]> as alloc::sync::ArcFromSlice<T>>::from_slice (alloc/src/sync.rs:1460:18)",
-"0x55d9d9edd3f7: <alloc::sync::Arc<[T]> as core::convert::From<&[T]>>::from (alloc/src/sync.rs:2672:9)",
-"0x55d9da14bbd1: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9da153678: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
-"0x55d9da103c80: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
-"0x55d9da103c80: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
-"0x55d9da0ffc1d: alloc::vec::Vec<T,A>::append_elements (src/vec/mod.rs:1940:9)",
-"0x55d9da0fc52b: <alloc::vec::Vec<T,A> as alloc::vec::spec_extend::SpecExtend<&T,core::slice::iter::Iter<T>>>::spec_extend (src/vec/spec_extend.rs:55:18)",
-"0x55d9da1849b7: regex_syntax::hir::Hir::concat (src/hir/mod.rs:470:25)",
-"0x55d9d986881a: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d982aecd: hashbrown::raw::RawTable<T,A>::fallible_with_capacity (src/raw/mod.rs:460:20)",
-"0x55d9d982a463: hashbrown::raw::RawTable<T,A>::with_capacity_in (src/raw/mod.rs:481:15)",
-"0x55d9d9826a17: hashbrown::raw::RawTable<T>::with_capacity (src/raw/mod.rs:411:9)",
-"0x55d9d9865b8d: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9b0dc2a: cedar_policy_core::extensions::decimal::extension (src/extensions/decimal.rs:267:13)",
-"0x55d9d9dc0c07: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
-"0x55d9d9dc0c07: alloc::sync::Arc<[T]>::allocate_for_slice::{{closure}} (alloc/src/sync.rs:1380:33)",
-"0x55d9d9dc0541: alloc::sync::Arc<T>::try_allocate_for_layout (alloc/src/sync.rs:1322:19)",
-"0x55d9d9dc03db: alloc::sync::Arc<T>::allocate_for_layout (alloc/src/sync.rs:1304:13)",
-"0x55d9d9dc0b84: alloc::sync::Arc<[T]>::allocate_for_slice (alloc/src/sync.rs:1378:13)",
-"0x55d9d9dc0ace: alloc::sync::Arc<[T]>::copy_from_slice (alloc/src/sync.rs:1392:23)",
-"0x55d9d9dc0db1: <alloc::sync::Arc<[T]> as alloc::sync::ArcFromSlice<T>>::from_slice (alloc/src/sync.rs:1468:18)",
-"0x55d9d9dc0db1: <alloc::sync::Arc<[T]> as core::convert::From<&[T]>>::from (alloc/src/sync.rs:2672:9)",
-"0x55d9d9dc0db1: <alloc::sync::Arc<str> as core::convert::From<&str>>::from (alloc/src/sync.rs:2690:19)",
-"0x55d9d9dbfc93: <T as core::convert::Into<U>>::into (src/convert/mod.rs:727:9)",
-"0x55d9d9d5c347: cedar_policy_core::evaluator::err::pretty_type_error (src/evaluator/err.rs:274:14)",
-"0x55d9da1df50f: core::fmt::write (src/fmt/mod.rs:1254:17)",
-"0x55d9da1e0213: core::fmt::Formatter::write_fmt (src/fmt/mod.rs:1708:9)",
-"0x55d9da1d5e1a: alloc::raw_vec::finish_grow (alloc/src/raw_vec.rs:0:0)",
-"0x55d9d9755512: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9755512: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
-"0x55d9da1d5d06: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
-"0x55d9da1d5d06: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
-"0x55d9da1d5d06: alloc::vec::Vec<T,A>::append_elements (src/vec/mod.rs:1940:9)",
-"0x55d9da1d5d06: <alloc::vec::Vec<T,A> as alloc::vec::spec_extend::SpecExtend<&T,core::slice::iter::Iter<T>>>::spec_extend (src/vec/spec_extend.rs:55:18)",
-"0x55d9da1d5d06: alloc::vec::Vec<T,A>::extend_from_slice (src/vec/mod.rs:2386:9)",
-"0x55d9da1d5d06: alloc::string::String::push_str (alloc/src/string.rs:926:9)",
-"0x55d9da1d5d06: <alloc::string::String as core::fmt::Write>::write_str (alloc/src/string.rs:2862:14)",
-"0x55d9da1d5d06: <&mut W as core::fmt::Write>::write_str (src/fmt/mod.rs:204:9)",
-"0x55d9da1e0c60: core::fmt::Formatter::write_str (src/fmt/mod.rs:1685:9)",
-"0x55d9da1e0c60: core::fmt::builders::debug_list_new (src/fmt/builders.rs:569:18)",
-"0x55d9da1e0c60: core::fmt::Formatter::debug_list (src/fmt/mod.rs:2301:9)",
-"0x55d9d9784ad5: <[T] as core::fmt::Debug>::fmt (src/fmt/mod.rs:2644:9)",
-"0x55d9d9785744: <alloc::vec::Vec<T,A> as core::fmt::Debug>::fmt (src/vec/mod.rs:3038:9)",
-"0x55d9da1d6409: core::fmt::Write::write_fmt (src/fmt/mod.rs:197:9)",
-"0x55d9da1d6409: alloc::fmt::format::format_inner (alloc/src/fmt.rs:612:9)",
-"0x55d9d9868b37: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9da113689: regex_syntax::ast::visitor::HeapVisitor::visit_class (src/ast/visitor.rs:322:17)",
-"0x55d9da112d8f: regex_syntax::ast::visitor::HeapVisitor::induct (src/ast/visitor.rs:268:17)",
-"0x55d9d993bf9b: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d993bf9b: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d993bf9b: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d993bf9b: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9948dfe: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9948727: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d990cdee: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a39e35: cedar_policy_validator::types::EntityRecordKind::all_attrs (cedar-policy-validator/src/types.rs:1103:55)",
-"0x55d9d99388af: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d99388af: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d99388af: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d99388af: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d994903e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9948a27: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d99dc29e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d98d884c: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::validate_action_ids (cedar-policy-validator/src/rbac.rs:103:32)",
-"0x55d9d9824f13: alloc::alloc::exchange_malloc (alloc/src/alloc.rs:324:18)",
-"0x55d9d9820fd6: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9820fd6: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d985e7c3: core::result::Result<T,E>::map (core/src/result.rs:759:25)",
-"0x55d9d98927bb: serde::de::impls::<impl serde::de::Deserialize for alloc::boxed::Box<T>>::deserialize (src/de/impls.rs:740:17)",
-"0x55d9d985708e: serde::de::impls::<impl serde::de::Deserialize for alloc::sync::Arc<T>>::deserialize (src/de/impls.rs:1863:17)",
-"0x55d9d989fa32: <core::marker::PhantomData<T> as serde::de::DeserializeSeed>::deserialize (src/de/mod.rs:794:9)",
-"0x55d9d984e202: <serde::__private::de::content::MapRefDeserializer<E> as serde::de::MapAccess>::next_value_seed (src/private/de.rs:2315:32)",
-"0x55d9d999cb5e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9937ea4: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9937ea4: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9937ea4: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9937ea4: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d994913e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d99488ec: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d99806de: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d98d8678: cedar_policy_validator::validation_result::ValidationResult::new (cedar-policy-validator/src/validation_result.rs:34:32)",
-"0x55d9d9918a7b: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:983:25)",
-"0x55d9d9912255: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d9c87192: cedar_policy_core::est::head_constraints::<impl core::convert::TryFrom<cedar_policy_core::est::head_constraints::ActionConstraint> for cedar_policy_core::ast::policy::ActionConstraint>::try_from (src/est/head_constraints.rs:396:46)",
-"0x55d9d9c59d5e: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
-"0x55d9d9b794c0: cedar_policy_core::est::Policy::try_into_ast_template (cedar-policy-core/src/est.rs:235:13)",
-"0x55d9d9b789d7: cedar_policy_core::est::Policy::try_into_ast_policy (cedar-policy-core/src/est.rs:203:39)",
-"0x55d9d98c58a1: cedar_policy::api::Policy::from_json (cedar-policy/src/api.rs:2343:18)",
-"0x55d9d975be50: cedar_policy::integration_testing::perform_integration_test_from_json_custom::{{closure}} (cedar-policy/src/integration_testing.rs:337:13)",
-"0x55d9d9938ec8: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9938ec8: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9938ec8: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9938ec8: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9948fbe: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9948359: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d99dc1de: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d992d269: cedar_policy_validator::extensions::decimal::extension_schema (src/extensions/decimal.rs:60:47)",
-"0x55d9d9c9d3c9: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:514:17)",
-"0x55d9d9918893: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:972:33)",
-"0x55d9da184980: regex_syntax::hir::Hir::concat (src/hir/mod.rs:470:34)",
-"0x55d9d9d4cabc: lalrpop_util::state_machine::Parser<D,I>::drive (lalrpop-util-0.20.0/src/state_machine.rs:221:21)",
-"0x55d9d9d8a412: cedar_policy_core::parser::text_to_cst::grammar::__parse__Name::NameParser::parse (src/parser/grammar.rs:17799:13)",
-"0x55d9d9bb5d3a: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9b3f783: cedar_policy_core::parser::text_to_cst::parse_collect_errors (src/parser/text_to_cst.rs:49:18)",
-"0x55d9d9d07596: cedar_policy_core::parser::text_to_cst::parse_name (src/parser/text_to_cst.rs:109:5)",
-"0x55d9d9c7178c: cedar_policy_core::parser::parse_name (cedar-policy-core/src/parser.rs:270:15)",
-"0x55d9d9eedd5d: regex_automata::nfa::thompson::compiler::Compiler::c::{{closure}} (nfa/thompson/compiler.rs:1006:63)",
-"0x55d9d9eead8f: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
-"0x55d9d9a5d101: cedar_policy_validator::extensions::partial_evaluation::get_argument_types (src/extensions/partial_evaluation.rs:26:20)",
-"0x55d9d9781929: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
-"0x55d9d97648d8: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d97850d9: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d97850d9: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d97850d9: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d97850d9: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
-"0x55d9d97859ba: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9785975: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d977cb5a: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d97594a5: cedar_policy::integration_testing::perform_integration_test_from_json_custom (cedar-policy/src/integration_testing.rs:244:17)",
-"0x55d9d9c3025b: cedar_policy_core::parser::text_to_cst::grammar::__parse__Ident::IdentParser::new (src/parser/grammar.rs:10146:29)",
-"0x55d9d9bb3b41: <cedar_policy_core::parser::text_to_cst::IDENT_PARSER as core::ops::deref::Deref>::deref::__static_ref_initialize (src/parser/text_to_cst.rs:77:53)",
-"0x55d9d9bb3b41: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d99bd164: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d99bd164: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d99bd164: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d99d59e8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d99c44b4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d99c44b4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d99c44b4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d99d5678: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9cf42ec: cedar_policy_core::est::expr::Expr::_in (src/est/expr.rs:305:19)",
-"0x55d9d9c81f0e: cedar_policy_core::parser::cst_to_ast::construct_expr_not (src/parser/cst_to_ast.rs:1953:5)",
-"0x55d9d9c91159: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Unary>>>::to_expr_or_special::{{closure}} (src/parser/cst_to_ast.rs:1269:54)",
-"0x55d9d9c1c8fd: core::option::Option<T>::map (core/src/option.rs:1099:29)",
-"0x55d9d9a6c5e8: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Unary>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1269:21)",
-"0x55d9d9f7b1af: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3442:5)",
-"0x55d9d9758e5e: cedar_policy::integration_testing::perform_integration_test_from_json_custom (cedar-policy/src/integration_testing.rs:190:25)",
-"0x55d9d9864eca: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9da1bac83: alloc::alloc::exchange_malloc (alloc/src/alloc.rs:324:18)",
-"0x55d9da1bac83: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9da1bac83: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
-"0x55d9da1bac83: std::sys::unix::fs::ReadDir::new (sys/unix/fs.rs:269:23)",
-"0x55d9da1bac83: std::sys::unix::fs::readdir (sys/unix/fs.rs:1429:12)",
-"0x55d9d99a1173: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d99a73b9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9944154: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d997954b: <cedar_policy_validator::schema_file_format::_::<impl serde::de::Deserialize for cedar_policy_validator::schema_file_format::TypeOfAttribute>::deserialize::__Visitor as serde::de::Visitor>::visit_map (cedar-policy-validator/src/schema_file_format.rs:588:46)",
-"0x55d9d9a02965: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_map (serde_json-1.0.107/src/de.rs:1791:31)",
-"0x55d9d985691e: serde::de::Error::unknown_variant (src/de/mod.rs:256:21)",
-"0x55d9d986b11b: <cedar_policy_core::est::expr::_::<impl serde::de::Deserialize for cedar_policy_core::est::expr::ExprNoExt>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str (src/est/expr.rs:46:46)",
-"0x55d9d98413cf: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_identifier (src/private/de.rs:2037:43)",
-"0x55d9d9869c37: <cedar_policy_core::est::expr::_::<impl serde::de::Deserialize for cedar_policy_core::est::expr::ExprNoExt>::deserialize::__Field as serde::de::Deserialize>::deserialize (src/est/expr.rs:46:46)",
-"0x55d9d9bb5c95: <cedar_policy_core::extensions::decimal::names::DECIMAL_FROM_STR_NAME as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/decimal.rs:47:55)",
-"0x55d9d9bb5c95: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9bdc271: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
-"0x55d9d9b68bf8: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
-"0x55d9d9d56e0d: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
-"0x55d9d9c2c364: cedar_policy_core::ast::policy_set::PolicySet::add_static (src/ast/policy_set.rs:153:22)",
-"0x55d9d9a62e3c: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Policies>>>::to_policyset (src/parser/cst_to_ast.rs:116:37)",
-"0x55d9d9c709af: cedar_policy_core::parser::parse_policyset_and_also_return_policy_text (cedar-policy-core/src/parser.rs:67:22)",
-"0x55d9d98c4dee: <cedar_policy::api::PolicySet as core::str::traits::FromStr>::from_str (cedar-policy/src/api.rs:1640:29)",
-"0x55d9d9cf4acc: cedar_policy_core::est::expr::Expr::or (src/est/expr.rs:353:19)",
-"0x55d9d984e7f4: <serde::__private::de::content::TaggedContentVisitor<T> as serde::de::Visitor>::visit_map (src/private/de.rs:865:27)",
-"0x55d9d9816f1f: serde_json::value::de::visit_object (src/value/de.rs:196:20)",
-"0x55d9d98c9406: serde_json::value::de::<impl serde::de::Deserializer for serde_json::value::Value>::deserialize_any (src/value/de.rs:223:33)",
-"0x55d9d9898054: cedar_policy_core::est::head_constraints::_::<impl serde::de::Deserialize for cedar_policy_core::est::head_constraints::PrincipalConstraint>::deserialize (src/est/head_constraints.rs:25:46)",
-"0x55d9d9a6382e: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Policy>>>::to_policy_template (src/parser/cst_to_ast.rs:216:63)",
-"0x55d9d9a632e7: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Policy>>>::to_policy_or_template (src/parser/cst_to_ast.rs:146:17)",
-"0x55d9d9cb823c: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_bool (src/private/de.rs:1759:26)",
-"0x55d9d9b7cdd7: serde::de::impls::<impl serde::de::Deserialize for bool>::deserialize (src/de/impls.rs:75:9)",
-"0x55d9d9c83716: cedar_policy_core::parser::cst_to_ast::construct_ext_meth (src/parser/cst_to_ast.rs:2064:5)",
-"0x55d9d9d93fff: cedar_policy_core::parser::text_to_cst::grammar::__parse__Name::__reduce19 (src/parser/grammar.rs:19582:20)",
-"0x55d9d9d8ad9c: cedar_policy_core::parser::text_to_cst::grammar::__parse__Name::__reduce (src/parser/grammar.rs:17917:17)",
-"0x55d9d9d87503: <cedar_policy_core::parser::text_to_cst::grammar::__parse__Name::__StateMachine as lalrpop_util::state_machine::ParserDefinition>::reduce (src/parser/grammar.rs:16360:13)",
-"0x55d9d9d5068c: lalrpop_util::state_machine::Parser<D,I>::reduce (lalrpop-util-0.20.0/src/state_machine.rs:594:9)",
-"0x55d9d9c9ee75: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:490:17)",
-"0x55d9d9863f1b: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9c91e80: cedar_policy_core::parser::cst_to_ast::construct_template_policy::{{closure}} (src/parser/cst_to_ast.rs:1893:9)",
-"0x55d9d9d1929d: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce33 (src/parser/grammar.rs:28640:20)",
-"0x55d9d9d0e156: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26718:17)",
-"0x55d9d9ad427f: <cedar_policy_core::ast::literal::Literal as core::convert::From<cedar_policy_core::ast::entity::EntityUID>>::from (src/ast/literal.rs:118:25)",
-"0x55d9d9d02c5e: <T as core::convert::Into<U>>::into (src/convert/mod.rs:727:9)",
-"0x55d9d9be0a80: cedar_policy_core::ast::expr::ExprBuilder<T>::val (src/ast/expr.rs:875:43)",
-"0x55d9d9c81a96: cedar_policy_core::parser::cst_to_ast::construct_expr_ref (src/parser/cst_to_ast.rs:1938:5)",
-"0x55d9d9c91d43: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Ref>>>::to_expr::{{closure}} (src/parser/cst_to_ast.rs:1833:25)",
-"0x55d9d9c874ce: cedar_policy_core::est::head_constraints::<impl core::convert::TryFrom<cedar_policy_core::est::head_constraints::ActionConstraint> for cedar_policy_core::ast::policy::ActionConstraint>::try_from (src/est/head_constraints.rs:396:51)",
-"0x55d9d9cf555b: cedar_policy_core::est::expr::Expr::ite (src/est/expr.rs:434:24)",
-"0x55d9da125f32: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9da125f32: regex_syntax::ast::parse::ParserI<P>::parse_group (src/ast/parse.rs:1252:22)",
-"0x55d9d9bb4da5: <cedar_policy_core::extensions::ipaddr::names::EXTENSION_NAME as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/ipaddr.rs:33:48)",
-"0x55d9d9bb4da5: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9bdbee1: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
-"0x55d9d9b681d8: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
-"0x55d9d9d56a1d: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
-"0x55d9d993af2e: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d993af2e: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d993af2e: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d993af2e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d99491ce: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d99483d9: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d99e39d2: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d99e39d2: <core::option::Option<V> as core::iter::traits::collect::FromIterator<core::option::Option<A>>>::from_iter::{{closure}} (core/src/option.rs:2505:51)",
-"0x55d9d98e7c25: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d9ebe494: serde_json::read::parse_escape (serde_json-1.0.107/src/read.rs:859:17)",
-"0x55d9d9b1e29e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9aa609e: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa609e: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa609e: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9aa609e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9acdc6e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acc947: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c2a30e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a825dc: <alloc::collections::btree::map::BTreeMap<K,V> as core::iter::traits::collect::FromIterator<(K,V)>>::from_iter (collections/btree/map.rs:2229:34)",
-"0x55d9d990dbf5: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
-"0x55d9d99821de: cedar_policy_validator::extensions::ipaddr::get_argument_types (src/extensions/ipaddr.rs:29:17)",
-"0x55d9d99439fc: alloc::vec::Vec<T,A>::extend_desugared (src/vec/mod.rs:2812:35)",
-"0x55d9d9a63b3f: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Policy>>>::to_policy_template (src/parser/cst_to_ast.rs:226:26)",
-"0x55d9d9a62dca: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Policies>>>::to_policyset (src/parser/cst_to_ast.rs:103:19)",
-"0x55d9d9865ce2: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9ef51e6: regex_automata::nfa::thompson::compiler::Utf8Compiler::finish (nfa/thompson/compiler.rs:1766:21)",
-"0x55d9d9ef326c: regex_automata::nfa::thompson::compiler::Compiler::c_unicode_class (nfa/thompson/compiler.rs:1444:13)",
-"0x55d9d9ad0b9b: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9ad0b9b: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
-"0x55d9d9998680: cedar_policy_validator::schema::CoreSchema::new::{{closure}} (cedar-policy-validator/src/schema.rs:1267:36)",
-"0x55d9d99e11b9: core::iter::adapters::map::map_fold::{{closure}} (iter/adapters/map.rs:84:28)",
-"0x55d9d99e13c7: core::iter::adapters::map::map_fold::{{closure}} (iter/adapters/map.rs:84:21)",
-"0x55d9d9959e54: core::iter::traits::iterator::Iterator::fold (iter/traits/iterator.rs:2482:21)",
-"0x55d9d99d71c1: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::fold (iter/adapters/map.rs:124:9)",
-"0x55d9d98d8ad6: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::check_if_in_fixes_principal (cedar-policy-validator/src/rbac.rs:172:14)",
-"0x55d9d9c9e79f: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:499:17)",
-"0x55d9d9aa49b0: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa49b0: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa49b0: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9aa49b0: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9ac152c: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
-"0x55d9d9accc67: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c5f922: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9c5f922: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
-"0x55d9d9a927b7: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d9c9caf8: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:522:17)",
-"0x55d9d9a74cd7: serde::de::Visitor::visit_i64 (src/de/mod.rs:1359:13)",
-"0x55d9d9cb65db: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_any (src/private/de.rs:1734:36)",
-"0x55d9d9a5ee85: cedar_policy_core::ast::name::Name::new (src/ast/name.rs:52:19)",
-"0x55d9d9cbe22c: cedar_policy_core::ast::name::Name::type_in_namespace (src/ast/name.rs:78:9)",
-"0x55d9d9991d03: cedar_policy_validator::schema::ValidatorNamespaceDef::build_action_ids::{{closure}} (cedar-policy-validator/src/schema.rs:437:37)",
-"0x55d9d9bad2ac: cedar_policy_core::extensions::ipaddr::extension (src/extensions/ipaddr.rs:288:13)",
-"0x55d9d9b2a403: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9b3e638: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
-"0x55d9d9abd270: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
-"0x55d9d9abd270: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
-"0x55d9d9acb5b4: <alloc::vec::Vec<T,A> as core::iter::traits::collect::Extend<T>>::extend_reserve (src/vec/mod.rs:2796:9)",
-"0x55d9d9a9929c: <(ExtendA,ExtendB) as core::iter::traits::collect::Extend<(A,B)>>::extend (iter/traits/collect.rs:436:13)",
-"0x55d9d9867fbc: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9c5b6d5: cedar_policy_core::evaluator::Evaluator::partial_interpret::{{closure}} (cedar-policy-core/src/evaluator.rs:545:33)",
-"0x55d9d9af3e1f: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
-"0x55d9d9b9e538: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
-"0x55d9d9a9ef65: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a9ef65: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a9ef65: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9a9ef65: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9ace01e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acbd67: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c5fa42: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9c5fa42: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
-"0x55d9d9a92e30: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d9a2b6ea: cedar_policy_validator::typecheck::Typechecker::typecheck_in (cedar-policy-validator/src/typecheck.rs:1531:22)",
-"0x55d9d999d42c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9938bd6: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9938bd6: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9938bd6: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9938bd6: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d994915e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9948619: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d99f51ce: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a2ca14: cedar_policy_validator::typecheck::Typechecker::lookup_extension_function (cedar-policy-validator/src/typecheck.rs:2117:60)",
-"0x55d9d9867aa9: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9cfd447: cedar_policy_core::est::expr::interpret_primary (src/est/expr.rs:1062:34)",
-"0x55d9d9cffae4: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Member>>::try_from (src/est/expr.rs:1184:66)",
-"0x55d9d9eaad23: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9eaafe9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9eca837: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9ebb58b: <serde_json::value::de::<impl serde::de::Deserialize for serde_json::value::Value>::deserialize::ValueVisitor as serde::de::Visitor>::visit_seq (src/value/de.rs:98:21)",
-"0x55d9d9ec6743: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_any (serde_json-1.0.107/src/de.rs:1427:31)",
-"0x55d9d9b9f468: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
-"0x55d9d9aef1ff: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
-"0x55d9d9bdeadf: cedar_policy_core::ast::expr::Expr::val (src/ast/expr.rs:300:9)",
-"0x55d9d9a2c956: cedar_policy_validator::typecheck::Typechecker::replace_action_var_with_euid (cedar-policy-validator/src/typecheck.rs:2102:54)",
-"0x55d9d99822cd: cedar_policy_validator::extensions::ipaddr::get_argument_types (src/extensions/ipaddr.rs:30:63)",
-"0x55d9d982a6dd: hashbrown::raw::RawTable<T,A>::new_uninitialized (src/raw/mod.rs:442:20)",
-"0x55d9d9825615: <hashbrown::raw::RawTable<T,A> as core::clone::Clone>::clone (src/raw/mod.rs:1606:39)",
-"0x55d9d98a1e06: <hashbrown::map::HashMap<K,V,S,A> as core::clone::Clone>::clone (hashbrown-0.12.3/src/map.rs:197:20)",
-"0x55d9d988307d: <std::collections::hash::map::HashMap<K,V,S> as core::clone::Clone>::clone (collections/hash/map.rs:1267:22)",
-"0x55d9d98c7e92: alloc::str::<impl alloc::borrow::ToOwned for str>::to_owned (alloc/src/str.rs:209:46)",
-"0x55d9d98c7e92: <alloc::string::String as core::convert::From<&str>>::from (alloc/src/string.rs:2650:11)",
-"0x55d9d98c7e92: <str as alloc::string::ToString>::to_string (alloc/src/string.rs:2596:9)",
-"0x55d9d986b677: <cedar_policy_core::est::expr::_::<impl serde::de::Deserialize for cedar_policy_core::est::expr::ExtFuncCall>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str (src/est/expr.rs:241:46)",
-"0x55d9d98425bf: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_identifier (src/private/de.rs:2037:43)",
-"0x55d9d9ef5d35: regex_automata::nfa::thompson::compiler::Utf8Compiler::pop_freeze (nfa/thompson/compiler.rs:1836:9)",
-"0x55d9d9933f7b: cedar_policy_validator::fuzzy_match::fuzzy_search::{{closure}} (cedar-policy-validator/src/fuzzy_match.rs:23:21)",
-"0x55d9d9930884: cedar_policy_validator::schema::ValidatorNamespaceDef::parse_action_id_with_namespace (cedar-policy-validator/src/schema.rs:655:25)",
-"0x55d9d9865460: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9c718be: cedar_policy_core::parser::parse_name (cedar-policy-core/src/parser.rs:271:21)",
-"0x55d9d9cbe4ba: <cedar_policy_core::ast::name::Name as core::str::traits::FromStr>::from_str (src/ast/name.rs:117:9)",
-"0x55d9d9c8f77b: core::str::<impl str>::parse (src/str/mod.rs:2353:9)",
-"0x55d9da0bca3c: <alloc::alloc::Global as core::alloc::Allocator>::allocate_zeroed (alloc/src/alloc.rs:240:9)",
-"0x55d9d9fe4c1c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:185:38)",
-"0x55d9da0bfd97: alloc::raw_vec::RawVec<T,A>::with_capacity_zeroed_in (alloc/src/raw_vec.rs:138:9)",
-"0x55d9da0bfd97: <T as alloc::vec::spec_from_elem::SpecFromElem>::from_elem (src/vec/spec_from_elem.rs:25:31)",
-"0x55d9da0a2f4b: alloc::vec::from_elem (src/vec/mod.rs:2550:5)",
-"0x55d9d9f31f70: regex_automata::util::search::PatternSet::new (src/util/search.rs:1192:20)",
-"0x55d9d9d3db8a: regex::regexset::string::RegexSet::matches_at (src/regexset/string.rs:327:26)",
-"0x55d9d9990432: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9990432: cedar_policy_validator::schema::WithUnresolvedTypeDefs<T>::new (cedar-policy-validator/src/schema.rs:167:30)",
-"0x55d9d999072d: cedar_policy_validator::schema::WithUnresolvedTypeDefs<T>::map (cedar-policy-validator/src/schema.rs:173:17)",
-"0x55d9d9f66e98: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:459:30)",
-"0x55d9d9ec959c: serde::de::Visitor::visit_borrowed_str (src/de/mod.rs:1508:9)",
-"0x55d9d977fe0d: hashbrown::raw::RawTable<T,A>::new_uninitialized (src/raw/mod.rs:442:20)",
-"0x55d9d977d8f1: <hashbrown::raw::RawTable<T,A> as core::clone::Clone>::clone (src/raw/mod.rs:1606:39)",
-"0x55d9d97796e2: <hashbrown::map::HashMap<K,V,S,A> as core::clone::Clone>::clone (hashbrown-0.12.3/src/map.rs:197:20)",
-"0x55d9d9763dcc: <std::collections::hash::map::HashMap<K,V,S> as core::clone::Clone>::clone (collections/hash/map.rs:1267:22)",
-"0x55d9d9a31d84: core::iter::traits::iterator::Iterator::partition::extend::{{closure}} (iter/traits/iterator.rs:2096:21)",
-"0x55d9d9f6f616: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9f6f616: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
-"0x55d9d9f7b7a6: regex_automata::meta::regex::Builder::build_many_from_hir (src/meta/regex.rs:3559:25)",
-"0x55d9d9865fce: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d999e8be: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d993abb9: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d993abb9: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d993abb9: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d993abb9: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9948f3e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9948b67: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d99e39a2: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d99e39a2: <core::option::Option<V> as core::iter::traits::collect::FromIterator<core::option::Option<A>>>::from_iter::{{closure}} (core/src/option.rs:2505:51)",
-"0x55d9d98e92eb: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d9bfb2d8: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce48 (src/parser/grammar.rs:37685:20)",
-"0x55d9d9bee4e3: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35505:17)",
-"0x55d9d9cfcf9a: cedar_policy_core::est::expr::interpret_primary (src/est/expr.rs:1092:72)",
-"0x55d9d9cf515c: cedar_policy_core::est::expr::Expr::contains_any (src/est/expr.rs:402:20)",
-"0x55d9d9cff0d4: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Member>>::try_from (src/est/expr.rs:1235:64)",
-"0x55d9d9c87770: cedar_policy_core::est::head_constraints::<impl core::convert::TryFrom<cedar_policy_core::est::head_constraints::ActionConstraint> for cedar_policy_core::ast::policy::ActionConstraint>::try_from (src/est/head_constraints.rs:392:17)",
-"0x55d9d97ee10a: alloc::fmt::format::{{closure}} (alloc/src/fmt.rs:616:34)",
-"0x55d9d97ee10a: core::option::Option<T>::map_or_else (core/src/option.rs:1193:21)",
-"0x55d9d97ee10a: alloc::fmt::format (alloc/src/fmt.rs:616:5)",
-"0x55d9d97ee10a: <test::formatters::pretty::PrettyFormatter<T> as test::formatters::OutputFormatter>::write_timeout (alloc/src/macros.rs:120:19)",
-"0x55d9d97e3b0b: test::console::on_test_event (test/src/console.rs:275:43)",
-"0x55d9d97e3b0b: test::console::run_tests_console::{{closure}} (test/src/console.rs:329:32)",
-"0x55d9d97e2173: test::run_tests (test/src/lib.rs:419:25)",
-"0x55d9d97e2173: test::console::run_tests_console (test/src/console.rs:329:5)",
-"0x55d9da18ac5b: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9da18ac5b: regex_syntax::hir::Properties::repetition (src/hir/mod.rs:2475:20)",
-"0x55d9da184255: regex_syntax::hir::Hir::repetition (src/hir/mod.rs:379:21)",
-"0x55d9da1720c5: regex_syntax::hir::translate::TranslatorI::hir_repetition (src/hir/translate.rs:1001:9)",
-"0x55d9d9f3c2c1: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9f45538: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
-"0x55d9d9ee52d0: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
-"0x55d9d9ee52d0: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
-"0x55d9d9edf167: alloc::vec::Vec<T,A>::extend_with (src/vec/mod.rs:2492:9)",
-"0x55d9d9ee4fa0: alloc::vec::Vec<T,A>::resize (src/vec/mod.rs:2358:13)",
-"0x55d9da122f59: regex_syntax::ast::parse::ParserI<P>::parse_with_comments (src/ast/parse.rs:1002:22)",
-"0x55d9d9923b53: cedar_policy_validator::typecheck::Typechecker::typecheck_extension::{{closure}} (cedar-policy-validator/src/typecheck.rs:2205:33)",
-"0x55d9d99133df: cedar_policy_validator::typecheck::TypecheckAnswer::sequence_all_then_typecheck (cedar-policy-validator/src/typecheck.rs:217:19)",
-"0x55d9d9a2d608: cedar_policy_validator::typecheck::Typechecker::typecheck_extension (cedar-policy-validator/src/typecheck.rs:2199:21)",
-"0x55d9d991a0a6: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:1143:29)",
-"0x55d9d9b7049d: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:332:33)",
-"0x55d9d9b0d359: cedar_policy_core::extensions::decimal::extension (src/extensions/decimal.rs:252:9)",
-"0x55d9d9868e7e: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9da152f99: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9da101f1a: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9782df3: <serde::de::impls::<impl serde::de::Deserialize for alloc::vec::Vec<T>>::deserialize::VecVisitor<T> as serde::de::Visitor>::visit_seq (src/de/impls.rs:1035:21)",
-"0x55d9d9773d1d: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_seq (serde_json-1.0.107/src/de.rs:1740:31)",
-"0x55d9d9cc67f6: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9cc67f6: cedar_policy_core::parser::text_to_cst::grammar::__action34 (src/parser/grammar.rs:57882:37)",
-"0x55d9d9cd9841: cedar_policy_core::parser::text_to_cst::grammar::__action268 (src/parser/grammar.rs:63025:5)",
-"0x55d9d9ce5087: cedar_policy_core::parser::text_to_cst::grammar::__action358 (src/parser/grammar.rs:65918:5)",
-"0x55d9d9c01fda: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce103 (src/parser/grammar.rs:38768:20)",
-"0x55d9d9beefd8: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35670:17)",
-"0x55d9d9ed0ade: <smol_str::SmolStr as core::fmt::Display>::fmt (smol_str-0.2.0/src/lib.rs:240:9)",
-"0x55d9d9b08877: <&T as core::fmt::Display>::fmt (src/fmt/mod.rs:2418:62)",
-"0x55d9d9d3709b: cedar_policy_core::parser::fmt::<impl core::fmt::Display for cedar_policy_core::parser::cst::Ident>::fmt (src/parser/fmt.rs:396:32)",
-"0x55d9d9f41273: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9f43849: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9ee360a: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9f67b3f: regex_automata::nfa::thompson::builder::Builder::add_capture_start (nfa/thompson/builder.rs:1007:17)",
-"0x55d9d9ef4c12: regex_automata::nfa::thompson::compiler::Compiler::add_capture_start (nfa/thompson/compiler.rs:1659:9)",
-"0x55d9d98a52bd: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d98a52bd: cedar_policy_core::entities::json::jsonvalue::ValueParser::type_of_rexpr (entities/json/jsonvalue.rs:462:70)",
-"0x55d9d98ab847: cedar_policy_core::entities::json::jsonvalue::ValueParser::type_of_rexpr::{{closure}} (entities/json/jsonvalue.rs:453:21)",
-"0x55d9d98c2340: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
-"0x55d9d98598a4: core::option::Option<T>::map (core/src/option.rs:1099:29)",
-"0x55d9d982de4d: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::next (iter/adapters/map.rs:103:9)",
-"0x55d9d98a50cd: cedar_policy_core::entities::json::jsonvalue::ValueParser::type_of_rexpr (entities/json/jsonvalue.rs:455:23)",
-"0x55d9d9b7a389: cedar_policy_core::ast::restricted_expr::RestrictedExpr::val (src/ast/restricted_expr.rs:90:29)",
-"0x55d9d992297e: cedar_policy_validator::typecheck::Typechecker::typecheck_unary::{{closure}} (cedar-policy-validator/src/typecheck.rs:1968:25)",
-"0x55d9d990e5fc: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d991fad2: cedar_policy_validator::typecheck::Typechecker::type_of_var_in_entity_literals (cedar-policy-validator/src/typecheck.rs:1771:51)",
-"0x55d9d991d9a9: cedar_policy_validator::typecheck::Typechecker::typecheck_in::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1583:30)",
-"0x55d9d98638c8: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9b32743: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9889969: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d988e74f: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9783476: <serde::de::impls::<impl serde::de::Deserialize for alloc::vec::Vec<T>>::deserialize::VecVisitor<T> as serde::de::Visitor>::visit_seq (src/de/impls.rs:1035:21)",
-"0x55d9d9774405: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_seq (serde_json-1.0.107/src/de.rs:1740:31)",
-"0x55d9d98b7f90: cedar_policy_core::entities::json::jsonvalue::ValueParser::val_into_rexpr::{{closure}} (entities/json/jsonvalue.rs:317:40)",
-"0x55d9d98200f6: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d98200f6: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d98200f6: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:139:27)",
-"0x55d9d9890178: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
-"0x55d9d9890178: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
-"0x55d9d9890178: <alloc::vec::Vec<T,A> as core::clone::Clone>::clone (src/vec/mod.rs:2643:9)",
-"0x55d9d98574e4: <cedar_policy_core::est::Policy as core::clone::Clone>::clone (cedar-policy-core/src/est.rs:49:5)",
-"0x55d9d98c572d: cedar_policy::api::Policy::from_json (cedar-policy/src/api.rs:2343:18)",
-"0x55d9d9bb3d15: <cedar_policy_core::extensions::ipaddr::names::IS_IPV6 as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/ipaddr.rs:36:41)",
-"0x55d9d9bb3d15: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9bdbe21: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
-"0x55d9d9b68388: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
-"0x55d9d9d585ad: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
-"0x55d9d9aa20f0: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa20f0: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa20f0: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9aa20f0: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9ac11ec: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
-"0x55d9d9acc9c7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c5fbc2: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9c5fbc2: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
-"0x55d9d9a94687: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d99bba54: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d99bba54: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d99bba54: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d99d5728: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9da151033: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9da153059: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9da101ccd: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9da11e9fa: regex_syntax::ast::parse::ParserI<P>::push_group (src/ast/parse.rs:703:17)",
-"0x55d9d9b22c0e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9a9e3b2: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a9e3b2: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a9e3b2: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9a9e3b2: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9acdd9e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acc1d7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c2a2ee: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a6a5f7: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Add>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1117:42)",
-"0x55d9d99a1ad3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d99a79d8: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
-"0x55d9d9944e20: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
-"0x55d9d9944e20: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
-"0x55d9d99481d4: <alloc::vec::Vec<T,A> as core::iter::traits::collect::Extend<T>>::extend_reserve (src/vec/mod.rs:2796:9)",
-"0x55d9d99370e7: <(ExtendA,ExtendB) as core::iter::traits::collect::Extend<(A,B)>>::extend (iter/traits/collect.rs:435:13)",
-"0x55d9d9f39d41: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9f45508: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
-"0x55d9d9ee51b0: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
-"0x55d9d9ee51b0: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
-"0x55d9d9ee0957: alloc::vec::Vec<T,A>::extend_trusted (src/vec/mod.rs:2840:13)",
-"0x55d9d9ee9f47: <alloc::vec::Vec<T,A> as alloc::vec::spec_extend::SpecExtend<T,I>>::spec_extend (src/vec/spec_extend.rs:26:9)",
-"0x55d9d97824fd: alloc::fmt::format (alloc/src/fmt.rs:616:5)",
-"0x55d9d975bc9f: cedar_policy::integration_testing::perform_integration_test_from_json_custom::{{closure}} (cedar-policy/src/integration_testing.rs:336:42)",
-"0x55d9d976157e: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
-"0x55d9d978435a: core::option::Option<T>::map (core/src/option.rs:1099:29)",
-"0x55d9d9763418: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::next (iter/adapters/map.rs:103:9)",
-"0x55d9d9d5c230: cedar_policy_core::evaluator::err::pretty_type_error (src/evaluator/err.rs:277:13)",
-"0x55d9d9bdcb57: <&T as core::fmt::Display>::fmt (src/fmt/mod.rs:2418:62)",
-"0x55d9d992ccfd: cedar_policy_validator::extensions::decimal::get_argument_types (src/extensions/decimal.rs:31:13)",
-"0x55d9d9912a05: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
-"0x55d9da18936d: <regex_syntax::hir::Hir as core::ops::drop::Drop>::drop (src/hir/mod.rs:1861:57)",
-"0x55d9d9c86384: cedar_policy_core::ast::policy::ActionConstraint::as_expr (src/ast/policy.rs:1346:44)",
-"0x55d9d9864207: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9f3ecf3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9f43999: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9ee25f7: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9f28118: regex_automata::dfa::onepass::InternalBuilder::stack_push (src/dfa/onepass.rs:919:9)",
-"0x55d9d9f26600: regex_automata::dfa::onepass::InternalBuilder::build (src/dfa/onepass.rs:638:13)",
-"0x55d9d99bff84: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d99bff84: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d99bff84: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d99d55c8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9867d95: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9b52b94: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d9b52b94: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d9b52b94: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d9b65ce8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9ebe4d3: serde_json::read::parse_escape (serde_json-1.0.107/src/read.rs:862:17)",
-"0x55d9d9bb47f5: <cedar_policy_core::evaluator::names::ANY_ENTITY_TYPE as core::ops::deref::Deref>::deref::__static_ref_initialize (cedar-policy-core/src/evaluator.rs:39:49)",
-"0x55d9d9bb47f5: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9bdc2d1: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
-"0x55d9d9b689b8: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
-"0x55d9d9d5899d: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
-"0x55d9d99ecc18: <core::option::Option<T> as core::clone::Clone>::clone (core/src/option.rs:2041:29)",
-"0x55d9d9c82b1d: cedar_policy_core::parser::cst_to_ast::construct_expr_has (src/parser/cst_to_ast.rs:2030:5)",
-"0x55d9d9a69a0e: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Relation>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1074:50)",
-"0x55d9d9a67b23: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Or>>>::to_expr_or_special (src/parser/cst_to_ast.rs:946:27)",
-"0x55d9d99228a3: cedar_policy_validator::typecheck::Typechecker::typecheck_unary::{{closure}} (cedar-policy-validator/src/typecheck.rs:1962:29)",
-"0x55d9da152ed9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9da101df1: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d97624df: serde_json::read::IoRead<R>::parse_str_bytes (serde_json-1.0.107/src/read.rs:223:17)",
-"0x55d9d97630e7: <serde_json::read::IoRead<R> as serde_json::read::Read>::parse_str (serde_json-1.0.107/src/read.rs:328:9)",
-"0x55d9d990f9b3: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
-"0x55d9d9926b49: alloc::boxed::Box<T,A>::try_new_uninit_in (alloc/src/boxed.rs:483:19)",
-"0x55d9d992671a: alloc::boxed::Box<T,A>::new_uninit_in (alloc/src/boxed.rs:448:15)",
-"0x55d9d9a175bd: alloc::collections::btree::node::LeafNode<K,V>::new (collections/btree/node.rs:83:28)",
-"0x55d9d9a0b9fa: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::Leaf>::new_leaf (collections/btree/node.rs:217:29)",
-"0x55d9d9a0f6ca: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::LeafOrInternal>::new (collections/btree/node.rs:584:9)",
-"0x55d9d9900af8: alloc::collections::btree::map::BTreeMap<K,V,A>::bulk_build_from_sorted_iter (collections/btree/map.rs:1508:24)",
-"0x55d9d9c82fcd: cedar_policy_core::parser::cst_to_ast::construct_ext_func (src/parser/cst_to_ast.rs:2040:5)",
-"0x55d9d9cbf6ff: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::ast::name::Name>::into_func (src/parser/cst_to_ast.rs:1786:18)",
-"0x55d9d9bdbc82: alloc::str::<impl alloc::borrow::ToOwned for str>::to_owned (alloc/src/str.rs:209:46)",
-"0x55d9d9a60f4a: <serde_json::value::ser::Serializer as serde::ser::Serializer>::serialize_str (src/value/ser.rs:167:26)",
-"0x55d9d9c6cebb: serde::ser::impls::<impl serde::ser::Serialize for str>::serialize (src/ser/impls.rs:46:9)",
-"0x55d9d9aed3cf: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
-"0x55d9d9d4befc: lalrpop_util::state_machine::Parser<D,I>::drive (lalrpop-util-0.20.0/src/state_machine.rs:221:21)",
-"0x55d9d9c30332: cedar_policy_core::parser::text_to_cst::grammar::__parse__Ident::IdentParser::parse (src/parser/grammar.rs:10164:13)",
-"0x55d9d9bb563a: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9b40bf3: cedar_policy_core::parser::text_to_cst::parse_collect_errors (src/parser/text_to_cst.rs:49:18)",
-"0x55d9d9d075e6: cedar_policy_core::parser::text_to_cst::parse_ident (src/parser/text_to_cst.rs:114:5)",
-"0x55d9d9c71c5c: cedar_policy_core::parser::parse_ident (cedar-policy-core/src/parser.rs:336:15)",
-"0x55d9d9c86b29: cedar_policy_core::est::head_constraints::<impl core::convert::TryFrom<cedar_policy_core::est::head_constraints::PrincipalConstraint> for cedar_policy_core::ast::policy::PrincipalOrResourceConstraint>::try_from (src/est/head_constraints.rs:294:83)",
-"0x55d9d9c59d3e: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
-"0x55d9d9c866bc: cedar_policy_core::est::head_constraints::<impl core::convert::TryFrom<cedar_policy_core::est::head_constraints::PrincipalConstraint> for cedar_policy_core::ast::policy::PrincipalConstraint>::try_from (src/est/head_constraints.rs:213:9)",
-"0x55d9d9c59d9e: <T as core::convert::TryInto<U>>::try_into (src/convert/mod.rs:769:9)",
-"0x55d9d9b793a1: cedar_policy_core::est::Policy::try_into_ast_template (cedar-policy-core/src/est.rs:234:13)",
-"0x55d9d9c9cf6e: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:518:17)",
-"0x55d9d9b6d237: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:525:21)",
-"0x55d9d98cda4f: <serde_json::value::ser::Serializer as serde::ser::Serializer>::serialize_newtype_variant (src/value/ser.rs:214:23)",
-"0x55d9d9862f82: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9918746: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:974:37)",
-"0x55d9da1bb88c: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
-"0x55d9da1bb88c: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9da1bb88c: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9da1bb88c: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9da1bb88c: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:162:25)",
-"0x55d9da1bb88c: alloc::slice::hack::to_vec (alloc/src/slice.rs:111:9)",
-"0x55d9da1bb88c: alloc::slice::<impl [T]>::to_vec_in (alloc/src/slice.rs:441:9)",
-"0x55d9da1bb88c: alloc::slice::<impl [T]>::to_vec (alloc/src/slice.rs:416:14)",
-"0x55d9da1bb88c: std::sys::unix::os_str::Slice::to_owned (sys/unix/os_str.rs:213:33)",
-"0x55d9d9de66df: std::ffi::os_str::OsStr::to_os_string (src/ffi/os_str.rs:775:27)",
-"0x55d9d9de66df: <std::path::PathBuf as core::convert::From<&T>>::from (std/src/path.rs:1696:34)",
-"0x55d9d9de3a9b: <T as core::convert::Into<U>>::into (src/convert/mod.rs:727:9)",
-"0x55d9d975859e: cedar_policy::integration_testing::resolve_integration_test_path (cedar-policy/src/integration_testing.rs:123:9)",
-"0x55d9d9758c31: cedar_policy::integration_testing::perform_integration_test_from_json_custom (cedar-policy/src/integration_testing.rs:183:20)",
-"0x55d9d9bf716f: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce19 (src/parser/grammar.rs:37083:20)",
-"0x55d9d9bedf1c: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35418:17)",
-"0x55d9d9a6fb29: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Member>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1537:38)",
-"0x55d9d9a2c85c: cedar_policy_validator::typecheck::Typechecker::expect_type (cedar-policy-validator/src/typecheck.rs:2058:9)",
-"0x55d9da16b1bf: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_post (src/hir/translate.rs:462:25)",
-"0x55d9d993cae7: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d993cae7: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d993cae7: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d993cae7: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
-"0x55d9d9948fde: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d99485dc: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9909fae: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a353ab: <alloc::collections::btree::set::BTreeSet<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (collections/btree/set.rs:1202:34)",
-"0x55d9d98cd81f: <serde_json::value::ser::Serializer as serde::ser::Serializer>::serialize_newtype_variant (src/value/ser.rs:214:23)",
-"0x55d9d98637d2: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d999c28e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d993a581: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d993a581: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d993a581: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d993a581: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
-"0x55d9d99491ab: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9948676: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d99dc35b: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d991861d: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:970:37)",
-"0x55d9d99f020c: cedar_policy_core::transitive_closure::add_ancestors_to_set (cedar-policy-core/src/transitive_closure.rs:158:17)",
-"0x55d9d9b1d3ec: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9aa3408: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa3408: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa3408: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9aa3408: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9ace06b: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acc916: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c8f7db: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a44db0: cedar_policy_validator::fuzzy_match::levenshtein_distance (cedar-policy-validator/src/fuzzy_match.rs:34:14)",
-"0x55d9d9bb4ff5: <cedar_policy_core::extensions::ipaddr::names::IS_IPV4 as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/ipaddr.rs:35:41)",
-"0x55d9d9bb4ff5: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9bdc061: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
-"0x55d9d9b686e8: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
-"0x55d9d9d571fd: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
-"0x55d9d993987f: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:26:32)",
-"0x55d9d9a9e7a5: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a9e7a5: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a9e7a5: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9a9e7a5: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9acda2e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acc6f9: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c5fc52: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9c5fc52: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
-"0x55d9d9a92c20: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d9d05139: alloc::boxed::Box<T,A>::try_new_uninit_in (alloc/src/boxed.rs:483:19)",
-"0x55d9d9d04b6a: alloc::boxed::Box<T,A>::new_uninit_in (alloc/src/boxed.rs:448:15)",
-"0x55d9d9addded: alloc::collections::btree::node::LeafNode<K,V>::new (collections/btree/node.rs:83:28)",
-"0x55d9d9ad553a: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::Leaf>::new_leaf (collections/btree/node.rs:217:29)",
-"0x55d9d9ad79da: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::LeafOrInternal>::new (collections/btree/node.rs:584:9)",
-"0x55d9d9a83e48: alloc::collections::btree::map::BTreeMap<K,V,A>::bulk_build_from_sorted_iter (collections/btree/map.rs:1508:24)",
-"0x55d9d9bb3c15: <cedar_policy_core::extensions::ipaddr::names::IS_MULTICAST as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/ipaddr.rs:38:46)",
-"0x55d9d9bb3c15: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9bdbe81: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
-"0x55d9d9b68538: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
-"0x55d9d9d5a13d: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
-"0x55d9d9f66f3c: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:560:28)",
-"0x55d9d97589fd: cedar_policy::integration_testing::resolve_integration_test_path (cedar-policy/src/integration_testing.rs:112:9)",
-"0x55d9d9868754: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9a9fa35: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a9fa35: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a9fa35: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9a9fa35: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9acd97e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acc677: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c2a4ce: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a639ec: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Policy>>>::to_policy_template (src/parser/cst_to_ast.rs:219:29)",
-"0x55d9d9f3fb03: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9f43759: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9ee396b: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9f07c24: regex_automata::hybrid::dfa::Lazy::add_state (src/hybrid/dfa.rs:2270:9)",
-"0x55d9d9f09af3: regex_automata::hybrid::dfa::Lazy::init_cache (src/hybrid/dfa.rs:2496:13)",
-"0x55d9d9866636: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d999d71e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d993d047: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d993d047: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d993d047: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d993d047: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
-"0x55d9d994909e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9948829: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d990a00e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a34feb: <alloc::collections::btree::set::BTreeSet<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (collections/btree/set.rs:1202:34)",
-"0x55d9d9778a37: <serde_json::value::de::<impl serde::de::Deserialize for serde_json::value::Value>::deserialize::ValueVisitor as serde::de::Visitor>::visit_seq (src/value/de.rs:98:21)",
-"0x55d9d9771adb: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_any (serde_json-1.0.107/src/de.rs:1427:31)",
-"0x55d9da1129a8: regex_syntax::ast::visitor::HeapVisitor::visit (src/ast/visitor.rs:218:17)",
-"0x55d9da1115e1: regex_syntax::ast::visitor::visit (src/ast/visitor.rs:119:5)",
-"0x55d9d9c5ae7b: cedar_policy_core::ast::request::Request::new (src/ast/request.rs:90:23)",
-"0x55d9d9f353de: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9f24137: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9f24137: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9f24137: <T as alloc::vec::spec_from_elem::SpecFromElem>::from_elem (src/vec/spec_from_elem.rs:15:21)",
-"0x55d9d9ee5b77: alloc::vec::from_elem (src/vec/mod.rs:2550:5)",
-"0x55d9d9f2ffaf: regex_automata::nfa::thompson::map::Utf8BoundedMap::clear (nfa/thompson/map.rs:130:24)",
-"0x55d9d9ef4fb3: regex_automata::nfa::thompson::compiler::Utf8State::clear (nfa/thompson/compiler.rs:1746:9)",
-"0x55d9d9ef5050: regex_automata::nfa::thompson::compiler::Utf8Compiler::new (nfa/thompson/compiler.rs:1757:9)",
-"0x55d9d9866123: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9a40c2c: cedar_policy_core::ast::expr::ExprBuilder<T>::mul (src/ast/expr.rs:1000:18)",
-"0x55d9d991cb33: cedar_policy_validator::typecheck::Typechecker::typecheck_mul::{{closure}} (cedar-policy-validator/src/typecheck.rs:1446:17)",
-"0x55d9d9911805: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
-"0x55d9d9a2ae27: cedar_policy_validator::typecheck::Typechecker::typecheck_mul (cedar-policy-validator/src/typecheck.rs:1444:9)",
-"0x55d9d9a28a92: cedar_policy_validator::typecheck::Typechecker::typecheck (cedar-policy-validator/src/typecheck.rs:923:17)",
-"0x55d9d9cf4c9d: cedar_policy_core::est::expr::Expr::add (src/est/expr.rs:362:20)",
-"0x55d9d9cfa1d4: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Add>>::try_from (src/est/expr.rs:884:28)",
-"0x55d9d9ef539f: regex_automata::nfa::thompson::compiler::Utf8Compiler::add (nfa/thompson/compiler.rs:1781:9)",
-"0x55d9d9867b7b: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d99c4c64: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d99c4c64: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d99c4c64: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d99d4e38: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9c041ef: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce120 (src/parser/grammar.rs:39086:20)",
-"0x55d9d9bef3cb: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35730:17)",
-"0x55d9d99306c9: cedar_policy_validator::schema::ValidatorNamespaceDef::parse_possibly_qualified_name_with_default_namespace (cedar-policy-validator/src/schema.rs:612:21)",
-"0x55d9da14b723: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9da152e49: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9da10139f: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9da17fb06: regex_syntax::ast::ClassSetUnion::push (src/ast/mod.rs:1176:9)",
-"0x55d9da12a492: regex_syntax::ast::parse::ParserI<P>::parse_set_class (src/ast/parse.rs:1798:21)",
-"0x55d9d9b73018: cedar_policy_core::evaluator::Evaluator::get_attr (cedar-policy-core/src/evaluator.rs:635:15)",
-"0x55d9d9c76d5f: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_ref_or_refs (src/parser/cst_to_ast.rs:1603:61)",
-"0x55d9d9864bde: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d98826e5: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
-"0x55d9d986530b: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9bac473: cedar_policy_core::extensions::ipaddr::is_multicast (src/extensions/ipaddr.rs:246:18)",
-"0x55d9d9bb18d4: core::ops::function::Fn::call (src/ops/function.rs:79:5)",
-"0x55d9d9b231ee: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9aa56e7: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa56e7: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa56e7: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9aa56e7: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
-"0x55d9d9ace03e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acc319: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c17fee: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9ccb7de: cedar_policy_core::parser::text_to_cst::grammar::__action101 (src/parser/grammar.rs:59024:5)",
-"0x55d9d9865db4: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9991478: cedar_policy_validator::schema::ValidatorNamespaceDef::build_entity_types::{{closure}} (cedar-policy-validator/src/schema.rs:305:32)",
-"0x55d9d9bac193: cedar_policy_core::extensions::ipaddr::is_ipv6 (src/extensions/ipaddr.rs:232:18)",
-"0x55d9d9bb1894: core::ops::function::Fn::call (src/ops/function.rs:79:5)",
-"0x55d9da185894: regex_syntax::hir::Hir::alternation (src/hir/mod.rs:562:33)",
-"0x55d9d9be7d76: <serde_json::value::Value as core::clone::Clone>::clone (src/value/mod.rs:150:12)",
-"0x55d9d9b542a4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d9b542a4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d9b542a4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d9b65c38: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9ed7e1c: regex_automata::meta::regex::Builder::build_many (src/meta/regex.rs:3439:13)",
-"0x55d9d98658a1: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9f6fabb: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9f6fabb: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
-"0x55d9d9f85e24: regex_automata::meta::strategy::new (src/meta/strategy.rs:185:8)",
-"0x55d9d9f7b4df: regex_automata::meta::regex::Builder::build_many_from_hir (src/meta/regex.rs:3553:21)",
-"0x55d9d99c6b24: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d99c6b24: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d99c6b24: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d99d5a98: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9f711cb: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9f711cb: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
-"0x55d9d9ef6747: regex_automata::nfa::thompson::nfa::Inner::into_nfa (nfa/thompson/nfa.rs:1341:13)",
-"0x55d9d9f8af53: regex_automata::meta::strategy::Core::new (src/meta/strategy.rs:501:30)",
-"0x55d9d9cf40cd: cedar_policy_core::est::expr::Expr::eq (src/est/expr.rs:290:20)",
-"0x55d9d9cf9920: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Relation>>::try_from (src/est/expr.rs:795:36)",
-"0x55d9d9a44e24: cedar_policy_validator::fuzzy_match::levenshtein_distance (cedar-policy-validator/src/fuzzy_match.rs:35:14)",
-"0x55d9d9a9bcd2: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a9bcd2: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a9bcd2: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9a9bcd2: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9acdc4e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acc299: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c5fa12: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9c5fa12: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
-"0x55d9d9a94890: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d9a9db09: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a9db09: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a9db09: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9a9db09: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9acdffe: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acc569: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9b053be: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a8277b: <alloc::collections::btree::map::BTreeMap<K,V> as core::iter::traits::collect::FromIterator<(K,V)>>::from_iter (collections/btree/map.rs:2229:34)",
-"0x55d9d9a87347: <alloc::collections::btree::map::BTreeMap<K,V,A> as core::clone::Clone>::clone::clone_subtree (collections/btree/map.rs:219:36)",
-"0x55d9d9a27e67: cedar_policy_validator::typecheck::Typechecker::link_request_env (cedar-policy-validator/src/typecheck.rs:430:9)",
-"0x55d9d9914ed0: cedar_policy_validator::typecheck::Typechecker::apply_typecheck_fn_by_request_env::{{closure}} (cedar-policy-validator/src/typecheck.rs:347:29)",
-"0x55d9d990d53c: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
-"0x55d9d99e8809: core::option::Option<T>::map (core/src/option.rs:1099:29)",
-"0x55d9d99d8885: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::next (iter/adapters/map.rs:103:9)",
-"0x55d9da11f906: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9da11f906: regex_syntax::ast::parse::ParserI<P>::pop_group (src/ast/parse.rs:761:29)",
-"0x55d9d9c81dce: cedar_policy_core::parser::cst_to_ast::construct_expr_neg (src/parser/cst_to_ast.rs:1950:5)",
-"0x55d9d9c912e7: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Unary>>>::to_expr_or_special::{{closure}}::{{closure}} (src/parser/cst_to_ast.rs:1300:50)",
-"0x55d9d9c1a14d: core::option::Option<T>::map (core/src/option.rs:1099:29)",
-"0x55d9d9c91223: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Unary>>>::to_expr_or_special::{{closure}} (src/parser/cst_to_ast.rs:1300:40)",
-"0x55d9d9cf4c1c: cedar_policy_core::est::expr::Expr::add (src/est/expr.rs:361:19)",
-"0x55d9d9bb3915: <cedar_policy_core::extensions::ipaddr::names::IS_IN_RANGE as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/ipaddr.rs:39:45)",
-"0x55d9d9bb3915: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9bdbfa1: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
-"0x55d9d9b68658: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
-"0x55d9d9d5ad0d: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
-"0x55d9d9aa0fe1: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa0fe1: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa0fe1: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9aa0fe1: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
-"0x55d9d9acda9b: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9accae6: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9af0edb: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9be2df5: cedar_policy_core::ast::expr::ExprBuilder<T>::set (src/ast/expr.rs:1054:52)",
-"0x55d9d986435c: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9f39891: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9f43a29: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9ee2806: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9f797bb: regex_automata::meta::regex::RegexInfo::new (src/meta/regex.rs:1928:13)",
-"0x55d9d99792ac: <cedar_policy_validator::schema_file_format::_::<impl serde::de::Deserialize for cedar_policy_validator::schema_file_format::TypeOfAttribute>::deserialize::__Visitor as serde::de::Visitor>::visit_map (cedar-policy-validator/src/schema_file_format.rs:588:46)",
-"0x55d9d999371f: cedar_policy_validator::schema::ValidatorNamespaceDef::parse_apply_spec_type_list::{{closure}}::{{closure}} (cedar-policy-validator/src/schema.rs:582:29)",
-"0x55d9d99ddaa5: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
-"0x55d9d9b53af4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d9b53af4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d9b53af4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d9b65b88: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9aa3781: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa3781: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa3781: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9aa3781: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
-"0x55d9d9acdb0b: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9acc536: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9af151b: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9c8b64c: cedar_policy_core::parser::err::ParseErrors::errors_as_strings (src/parser/err.rs:513:9)",
-"0x55d9d9bb223b: core::ops::function::FnMut::call_mut (src/ops/function.rs:166:5)",
-"0x55d9d9afa917: core::iter::adapters::map::map_fold::{{closure}} (iter/adapters/map.rs:84:28)",
-"0x55d9d9b93091: core::iter::traits::iterator::Iterator::fold (iter/traits/iterator.rs:2482:21)",
-"0x55d9d9aeb262: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::fold (iter/adapters/map.rs:124:9)",
-"0x55d9d9af1cd6: core::iter::traits::iterator::Iterator::for_each (iter/traits/iterator.rs:857:9)",
-"0x55d9d993c4af: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d993c4af: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d993c4af: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d993c4af: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d99490fe: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9948517: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d98ff48e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d98fdb7c: <alloc::collections::btree::map::BTreeMap<K,V> as core::iter::traits::collect::FromIterator<(K,V)>>::from_iter (collections/btree/map.rs:2229:34)",
-"0x55d9d9ea9d28: alloc::raw_vec::RawVec<T,A>::reserve_exact (alloc/src/raw_vec.rs:333:24)",
-"0x55d9d9eca2fb: alloc::vec::Vec<T,A>::reserve_exact (src/vec/mod.rs:938:9)",
-"0x55d9d9eafc7c: indexmap::map::core::IndexMapCore<K,V>::reserve_entries (src/map/core.rs:213:9)",
-"0x55d9d9ccc7e0: cedar_policy_core::parser::text_to_cst::grammar::__action142 (src/parser/grammar.rs:59627:5)",
-"0x55d9d9d1d68f: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce65 (src/parser/grammar.rs:29283:20)",
-"0x55d9d9d0e7b6: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26814:17)",
-"0x55d9da151e43: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9da152c99: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9da10206f: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9da120c00: regex_syntax::ast::parse::ParserI<P>::push_class_open (src/ast/parse.rs:828:9)",
-"0x55d9da12a80c: regex_syntax::ast::parse::ParserI<P>::parse_set_class (src/ast/parse.rs:1768:29)",
-"0x55d9d9913f21: cedar_policy_validator::typecheck::TypecheckAnswer::sequence_all_then_typecheck (cedar-policy-validator/src/typecheck.rs:202:13)",
-"0x55d9d9bb3685: <cedar_policy_core::extensions::ipaddr::names::IP_FROM_STR_NAME as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/ipaddr.rs:34:50)",
-"0x55d9d9bb3685: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9bdc381: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
-"0x55d9d9b68898: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
-"0x55d9d9d5b4ed: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
-"0x55d9d9ef0dc9: regex_automata::nfa::thompson::compiler::Compiler::c_at_least (nfa/thompson/compiler.rs:1277:28)",
-"0x55d9d99132d5: cedar_policy_validator::typecheck::TypecheckAnswer::sequence_all_then_typecheck (cedar-policy-validator/src/typecheck.rs:202:13)",
-"0x55d9d9b0bca3: cedar_policy_core::extensions::decimal::decimal_from_str (src/extensions/decimal.rs:177:15)",
-"0x55d9d9bb1a34: core::ops::function::Fn::call (src/ops/function.rs:79:5)",
-"0x55d9d98cca44: serde::ser::Serializer::collect_seq (src/ser/mod.rs:1277:35)",
-"0x55d9d98900c6: serde::ser::impls::<impl serde::ser::Serialize for alloc::vec::Vec<T>>::serialize (src/ser/impls.rs:194:17)",
-"0x55d9d9890019: serde::ser::impls::<impl serde::ser::Serialize for &T>::serialize (src/ser/impls.rs:456:17)",
-"0x55d9d9bdba9f: core::iter::traits::iterator::Iterator::partition::extend::{{closure}} (iter/traits/iterator.rs:2096:21)",
-"0x55d9d9b6db4f: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:501:23)",
-"0x55d9d9f3d0d3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9f43699: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9ee325b: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9f67dc3: regex_automata::nfa::thompson::builder::Builder::add_capture_start (nfa/thompson/builder.rs:1023:13)",
-"0x55d9d9c82885: cedar_policy_core::parser::cst_to_ast::construct_expr_rel (src/parser/cst_to_ast.rs:1995:27)",
-"0x55d9d9bed4bb: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::PolicyParser::new (src/parser/grammar.rs:35282:29)",
-"0x55d9d9bb44a1: <cedar_policy_core::parser::text_to_cst::POLICY_PARSER as core::ops::deref::Deref>::deref::__static_ref_initialize (src/parser/text_to_cst.rs:72:55)",
-"0x55d9d9bb44a1: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9cf4d6c: cedar_policy_core::est::expr::Expr::sub (src/est/expr.rs:369:19)",
-"0x55d9d9926999: alloc::boxed::Box<T,A>::try_new_uninit_in (alloc/src/boxed.rs:483:19)",
-"0x55d9d992609a: alloc::boxed::Box<T,A>::new_uninit_in (alloc/src/boxed.rs:448:15)",
-"0x55d9d9a1764d: alloc::collections::btree::node::LeafNode<K,V>::new (collections/btree/node.rs:83:28)",
-"0x55d9d9a0b97a: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::Leaf>::new_leaf (collections/btree/node.rs:217:29)",
-"0x55d9d9a0f6ea: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::LeafOrInternal>::new (collections/btree/node.rs:584:9)",
-"0x55d9d9900cc8: alloc::collections::btree::map::BTreeMap<K,V,A>::bulk_build_from_sorted_iter (collections/btree/map.rs:1508:24)",
-"0x55d9d9991bd3: cedar_policy_validator::schema::ValidatorNamespaceDef::build_entity_types::{{closure}}::{{closure}} (cedar-policy-validator/src/schema.rs:315:29)",
-"0x55d9d99decf5: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
-"0x55d9d9b6fa81: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:367:34)",
-"0x55d9d9b2d2e3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9b3d2a9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9abb53d: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9c6bfb1: cedar_policy_core::authorizer::Authorizer::evaluate_policies (cedar-policy-core/src/authorizer.rs:313:21)",
-"0x55d9d975894f: cedar_policy::integration_testing::resolve_integration_test_path (cedar-policy/src/integration_testing.rs:110:28)",
-"0x55d9da14c9e3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9da152de9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9da101791: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9da16f487: regex_syntax::hir::translate::TranslatorI::push (src/hir/translate.rs:705:9)",
-"0x55d9da16a83d: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_pre (src/hir/translate.rs:359:17)",
-"0x55d9d9ed1b77: <alloc::alloc::Global as core::alloc::Allocator>::allocate (alloc/src/alloc.rs:235:9)",
-"0x55d9d9ed1b77: alloc::sync::Arc<[T]>::allocate_for_slice::{{closure}} (alloc/src/sync.rs:1380:33)",
-"0x55d9d9ed1501: alloc::sync::Arc<T>::try_allocate_for_layout (alloc/src/sync.rs:1322:19)",
-"0x55d9d9ed139b: alloc::sync::Arc<T>::allocate_for_layout (alloc/src/sync.rs:1304:13)",
-"0x55d9d9ed1b44: alloc::sync::Arc<[T]>::allocate_for_slice (alloc/src/sync.rs:1378:13)",
-"0x55d9d9ed1a8e: alloc::sync::Arc<[T]>::copy_from_slice (alloc/src/sync.rs:1392:23)",
-"0x55d9d9ed1d91: <alloc::sync::Arc<[T]> as alloc::sync::ArcFromSlice<T>>::from_slice (alloc/src/sync.rs:1468:18)",
-"0x55d9d9ed1d91: <alloc::sync::Arc<[T]> as core::convert::From<&[T]>>::from (alloc/src/sync.rs:2672:9)",
-"0x55d9d9ed1d91: <alloc::sync::Arc<str> as core::convert::From<&str>>::from (alloc/src/sync.rs:2690:19)",
-"0x55d9d9ed20b3: <T as core::convert::Into<U>>::into (src/convert/mod.rs:727:9)",
-"0x55d9d9b6ae71: cedar_policy_core::evaluator::Evaluator::new (cedar-policy-core/src/evaluator.rs:175:35)",
-"0x55d9d9c6a71b: cedar_policy_core::authorizer::Authorizer::is_authorized_core (cedar-policy-core/src/authorizer.rs:168:26)",
-"0x55d9d9c6a016: cedar_policy_core::authorizer::Authorizer::is_authorized (cedar-policy-core/src/authorizer.rs:97:15)",
-"0x55d9d98c3bc3: cedar_policy::api::Authorizer::is_authorized (cedar-policy/src/api.rs:605:9)",
-"0x55d9d9c5ad76: cedar_policy_core::ast::request::Request::new (src/ast/request.rs:88:24)",
-"0x55d9d9a9b60a: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a9b60a: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a9b60a: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9a9b60a: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9ac083c: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
-"0x55d9d9acbda7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c5f952: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9c5f952: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
-"0x55d9d9a93a58: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d9d052e9: alloc::boxed::Box<T,A>::try_new_uninit_in (alloc/src/boxed.rs:483:19)",
-"0x55d9d9d0482a: alloc::boxed::Box<T,A>::new_uninit_in (alloc/src/boxed.rs:448:15)",
-"0x55d9d9addf0d: alloc::collections::btree::node::LeafNode<K,V>::new (collections/btree/node.rs:83:28)",
-"0x55d9d9ad551a: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::Leaf>::new_leaf (collections/btree/node.rs:217:29)",
-"0x55d9d9ad7a1a: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::LeafOrInternal>::new (collections/btree/node.rs:584:9)",
-"0x55d9d9a83c78: alloc::collections::btree::map::BTreeMap<K,V,A>::bulk_build_from_sorted_iter (collections/btree/map.rs:1508:24)",
-"0x55d9d999dcfe: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9938543: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9938543: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9938543: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9938543: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d994917e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9948ba9: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9961922: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9961922: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
-"0x55d9d98e6ddd: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d986640f: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9da18a267: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9da18a267: regex_syntax::hir::Properties::union (src/hir/mod.rs:2313:20)",
-"0x55d9da18bc6c: regex_syntax::hir::Properties::alternation (src/hir/mod.rs:2578:9)",
-"0x55d9da185f4e: regex_syntax::hir::Hir::alternation (src/hir/mod.rs:614:21)",
-"0x55d9d9a61081: <serde_json::value::ser::MapKeySerializer as serde::ser::Serializer>::serialize_str (src/value/ser.rs:549:12)",
-"0x55d9d9c6ce8b: serde::ser::impls::<impl serde::ser::Serialize for str>::serialize (src/ser/impls.rs:46:9)",
-"0x55d9d985280e: cedar_policy_core::entities::json::entities::EntityJsonParser<S>::parse_ejson::{{closure}} (entities/json/entities.rs:272:37)",
-"0x55d9d982e7fb: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
-"0x55d9d98095cd: <core::iter::adapters::GenericShunt<I,R> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/mod.rs:195:9)",
-"0x55d9d9a5b64f: cedar_policy_validator::extensions::all_available_extension_schemas (cedar-policy-validator/src/extensions.rs:31:5)",
-"0x55d9d9cf53cb: cedar_policy_core::est::expr::Expr::like (src/est/expr.rs:425:19)",
-"0x55d9d9cf820f: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Relation>>::try_from (src/est/expr.rs:862:24)",
-"0x55d9d99be0c4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d99be0c4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d99be0c4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d99d4d88: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d990ff95: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:178:18)",
-"0x55d9d9c9f73d: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:482:17)",
-"0x55d9d9ad0895: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d9ad0895: alloc::sync::Arc<T>::new (alloc/src/sync.rs:369:25)",
-"0x55d9d9932899: cedar_policy_validator::schema::EntityTypeDescription::new (cedar-policy-validator/src/schema.rs:1334:17)",
-"0x55d9d9932403: <cedar_policy_validator::schema::CoreSchema as cedar_policy_core::entities::json::schema::Schema>::entity_type (cedar-policy-validator/src/schema.rs:1284:17)",
-"0x55d9d9850809: cedar_policy_core::entities::json::entities::EntityJsonParser<S>::parse_ejson (entities/json/entities.rs:183:53)",
-"0x55d9d99056bd: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9d99056bd: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::get_entities_satisfying_constraint (cedar-policy-validator/src/rbac.rs:390:17)",
-"0x55d9da1514e3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9da152f39: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9da101a24: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9da161be5: regex_syntax::utf8::Utf8Sequences::push (regex-syntax-0.7.5/src/utf8.rs:321:9)",
-"0x55d9da161b92: regex_syntax::utf8::Utf8Sequences::new (regex-syntax-0.7.5/src/utf8.rs:306:9)",
-"0x55d9d992266d: cedar_policy_validator::typecheck::Typechecker::typecheck_unary::{{closure}} (cedar-policy-validator/src/typecheck.rs:1954:29)",
-"0x55d9d9b0c3e1: cedar_policy_core::extensions::decimal::as_decimal (src/extensions/decimal.rs:198:13)",
-"0x55d9d9b0cf98: cedar_policy_core::extensions::decimal::decimal_ge (src/extensions/decimal.rs:240:16)",
-"0x55d9d9bb1938: core::ops::function::Fn::call (src/ops/function.rs:79:5)",
-"0x55d9d9b570c4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d9b570c4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d9b570c4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d9b658c8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9c9a410: cedar_policy_core::est::expr::<impl core::convert::TryFrom<cedar_policy_core::est::expr::Expr> for cedar_policy_core::ast::expr::Expr>::try_from (src/est/expr.rs:574:17)",
-"0x55d9da18bab5: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9da18bab5: regex_syntax::hir::Properties::concat (src/hir/mod.rs:2573:20)",
-"0x55d9da185531: regex_syntax::hir::Hir::concat (src/hir/mod.rs:484:21)",
-"0x55d9d9b6c847: cedar_policy_core::evaluator::Evaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:547:23)",
-"0x55d9d9b1c53e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d988a182: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d988a182: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d988a182: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d988a182: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9890ffe: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9890d99: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d985b302: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d985b302: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
-"0x55d9d9811738: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d9903b56: <alloc::collections::btree::map::BTreeMap<K,V,A> as core::clone::Clone>::clone::clone_subtree (collections/btree/map.rs:219:36)",
-"0x55d9d9927059: alloc::boxed::Box<T,A>::try_new_uninit_in (alloc/src/boxed.rs:483:19)",
-"0x55d9d99268ba: alloc::boxed::Box<T,A>::new_uninit_in (alloc/src/boxed.rs:448:15)",
-"0x55d9d9a1752d: alloc::collections::btree::node::LeafNode<K,V>::new (collections/btree/node.rs:83:28)",
-"0x55d9d9a0b99a: alloc::collections::btree::node::NodeRef<alloc::collections::btree::node::marker::Owned,K,V,alloc::collections::btree::node::marker::Leaf>::new_leaf (collections/btree/node.rs:217:29)",
-"0x55d9d9a32e3c: alloc::collections::btree::map::entry::VacantEntry<K,V,A>::insert (btree/map/entry.rs:355:32)",
-"0x55d9d9901df4: alloc::collections::btree::map::BTreeMap<K,V,A>::insert (collections/btree/map.rs:1006:17)",
-"0x55d9d9c92897: cedar_policy_core::parser::cst_to_ast::construct_expr_and (src/parser/cst_to_ast.rs:1978:17)",
-"0x55d9d9c9079e: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::And>>>::to_expr_or_special::{{closure}} (src/parser/cst_to_ast.rs:1007:46)",
-"0x55d9d9c1cf0d: core::option::Option<T>::map (core/src/option.rs:1099:29)",
-"0x55d9d9a68be1: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::And>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1005:55)",
-"0x55d9d9bb4c11: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9c62b6f: core::result::Result<T,E>::map (core/src/result.rs:759:25)",
-"0x55d9d9c59eb1: cedar_policy_core::est::head_constraints::<impl core::convert::TryFrom<cedar_policy_core::est::head_constraints::ActionConstraint> for cedar_policy_core::ast::policy::ActionConstraint>::try_from::{{closure}} (src/est/head_constraints.rs:405:29)",
-"0x55d9d9af6293: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
-"0x55d9d9b94a11: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
-"0x55d9d9cf55e8: cedar_policy_core::est::expr::Expr::ite (src/est/expr.rs:435:24)",
-"0x55d9d9f8a727: regex_automata::meta::strategy::Core::new (src/meta/strategy.rs:463:19)",
-"0x55d9d9bb58f5: <cedar_policy_core::extensions::decimal::names::LESS_THAN_OR_EQUAL as core::ops::deref::Deref>::deref::__static_ref_initialize (src/extensions/decimal.rs:49:52)",
-"0x55d9d9bb58f5: core::ops::function::FnOnce::call_once (src/ops/function.rs:250:5)",
-"0x55d9d9bdc111: lazy_static::lazy::Lazy<T>::get::{{closure}} (lazy_static-1.4.0/src/inline_lazy.rs:31:29)",
-"0x55d9d9b682f8: std::sync::once::Once::call_once::{{closure}} (src/sync/once.rs:149:41)",
-"0x55d9d9d5a91d: std::sys_common::once::futex::Once::call (sys_common/once/futex.rs:124:21)",
-"0x55d9d9bf9db8: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce38 (src/parser/grammar.rs:37483:20)",
-"0x55d9d9bee2e5: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35475:17)",
-"0x55d9d9b389b3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9889999: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d988e8a7: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9783043: <serde::de::impls::<impl serde::de::Deserialize for alloc::vec::Vec<T>>::deserialize::VecVisitor<T> as serde::de::Visitor>::visit_seq (src/de/impls.rs:1035:21)",
-"0x55d9d97751f5: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_seq (serde_json-1.0.107/src/de.rs:1740:31)",
-"0x55d9d9be3467: cedar_policy_core::ast::expr::ExprBuilder<T>::record (src/ast/expr.rs:1060:20)",
-"0x55d9d9c8394b: cedar_policy_core::parser::cst_to_ast::construct_expr_record (src/parser/cst_to_ast.rs:2072:5)",
-"0x55d9d9a70fa4: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1657:46)",
-"0x55d9d986501f: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9865973: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9d21f3a: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce103 (src/parser/grammar.rs:30026:20)",
-"0x55d9d9d0ef48: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policies::__reduce (src/parser/grammar.rs:26928:17)",
-"0x55d9d9b587d4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d9b587d4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d9b587d4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d9b656b8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9911953: cedar_policy_validator::typecheck::TypecheckAnswer::then_typecheck (cedar-policy-validator/src/typecheck.rs:180:17)",
-"0x55d9d9b330a3: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9b3d3f9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9aba744: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d97839e4: <serde::__private::de::content::ContentVisitor as serde::de::Visitor>::visit_map (src/private/de.rs:508:17)",
-"0x55d9d9772720: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_any (serde_json-1.0.107/src/de.rs:1438:31)",
-"0x55d9d9b1ce0e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d988a5b0: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d988a5b0: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d988a5b0: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d988a5b0: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d988f60b: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
-"0x55d9d9890e29: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d985b4b2: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d985b4b2: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
-"0x55d9d98114a8: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d99c72d4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d99c72d4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d99c72d4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d99d5ca8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9830d13: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
-"0x55d9d98941fb: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
-"0x55d9d982e93b: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
-"0x55d9d982fa0b: core::iter::traits::iterator::Iterator::find (iter/traits/iterator.rs:2773:9)",
-"0x55d9d9a9fde6: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9a9fde6: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9a9fde6: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9a9fde6: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9ac186c: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
-"0x55d9d9acd1a7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c5fce2: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9c5fce2: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
-"0x55d9d9a95978: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d9999353: <T as alloc::slice::hack::ConvertVec>::to_vec (alloc/src/slice.rs:146:32)",
-"0x55d9d9f45478: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
-"0x55d9d9ee5150: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
-"0x55d9d9ee5150: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
-"0x55d9d9edee86: alloc::vec::Vec<T,A>::extend_with (src/vec/mod.rs:2492:9)",
-"0x55d9d9ee4ede: alloc::vec::Vec<T,A>::resize (src/vec/mod.rs:2358:13)",
-"0x55d9d9a712d1: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Primary>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1639:41)",
-"0x55d9d9c8e0d1: <cedar_policy_core::parser::err::ToASTError as core::fmt::Display>::fmt (src/parser/err.rs:93:29)",
-"0x55d9d9c8ba62: <cedar_policy_core::parser::err::ParseError as core::fmt::Display>::fmt (src/parser/err.rs:49:36)",
-"0x55d9d9cf1767: <&T as core::fmt::Display>::fmt (src/fmt/mod.rs:2418:62)",
-"0x55d9d9b2233e: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9aa4ef2: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9aa4ef2: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9aa4ef2: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9aa4ef2: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9acd90e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9accc27: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9c2a44e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9a6ad38: cedar_policy_core::parser::cst_to_ast::<impl cedar_policy_core::parser::node::ASTNode<core::option::Option<cedar_policy_core::parser::cst::Mult>>>::to_expr_or_special (src/parser/cst_to_ast.rs:1157:43)",
-"0x55d9d9a2d2d6: cedar_policy_validator::typecheck::Typechecker::typecheck_extension (cedar-policy-validator/src/typecheck.rs:2164:21)",
-"0x55d9d9782946: std::fs::read_to_string (std/src/fs.rs:297:5)",
-"0x55d9d9758d14: cedar_policy::integration_testing::perform_integration_test_from_json_custom (cedar-policy/src/integration_testing.rs:185:19)",
-"0x55d9d9f41723: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9f438d9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9ee3e74: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9f65e9f: regex_automata::nfa::thompson::builder::Builder::build (nfa/thompson/builder.rs:451:21)",
-"0x55d9d9efd844: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d9efd844: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d9efd844: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d9efef88: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9b3e6c8: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
-"0x55d9d9abd210: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
-"0x55d9d9abd210: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
-"0x55d9d9acb594: <alloc::vec::Vec<T,A> as core::iter::traits::collect::Extend<T>>::extend_reserve (src/vec/mod.rs:2796:9)",
-"0x55d9d9a99287: <(ExtendA,ExtendB) as core::iter::traits::collect::Extend<(A,B)>>::extend (iter/traits/collect.rs:435:13)",
-"0x55d9d999823a: cedar_policy_validator::schema::ValidatorSchema::get_entities_in_set::{{closure}} (cedar-policy-validator/src/schema.rs:1187:32)",
-"0x55d9d99900d9: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &mut F>::call_once (src/ops/function.rs:310:13)",
-"0x55d9d99e5a9a: core::option::Option<T>::map (core/src/option.rs:1099:29)",
-"0x55d9d99d8daa: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::next (iter/adapters/map.rs:103:9)",
-"0x55d9d98d84e2: alloc::str::<impl alloc::borrow::ToOwned for str>::to_owned (alloc/src/str.rs:209:46)",
-"0x55d9d989f7da: <serde_json::value::ser::Serializer as serde::ser::Serializer>::serialize_str (src/value/ser.rs:167:26)",
-"0x55d9d989f863: <serde_json::value::ser::Serializer as serde::ser::Serializer>::serialize_unit_variant (src/value/ser.rs:192:9)",
-"0x55d9d9867513: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d986a0ab: <cedar_policy_core::est::expr::_::<impl serde::de::Deserialize for cedar_policy_core::est::expr::ExtFuncCall>::deserialize::__Visitor as serde::de::Visitor>::visit_map (src/est/expr.rs:241:46)",
-"0x55d9d9849fe0: serde::__private::de::content::visit_content_map_ref (src/private/de.rs:1708:26)",
-"0x55d9d9b5d0bd: hashbrown::raw::RawTable<T,A>::new_uninitialized (src/raw/mod.rs:442:20)",
-"0x55d9d9b43695: <hashbrown::raw::RawTable<T,A> as core::clone::Clone>::clone (src/raw/mod.rs:1606:39)",
-"0x55d9d9cad936: <hashbrown::map::HashMap<K,V,S,A> as core::clone::Clone>::clone (hashbrown-0.12.3/src/map.rs:197:20)",
-"0x55d9d9b06bbd: <std::collections::hash::map::HashMap<K,V,S> as core::clone::Clone>::clone (collections/hash/map.rs:1267:22)",
-"0x55d9d9b0ccf8: cedar_policy_core::extensions::decimal::decimal_gt (src/extensions/decimal.rs:232:16)",
-"0x55d9d9bb19a8: core::ops::function::Fn::call (src/ops/function.rs:79:5)",
-"0x55d9da11fa70: regex_syntax::ast::parse::ParserI<P>::pop_group (src/ast/parse.rs:767:9)",
-"0x55d9d9a2abe8: cedar_policy_validator::typecheck::Typechecker::enforce_strict_equality (cedar-policy-validator/src/typecheck.rs:1409:21)",
-"0x55d9d991b0e1: cedar_policy_validator::typecheck::Typechecker::typecheck_binary::{{closure}}::{{closure}} (cedar-policy-validator/src/typecheck.rs:1241:29)",
-"0x55d9d9cf404c: cedar_policy_core::est::expr::Expr::eq (src/est/expr.rs:289:19)",
-"0x55d9d9b6a48d: cedar_policy_core::evaluator::RestrictedEvaluator::partial_interpret (cedar-policy-core/src/evaluator.rs:107:23)",
-"0x55d9d986479d: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9bfd72f: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce65 (src/parser/grammar.rs:38025:20)",
-"0x55d9d9bee846: cedar_policy_core::parser::text_to_cst::grammar::__parse__Policy::__reduce (src/parser/grammar.rs:35556:17)",
-"0x55d9d9cf443c: cedar_policy_core::est::expr::Expr::less (src/est/expr.rs:313:19)",
-"0x55d9d9ec6c3a: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_any (serde_json-1.0.107/src/de.rs:1421:45)",
-"0x55d9d9c86931: cedar_policy_core::est::head_constraints::<impl core::convert::TryFrom<cedar_policy_core::est::head_constraints::PrincipalConstraint> for cedar_policy_core::ast::policy::PrincipalOrResourceConstraint>::try_from (src/est/head_constraints.rs:308:83)",
-"0x55d9d98650f1: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9ebad9c: serde::de::Visitor::visit_borrowed_str (src/de/mod.rs:1508:9)",
-"0x55d9d9f67512: regex_automata::nfa::thompson::builder::Builder::start_pattern (nfa/thompson/builder.rs:630:9)",
-"0x55d9d9ef4454: regex_automata::nfa::thompson::compiler::Compiler::start_pattern (nfa/thompson/compiler.rs:1609:9)",
-"0x55d9d9a3c031: <cedar_policy_validator::types::AttributeType as core::clone::Clone>::clone (cedar-policy-validator/src/types.rs:1293:5)",
-"0x55d9d9b523e4: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d9b523e4: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d9b523e4: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d9b65978: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9b33553: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9b3e788: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
-"0x55d9d9abd4b0: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
-"0x55d9d9abd4b0: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
-"0x55d9d9abc4b0: alloc::vec::Vec<T,A>::insert (src/vec/mod.rs:1446:13)",
-"0x55d9d9cff269: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Member>>::try_from (src/est/expr.rs:1243:37)",
-"0x55d9d99c0734: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d99c0734: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d99c0734: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d99d4cd8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9866564: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9da1234be: regex_syntax::ast::parse::ParserI<P>::parse_with_comments (src/ast/parse.rs:979:21)",
-"0x55d9d9f429e1: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9f453b8: alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle (alloc/src/raw_vec.rs:289:28)",
-"0x55d9d9ee5570: alloc::raw_vec::RawVec<T,A>::reserve (alloc/src/raw_vec.rs:293:13)",
-"0x55d9d9ee5570: alloc::vec::Vec<T,A>::reserve (src/vec/mod.rs:908:18)",
-"0x55d9d9ee0ad8: alloc::vec::Vec<T,A>::extend_trusted (src/vec/mod.rs:2840:13)",
-"0x55d9d9eea028: <alloc::vec::Vec<T,A> as alloc::vec::spec_extend::SpecExtend<T,I>>::spec_extend (src/vec/spec_extend.rs:26:9)",
-"0x55d9d9ed72b2: alloc::str::<impl alloc::borrow::ToOwned for str>::to_owned (alloc/src/str.rs:209:46)",
-"0x55d9d9ed72b2: <alloc::string::String as core::convert::From<&str>>::from (alloc/src/string.rs:2650:11)",
-"0x55d9d9ed72b2: <str as alloc::string::ToString>::to_string (alloc/src/string.rs:2596:9)",
-"0x55d9d9edb8d5: regex::builders::Builder::new::{{closure}} (regex-1.9.5/src/builders.rs:66:52)",
-"0x55d9d9ed8bd4: core::iter::adapters::map::map_fold::{{closure}} (iter/adapters/map.rs:84:28)",
-"0x55d9d9fc0246: regex_automata::util::captures::GroupInfoInner::add_first_group (src/util/captures.rs:2203:9)",
-"0x55d9d988c290: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d988c290: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d988c290: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d988c290: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d988ec3b: alloc::vec::in_place_collect::<impl alloc::vec::spec_from_iter::SpecFromIter<T,I> for alloc::vec::Vec<T>>::from_iter (src/vec/in_place_collect.rs:167:20)",
-"0x55d9d9890c99: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d985b3f2: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d985b3f2: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
-"0x55d9d98102a8: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9da14ce93: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9da152f09: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9da1021a4: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9da166bab: regex_syntax::hir::interval::IntervalSet<I>::push (src/hir/interval.rs:86:9)",
-"0x55d9da187436: regex_syntax::hir::ClassUnicode::push (src/hir/mod.rs:1061:9)",
-"0x55d9d9f40913: alloc::raw_vec::RawVec<T,A>::grow_amortized (alloc/src/raw_vec.rs:404:19)",
-"0x55d9d9f43ab9: alloc::raw_vec::RawVec<T,A>::reserve_for_push (alloc/src/raw_vec.rs:302:24)",
-"0x55d9d9ee3d46: alloc::vec::Vec<T,A>::push (src/vec/mod.rs:1828:13)",
-"0x55d9d9ef5cc6: regex_automata::nfa::thompson::compiler::Utf8Compiler::add_empty (nfa/thompson/compiler.rs:1831:9)",
-"0x55d9d9ef5082: regex_automata::nfa::thompson::compiler::Utf8Compiler::new (nfa/thompson/compiler.rs:1759:9)",
-"0x55d9d993c1d7: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d993c1d7: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d993c1d7: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d993c1d7: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
-"0x55d9d994905e: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d99482d7: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d99dc42e: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d98fe08c: <alloc::collections::btree::map::BTreeMap<K,V> as core::iter::traits::collect::FromIterator<(K,V)>>::from_iter (collections/btree/map.rs:2229:34)",
-"0x55d9d9cf50ac: cedar_policy_core::est::expr::Expr::contains_all (src/est/expr.rs:394:20)",
-"0x55d9d9cfee87: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Member>>::try_from (src/est/expr.rs:1231:64)",
-"0x55d9d9b56164: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d9b56164: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d9b56164: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d9b65d98: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d98cd5ef: <serde_json::value::ser::Serializer as serde::ser::Serializer>::serialize_newtype_variant (src/value/ser.rs:214:23)",
-"0x55d9d986378c: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9d3da34: cedar_policy_core::parser::unescape::to_pattern::{{closure}} (src/parser/unescape.rs:47:18)",
-"0x55d9d99bf024: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d99bf024: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d99bf024: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d99d5048: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9f35cac: alloc::raw_vec::RawVec<T,A>::allocate_in (alloc/src/raw_vec.rs:184:45)",
-"0x55d9d9eddbe1: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d9eddbe1: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d9eddbe1: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d9eddbe1: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:54:33)",
-"0x55d9d9eea22b: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9ee9e46: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d9f166db: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d9f7b329: regex_automata::meta::regex::Builder::build_many_from_hir (src/meta/regex.rs:3551:31)",
-"0x55d9d9cf4f3d: cedar_policy_core::est::expr::Expr::mul (src/est/expr.rs:378:20)",
-"0x55d9d9f684a9: regex_automata::nfa::thompson::builder::Builder::patch (nfa/thompson/builder.rs:1163:17)",
-"0x55d9d9ef439c: regex_automata::nfa::thompson::compiler::Compiler::patch (nfa/thompson/compiler.rs:1605:9)",
-"0x55d9d9bc828b: core::clone::Clone::clone (core/src/clone.rs:123:5)",
-"0x55d9d9b5b4f3: hashbrown::raw::RawTable<T,A>::clone_from_impl (src/raw/mod.rs:1735:22)",
-"0x55d9d9b43ab4: <hashbrown::raw::RawTable<T,A> as hashbrown::raw::RawTableClone>::clone_from_spec (src/raw/mod.rs:1685:13)",
-"0x55d9d98d870c: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::validate_entity_types (cedar-policy-validator/src/rbac.rs:62:34)",
-"0x55d9d9edc2ef: core::option::Option<&T>::cloned (core/src/option.rs:1931:29)",
-"0x55d9d9edc3b4: <core::iter::adapters::cloned::Cloned<I> as core::iter::traits::iterator::Iterator>::next (iter/adapters/cloned.rs:40:9)",
-"0x55d9d9eda669: <core::iter::adapters::enumerate::Enumerate<I> as core::iter::traits::iterator::Iterator>::next (iter/adapters/enumerate.rs:47:17)",
-"0x55d9d9edcf3c: alloc::sync::Arc<[T]>::from_iter_exact (alloc/src/sync.rs:1437:30)",
-"0x55d9d9edbeb8: regex::builders::Builder::build_many_string (regex-1.9.5/src/builders.rs:112:24)",
-"0x55d9d9b53344: hashbrown::raw::RawTableInner<A>::resize_inner (src/raw/mod.rs:1426:29)",
-"0x55d9d9b53344: hashbrown::raw::RawTableInner<A>::reserve_rehash_inner (src/raw/mod.rs:1403:18)",
-"0x55d9d9b53344: hashbrown::raw::RawTable<T,A>::reserve_rehash (src/raw/mod.rs:680:24)",
-"0x55d9d9b653f8: hashbrown::raw::RawTable<T,A>::reserve (src/raw/mod.rs:646:16)",
-"0x55d9d9b0660a: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
-"0x55d9d9aeef7b: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
-"0x55d9da18a7c6: alloc::boxed::Box<T>::new (alloc/src/boxed.rs:217:9)",
-"0x55d9da18a7c6: regex_syntax::hir::Properties::class (src/hir/mod.rs:2389:20)",
-"0x55d9da183ee7: regex_syntax::hir::Hir::class (src/hir/mod.rs:349:21)",
-"0x55d9da16ba7d: <regex_syntax::hir::translate::TranslatorI as regex_syntax::ast::visitor::Visitor>::visit_post (src/hir/translate.rs:434:32)",
-"0x55d9d99f256c: <serde::__private::de::content::ContentVisitor as serde::de::Visitor>::visit_map (src/private/de.rs:508:17)",
-"0x55d9d9a01304: <&mut serde_json::de::Deserializer<R> as serde::de::Deserializer>::deserialize_any (serde_json-1.0.107/src/de.rs:1438:31)",
-"0x55d9d9bd70b6: alloc::collections::btree::map::entry::VacantEntry<K,V,A>::insert (btree/map/entry.rs:355:32)",
-"0x55d9d9a84e80: alloc::collections::btree::map::BTreeMap<K,V,A>::insert (collections/btree/map.rs:1006:17)",
-"0x55d9d988b382: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d988b382: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d988b382: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d988b382: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter_nested::SpecFromIterNested<T,I>>::from_iter (src/vec/spec_from_iter_nested.rs:32:34)",
-"0x55d9d9890fde: <alloc::vec::Vec<T> as alloc::vec::spec_from_iter::SpecFromIter<T,I>>::from_iter (src/vec/spec_from_iter.rs:33:9)",
-"0x55d9d9890c59: <alloc::vec::Vec<T> as core::iter::traits::collect::FromIterator<T>>::from_iter (src/vec/mod.rs:2712:9)",
-"0x55d9d985b212: core::iter::traits::iterator::Iterator::collect (iter/traits/iterator.rs:1896:9)",
-"0x55d9d985b212: <core::result::Result<V,E> as core::iter::traits::collect::FromIterator<core::result::Result<A,E>>>::from_iter::{{closure}} (core/src/result.rs:1969:51)",
-"0x55d9d9811c54: core::iter::adapters::try_process (iter/adapters/mod.rs:164:17)",
-"0x55d9d9c86de1: cedar_policy_core::est::head_constraints::<impl core::convert::TryFrom<cedar_policy_core::est::head_constraints::ResourceConstraint> for cedar_policy_core::ast::policy::PrincipalOrResourceConstraint>::try_from (src/est/head_constraints.rs:347:83)",
-"0x55d9d988c4f8: alloc::raw_vec::RawVec<T,A>::with_capacity_in (alloc/src/raw_vec.rs:130:9)",
-"0x55d9d988c4f8: alloc::vec::Vec<T,A>::with_capacity_in (src/vec/mod.rs:672:20)",
-"0x55d9d988c4f8: alloc::vec::Vec<T>::with_capacity (src/vec/mod.rs:479:9)",
-"0x55d9d985504a: <serde::de::impls::<impl serde::de::Deserialize for alloc::vec::Vec<T>>::deserialize::VecVisitor<T> as serde::de::Visitor>::visit_seq (src/de/impls.rs:1032:34)",
-"0x55d9d984ac50: serde::__private::de::content::visit_content_seq_ref (src/private/de.rs:1688:26)",
-"0x55d9d983d013: <serde::__private::de::content::ContentRefDeserializer<E> as serde::de::Deserializer>::deserialize_seq (src/private/de.rs:1936:40)",
-"0x55d9d988ff86: serde::de::impls::<impl serde::de::Deserialize for alloc::vec::Vec<T>>::deserialize (src/de/impls.rs:1045:9)",
-"0x55d9d9906aa1: core::iter::traits::iterator::Iterator::fold (iter/traits/iterator.rs:2482:21)",
-"0x55d9d9ebe4a9: serde_json::read::parse_escape (serde_json-1.0.107/src/read.rs:860:17)",
-"0x55d9d9979b93: <cedar_policy_validator::schema_file_format::_::<impl serde::de::Deserialize for cedar_policy_validator::schema_file_format::TypeOfAttribute>::deserialize::__Visitor as serde::de::Visitor>::visit_map (cedar-policy-validator/src/schema_file_format.rs:588:46)",
-"0x55d9d99f1d80: serde::__private::de::content::visit_content_map_ref (src/private/de.rs:1708:26)",
-"0x55d9d999826a: cedar_policy_validator::schema::ValidatorSchema::get_entities_in_set::{{closure}} (cedar-policy-validator/src/schema.rs:1187:32)",
-"0x55d9d99df0a8: core::iter::adapters::map::map_try_fold::{{closure}} (iter/adapters/map.rs:91:28)",
-"0x55d9d98de64f: core::iter::traits::iterator::Iterator::try_fold (iter/traits/iterator.rs:2304:21)",
-"0x55d9d99d912b: <core::iter::adapters::map::Map<I,F> as core::iter::traits::iterator::Iterator>::try_fold (iter/adapters/map.rs:117:9)",
-"0x55d9d9993ab6: cedar_policy_validator::schema::ValidatorNamespaceDef::parse_unqualified_name_with_namespace (cedar-policy-validator/src/schema.rs:631:24)",
-"0x55d9d9cf3f91: cedar_policy_core::est::expr::Expr::not (src/est/expr.rs:278:47)",
-"0x55d9d9cfbccf: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Unary>>::try_from (src/est/expr.rs:993:45)",
-"0x55d9d98cdc7f: <serde_json::value::ser::Serializer as serde::ser::Serializer>::serialize_newtype_variant (src/value/ser.rs:214:23)",
-"0x55d9d9862f39: cedar_policy_core::est::expr::_::<impl serde::ser::Serialize for cedar_policy_core::est::expr::ExprNoExt>::serialize (src/est/expr.rs:46:35)",
-"0x55d9d9cf458c: cedar_policy_core::est::expr::Expr::lesseq (src/est/expr.rs:321:19)",
-"0x55d9d9919ea7: cedar_policy_validator::typecheck::Typechecker::typecheck::{{closure}} (cedar-policy-validator/src/typecheck.rs:1132:33)",
-"0x55d9d99e2742: alloc::str::<impl alloc::borrow::ToOwned for str>::to_owned (alloc/src/str.rs:209:46)",
-"0x55d9d9933e1c: cedar_policy_validator::fuzzy_match::fuzzy_search (cedar-policy-validator/src/fuzzy_match.rs:30:14)",
-"0x55d9d999b08f: cedar_policy_validator::rbac::<impl cedar_policy_validator::Validator>::validate_entity_types::{{closure}} (cedar-policy-validator/src/rbac.rs:81:29)",
-"0x55d9d9a5efb3: cedar_policy_core::from_normalized_str::FromNormalizedStr::from_normalized_str (cedar-policy-core/src/from_normalized_str.rs:22:22)",
-"0x55d9d9c143e2: alloc::string::String::push (alloc/src/string.rs:1225:18)",
-"0x55d9d9d3d7b5: cedar_policy_core::parser::unescape::to_unescaped_string::{{closure}} (src/parser/unescape.rs:27:18)",
-"0x55d9d9cf52eb: cedar_policy_core::est::expr::Expr::has_attr (src/est/expr.rs:417:19)",
-"0x55d9d9cf8c03: <cedar_policy_core::est::expr::Expr as core::convert::TryFrom<cedar_policy_core::parser::cst::Relation>>::try_from (src/est/expr.rs:834:32)"
-]
-}
\ No newline at end of file
diff --git a/cedar-policy/src/frontend/is_authorized.rs b/cedar-policy/src/frontend/is_authorized.rs
index 89a2dd46a..745c9b7c2 100644
--- a/cedar-policy/src/frontend/is_authorized.rs
+++ b/cedar-policy/src/frontend/is_authorized.rs
@@ -1318,9 +1318,18 @@ mod test {
     #[test]
     fn test_authorized_fails_duplicate_entity_uid() {
         let call = r#"{
-            "principal" : "User::\"alice\"",
-            "action" : "Photo::\"view\"",
-            "resource" : "Photo::\"door\"",
+            "principal" : {
+                "type" : "User",
+                "id" : "alice"
+            },
+            "action" : {
+                "type" : "Photo",
+                "id" : "view"
+            },
+            "resource" : {
+                "type" : "Photo",
+                "id" : "door"
+            },
             "context" : {},
             "slice" : {
                 "policies" : {},
@@ -1356,9 +1365,18 @@ mod test {
     #[test]
     fn test_authorized_fails_duplicate_context_key() {
         let call = r#"{
-            "principal" : "User::\"alice\"",
-            "action" : "Photo::\"view\"",
-            "resource" : "Photo::\"door\"",
+            "principal" : {
+                "type" : "User",
+                "id" : "alice"
+            },
+            "action" : {
+                "type" : "Photo",
+                "id" : "view"
+            },
+            "resource" : {
+                "type" : "Photo",
+                "id" : "door"
+            },
             "context" : {
                 "is_authenticated": true,
                 "is_authenticated": false

From 6c8151e7605047d86bea64a9e371ec1dcde8af6f Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Wed, 25 Oct 2023 17:40:10 -0400
Subject: [PATCH 23/28] Update cedar-policy-core/src/ast/request.rs

Co-authored-by: Craig Disselkoen <cdiss@amazon.com>
---
 cedar-policy-core/src/ast/request.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cedar-policy-core/src/ast/request.rs b/cedar-policy-core/src/ast/request.rs
index 034022af7..59db1ae33 100644
--- a/cedar-policy-core/src/ast/request.rs
+++ b/cedar-policy-core/src/ast/request.rs
@@ -156,7 +156,7 @@ impl std::fmt::Display for Request {
 pub struct Context {
     /// an `Expr::Record` that qualifies as a "restricted expression"
     /// INVARIANT: This must be of the variant `Record`
-    /// TOOD: This should be refactored if possible to require this runtime invariant
+    /// TODO: This should be refactored if possible to require this runtime invariant
     #[serde(flatten)]
     context: RestrictedExpr,
 }

From d5644f56600dc7fb4ab866b93c60d4fc0c3af979 Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Wed, 25 Oct 2023 17:40:23 -0400
Subject: [PATCH 24/28] Update cedar-policy-core/src/entities/json/value.rs

Co-authored-by: Craig Disselkoen <cdiss@amazon.com>
---
 cedar-policy-core/src/entities/json/value.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cedar-policy-core/src/entities/json/value.rs b/cedar-policy-core/src/entities/json/value.rs
index f9ccb7da0..22b7e0903 100644
--- a/cedar-policy-core/src/entities/json/value.rs
+++ b/cedar-policy-core/src/entities/json/value.rs
@@ -44,7 +44,7 @@ use std::collections::{BTreeMap, HashMap, HashSet};
 pub enum CedarValueJson {
     /// The `__expr` escape has been removed, but is still reserved in order to throw meaningful errors.
     ExprEscape {
-        /// Contents, will be ignored and an error is thrown are attempting to parse this
+        /// Contents, will be ignored and an error is thrown when attempting to parse this
         __expr: SmolStr,
     },
     /// Special JSON object with single reserved "__entity" key:

From b94f1b377d5171eb2f71150b354f2d3a41485f35 Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Wed, 25 Oct 2023 17:40:33 -0400
Subject: [PATCH 25/28] Update cedar-policy-core/src/entities/json/value.rs

Co-authored-by: Craig Disselkoen <cdiss@amazon.com>
---
 cedar-policy-core/src/entities/json/value.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cedar-policy-core/src/entities/json/value.rs b/cedar-policy-core/src/entities/json/value.rs
index 22b7e0903..7106aa862 100644
--- a/cedar-policy-core/src/entities/json/value.rs
+++ b/cedar-policy-core/src/entities/json/value.rs
@@ -599,7 +599,7 @@ pub enum EntityUidJson {
         /// Contents are ignored.
         __expr: String,
     },
-    /// Explicit `__entity` escape; see notes on JSONValue::EntityEscape
+    /// Explicit `__entity` escape; see notes on `CedarValueJson::EntityEscape`
     ExplicitEntityEscape {
         /// JSON object containing the entity type and ID
         __entity: TypeAndId,

From 6d73595b659fe3026e55d9f979b924c65ed0d2fa Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Thu, 26 Oct 2023 13:57:34 -0400
Subject: [PATCH 26/28] Update cedar-policy-core/src/entities/json/value.rs

Co-authored-by: Craig Disselkoen <cdiss@amazon.com>
---
 cedar-policy-core/src/entities/json/value.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cedar-policy-core/src/entities/json/value.rs b/cedar-policy-core/src/entities/json/value.rs
index 7106aa862..7da603003 100644
--- a/cedar-policy-core/src/entities/json/value.rs
+++ b/cedar-policy-core/src/entities/json/value.rs
@@ -617,7 +617,7 @@ pub enum EntityUidJson {
 #[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
 #[serde(untagged)]
 pub enum ExtnValueJson {
-    /// Explicit `__extn` escape; see notes on JSONValue::ExtnEscape
+    /// Explicit `__extn` escape; see notes on `CedarValueJson::ExtnEscape`
     ExplicitExtnEscape {
         /// JSON object containing the extension-constructor call
         __extn: FnAndArg,

From fbbb137ed3af40ae862bdbeed8642400b5bf61ec Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Thu, 26 Oct 2023 18:10:07 +0000
Subject: [PATCH 27/28] Responding to comments

---
 cedar-policy-core/src/entities/json/err.rs   | 2 +-
 cedar-policy-core/src/entities/json/value.rs | 5 +++++
 cedar-policy/CHANGELOG.md                    | 1 -
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cedar-policy-core/src/entities/json/err.rs b/cedar-policy-core/src/entities/json/err.rs
index e19904440..67535bb2d 100644
--- a/cedar-policy-core/src/entities/json/err.rs
+++ b/cedar-policy-core/src/entities/json/err.rs
@@ -76,7 +76,7 @@ pub enum JsonDeserializationError {
         got: Box<Either<serde_json::Value, Expr>>,
     },
     /// A field that needs to be an extension value, was some other JSON value
-    #[error("{ctx}, expected an extension value, but got `{got}`")]
+    #[error("{ctx}, expected an extension value, but got `{}`", display_json_value(.got.as_ref()))]
     ExpectedExtnValue {
         /// Context of this error
         ctx: Box<JsonDeserializationErrorContext>,
diff --git a/cedar-policy-core/src/entities/json/value.rs b/cedar-policy-core/src/entities/json/value.rs
index 7da603003..0f7a21426 100644
--- a/cedar-policy-core/src/entities/json/value.rs
+++ b/cedar-policy-core/src/entities/json/value.rs
@@ -484,6 +484,9 @@ impl<'e> ValueParser<'e> {
         ctx: impl Fn() -> JsonDeserializationErrorContext + Clone,
     ) -> Result<RestrictedExpr, JsonDeserializationError> {
         match extnjson {
+            ExtnValueJson::ExplicitExprEscape { __expr } => {
+                Err(JsonDeserializationError::ExprTag(Box::new(ctx())))
+            }
             ExtnValueJson::ExplicitExtnEscape { __extn }
             | ExtnValueJson::ImplicitExtnEscape(__extn) => {
                 // reuse the same logic that parses CedarValueJson
@@ -617,6 +620,8 @@ pub enum EntityUidJson {
 #[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
 #[serde(untagged)]
 pub enum ExtnValueJson {
+    /// This was removed in 3.0 as is here to give nice error messages
+    ExplicitExprEscape { __expr: String },
     /// Explicit `__extn` escape; see notes on `CedarValueJson::ExtnEscape`
     ExplicitExtnEscape {
         /// JSON object containing the extension-constructor call
diff --git a/cedar-policy/CHANGELOG.md b/cedar-policy/CHANGELOG.md
index a4d77fdda..12743230f 100644
--- a/cedar-policy/CHANGELOG.md
+++ b/cedar-policy/CHANGELOG.md
@@ -21,7 +21,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Removed `__expr` escape from Cedar JSON formats
-<<<<<<< HEAD
 - Rename `cedar_policy_core::est::EstToAstError` to `cedar_policy_core::est::FromJsonError`.
 - Rename `cedar_policy_core::entities::JsonDeserializationError::ExtensionsError` to `cedar_policy_core::entities::JsonDeserializationError::FailedExtensionsFunctionLookup`.
 - Rename variants in `cedar_policy::SchemaError`.

From 08820de4ce7975ad2b6cc8cba5512aecf5dd0ae6 Mon Sep 17 00:00:00 2001
From: Aaron Eline <aeline+github@amazon.com>
Date: Thu, 26 Oct 2023 18:24:52 +0000
Subject: [PATCH 28/28] Added missing docs

---
 cedar-policy-core/src/entities/json/value.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/cedar-policy-core/src/entities/json/value.rs b/cedar-policy-core/src/entities/json/value.rs
index 0f7a21426..b4aa59465 100644
--- a/cedar-policy-core/src/entities/json/value.rs
+++ b/cedar-policy-core/src/entities/json/value.rs
@@ -620,8 +620,11 @@ pub enum EntityUidJson {
 #[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
 #[serde(untagged)]
 pub enum ExtnValueJson {
-    /// This was removed in 3.0 as is here to give nice error messages
-    ExplicitExprEscape { __expr: String },
+    /// This was removed in 3.0 and is here to give nice error messages
+    ExplicitExprEscape {
+        /// The contents of the `__expr`` escape
+        __expr: String,
+    },
     /// Explicit `__extn` escape; see notes on `CedarValueJson::ExtnEscape`
     ExplicitExtnEscape {
         /// JSON object containing the extension-constructor call