diff --git a/README.md b/README.md
index 01bf56a..fa38ecd 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,31 @@
 # Zukyc
 
 This is an example app using POD & GPC.
-For details about POD & GPC, see [this doc](https://0xparc.notion.site/POD-GPC-Development-6547d2e60c184ad0984f933672246e0b#25ea9b2a90464663b36486f5e6064106).
+For details about POD & GPC, see [this doc](https://zupass.org/pod).
 
 ## Example use case
 
-This example app demonstrated an end to end use case for POD & GPC. The story goes, Gerry would like to borrow some money, so he goes to ZooLender. The ZooLender wants him to prove that he has a valid ID, and has monthly income over $X amount, among other things. Gerry doesn't know ZooLender well, so he doesn't feel comfortable to send him his ID and paystubs. So they decide to use ZooKyc (in `gpc-prover-client`).
+This example app demonstrates an end to end use case for POD & GPC. The story goes, Gerry the giraffe would like to borrow some money, so he goes to [ZooLender](https://zukyc-gpc-verifier.vercel.app). ZooLender wants him to prove that he has a valid ID, and has annual income over $20,000 amount among other things. Gerry doesn't know ZooLender well. He doesn't feel comfortable to send him his ID and paystubs. So they decide to use [ZooKyc](https://zukyc-gpc-prover-client.vercel.app) (KYC stands for [Know Your Customer](https://en.wikipedia.org/wiki/Know_your_customer)).
 
-To use ZooKyc, Gerry first goes to ZooGov (in `pod-issuer-client/app/gov`, `pod-issuer-server`), and ZooGov issues him an ID POD signed by ZooGov. Gerry then goes to ZooDeel (in `pod-issuer-client/app/deel`, `pod-issuer-server`), and ZooDeel issues him a Paystub POD signed by ZooDeel. All the PODs have a owner field with Gerry's Semaphore public identity.
+ZooKyc manages the user's identity (e.g. [Semaphore identity](https://docs.semaphore.pse.dev/V3/guides/identities)), PODs, and generate proofs upon requests.
 
-Gerry then goes to ZooKyc with his ID POD, Paystub POD, and Semaphore identity. ZooKyc creates a ZK proof that Gerry has a valid ID, and has monthly income over $X amount, without leaking other information. ZooKyc is a browser only app. In fact, Gerry can take the code from ZooKyc and run it himself.
-Now with the proof generated by ZooKyc, Gerry goes back to ZooLender (in `gpc-verifier-client`). ZooLender verifies the proof, and lends Gerry the money.
+To use ZooKyc, Gerry first goes to [ZooGov](https://zukyc-issuer-client.vercel.app/gov) (a govenment website), and ZooGov issues him a govenment ID POD signed by ZooGov. Gerry then goes to [ZooDeel](https://zukyc-issuer-client.vercel.app/deel) (a payroll service provider website), and ZooDeel issues him a paystub POD signed by ZooDeel. All the PODs have a owner field with Gerry's Semaphore public identity.
+
+ZooLender provides Gerry a [proof request](https://github.com/proofcarryingdata/zukyc/blob/main/apps/gpc-verifier/app/hooks/useProofRequest.ts) which specifics what he wants Gerry to prove about the govenment ID POD and the paystub POD.
+
+Gerry then goes to ZooKyc with his ID POD, Paystub POD, and the proof request from ZooLender. ZooKyc creates a zero knowledge proof that Gerry has a valid ID, and has annual income over $20,000 amount (among other things) without leaking other information. ZooKyc is a browser only app. In fact, Gerry can take the code from ZooKyc and run it himself.
+
+Now with the proof generated by ZooKyc, Gerry goes back to ZooLender. ZooLender verifies the proof, and lends Gerry the money.
+
+You can walk through Gerry's experience using the deployed app links below.
+
+## Deployed app
+
+- [ZooLender](https://zukyc-gpc-verifier.vercel.app): a lending website. To apply for a loan, the user can use ZooKyc to generate a proof with the proof request ZooLender provides. ZooLender will verify the proof, and decide whether to lend the user the money.
+- [ZooKyc](https://zukyc-gpc-prover-client.vercel.app): manages the user's identity, PODs, and generate proofs upon requests.
+- [ZooGov](https://zukyc-issuer-client.vercel.app/gov): a govenment website. It can issue govenment ID POD.
+- [ZooDeel](https://zukyc-issuer-client.vercel.app/deel): a payroll service provider website. It can issue paystub POD.
+- [ZooAdmin](https://zukyc-issuer-client.vercel.app/debug): for debugging purposes. It allows you to generate govenment ID POD and paystub POD with the information you provide.
 
 ## Example code
 
@@ -21,46 +36,65 @@ Now with the proof generated by ZooKyc, Gerry goes back to ZooLender (in `gpc-ve
 
 ## What's inside?
 
-This Turborepo includes the following apps:
+This Turborepo includes the following apps (inside the `apps/` folder):
 
-### Apps
+### POD issuers (ZooGov, ZooDeel, ZooAdmin)
 
-- `pod-issuer-client`: http://localhost:3000, deployed at https://zukyc-issuer-client.vercel.app. It includes:
-  - [ZooGov](https://zukyc-issuer-client.vercel.app/gov): Govenment ID POD issuer.
-  - [ZooDeel](https://zukyc-issuer-client.vercel.app/deel): Paystub POD issuer.
-  - [ZooAdmin](https://zukyc-issuer-client.vercel.app/debug): For debugging purposes, it allows you to generate ID PODs and Paystub PODs with the information you provide.
-- `pod-issuer-server`: http://localhost:8080, deployed at https://zukyc-issuer-server.vercel.app.
-  - This is the Express server for pod-issuer-client. It provides the APIs to issues PODs to the user.
-- `gpc-prover-client` (ZooKyc): http://localhost:3002, deployed at https://zukyc-gpc-prover-client.vercel.app.
-  - This is a Next.js app which uses the GPC library to generate ZK proofs. GPCs can prove properties of one POD or serveral PODs together. PODs can be proven to be owned by the prover, using their Semaphore identity.
-- `gpc-verifier` (ZooLender): http://localhost:3001, deployed at https://zukyc-gpc-verifier.vercel.app.
-  - This is a Next.js app which uses the GPC library to verify ZK proofs.
-  - I didn't build a server side app for this, because the verification code would be similar. But in reality, the proof needs to be verified on the server side too.
+#### `pod-issuer-client`
 
-### Turborepo
+- http://localhost:3000, deployed at https://zukyc-issuer-client.vercel.app.
+- This is the frontend of POD issuers (ZooGov, ZooDeel and ZooAdmin).
+- It includes:
+  - `app/gov`: ZooGov
+  - `app/deel`: ZooDeel
+  - `app/debug`: ZooAdmin
+- In real world, those would be three independent websites.
 
-This project was bootstrapped with [Turborepo starter](https://github.com/vercel/turbo/tree/main/examples/basic) by running the following command:
+#### `pod-issuer-server`
 
-```sh
-npx create-turbo@latest -e with-yarn
-```
+- http://localhost:8080, deployed at https://zukyc-issuer-server.vercel.app.
+- This is the server for pod-issuer-client. It provides the server-side APIs to issues PODs to the user.
+- It includes:
+  - `routes/gov.ts`: server-side APIs for ZooGov
+  - `routes/deel.ts`: server-side APIs for ZooDeel
+  - `routes/debug.ts`: server-side APIs for ZooAdmin
+- Similarly, in real world, those would be three independent server-side applications issuing PODs independently.
+- A server is needed because in real world, the server would have a user database; and the server would hold a signing key for issuing PODs.
 
-## Getting started
+### ZooKyc
 
-### Build
+#### `gpc-prover-client`
 
-To build all apps and packages, run the following command:
+- http://localhost:3002, deployed at https://zukyc-gpc-prover-client.vercel.app.
+- This is a frontend app which manages Semaphore identity, PODs, and uses the GPC library to generate ZK proofs based on proof requests.
 
-```
-cd zukyc
-yarn build
-```
+### ZooLender
+
+#### `gpc-verifier`
+
+- http://localhost:3001, deployed at https://zukyc-gpc-verifier.vercel.app.
+- This is a frontend app which provides the proof request, and uses the GPC library to verify ZK proofs.
+- In this demo, the server side code is not included, because the proof verification code would be similar. But in real world, the proof needs to be verified on the server side too.
+
+## Local development
 
-### Develop
+### Running the project
 
-To develop all apps and packages, run the following command:
+In the root of this project, execute the following commands locally.
 
 ```
-cd zukyc
+# installs dependencies for all apps and packages in this repository
+yarn
+
+# this will copy all the environment variable file .env.example into an adjacent file .env or .env.local
+yarn localenv
+
+# this will run a docker image for Vercel KV store (a durable Redis database) local development
+# you need to install docker first and make sure it is running, see this: https://docs.docker.com/engine/install/
+# the Vercel KV store is currently used by `pod-issuer-server` `gov` and `deel` routes, as well as
+# `gpc-verifier` for storing nullifier hash.
+yarn localdb
+
+# starts all the applications contained in the `/apps` folder of the repository
 yarn dev
 ```
diff --git a/apps/gpc-prover-client/.env.example b/apps/gpc-prover-client/.env.example
index 63ac31d..9127bd0 100644
--- a/apps/gpc-prover-client/.env.example
+++ b/apps/gpc-prover-client/.env.example
@@ -1,2 +1,3 @@
-NEXT_PUBLIC_POD_ISSUER_CLIENT_URL=
-NEXT_PUBLIC_GPC_VERIFIER_URL=
+# URLs to other zukyc applications
+NEXT_PUBLIC_POD_ISSUER_CLIENT_URL=http://localhost:3000
+NEXT_PUBLIC_GPC_VERIFIER_URL=http://localhost:3001
diff --git a/apps/gpc-prover-client/README.md b/apps/gpc-prover-client/README.md
deleted file mode 100644
index 3d7b63a..0000000
--- a/apps/gpc-prover-client/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-## Getting Started
-
-First, run the development server:
-
-```bash
-yarn dev
-```
-
-Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
-
-You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
-
-To create [API routes](https://nextjs.org/docs/app/building-your-application/routing/router-handlers) add an `api/` directory to the `app/` directory with a `route.ts` file. For individual endpoints, create a subfolder in the `api` directory, like `api/hello/route.ts` would map to [http://localhost:3000/api/hello](http://localhost:3000/api/hello).
-
-## Learn More
-
-To learn more about Next.js, take a look at the following resources:
-
-- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
-- [Learn Next.js](https://nextjs.org/learn/foundations/about-nextjs) - an interactive Next.js tutorial.
-
-You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!
-
-## Deploy on Vercel
-
-The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_source=github.com&utm_medium=referral&utm_campaign=turborepo-readme) from the creators of Next.js.
-
-Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.
diff --git a/apps/gpc-prover-client/app/components/PODs.tsx b/apps/gpc-prover-client/app/components/PODs.tsx
index 103a67e..1ab9b49 100644
--- a/apps/gpc-prover-client/app/components/PODs.tsx
+++ b/apps/gpc-prover-client/app/components/PODs.tsx
@@ -25,6 +25,7 @@ const PODs = () => {
           value={idPODStr}
           placeholder="Past your ID POD here!"
           onChange={(e) => setIdPODStr(e.target.value.trim())}
+          id="id-pod"
         />
       </div>
 
@@ -44,6 +45,7 @@ const PODs = () => {
           value={paystubPODStr}
           placeholder="Past your Paystub POD here!"
           onChange={(e) => setPaystubPODStr(e.target.value.trim())}
+          id="paystub-pod"
         />
       </div>
     </div>
diff --git a/apps/gpc-prover-client/app/components/SemaphoreID.tsx b/apps/gpc-prover-client/app/components/SemaphoreID.tsx
index 3030d84..c4023bf 100644
--- a/apps/gpc-prover-client/app/components/SemaphoreID.tsx
+++ b/apps/gpc-prover-client/app/components/SemaphoreID.tsx
@@ -39,6 +39,7 @@ const SemaphoreID = () => {
           readOnly
           rows={1}
           value={identity?.commitment.toString()}
+          id="identity-commitment"
         />
       </div>
 
@@ -62,6 +63,7 @@ const SemaphoreID = () => {
           readOnly
           rows={1}
           value={identity?.toString()}
+          id="identity"
         />
       </div>
     </div>
diff --git a/apps/gpc-prover-client/app/page.tsx b/apps/gpc-prover-client/app/page.tsx
index ce7ba9d..e80edab 100644
--- a/apps/gpc-prover-client/app/page.tsx
+++ b/apps/gpc-prover-client/app/page.tsx
@@ -9,26 +9,27 @@ import PODs from "@/components/PODs";
 import usePODs from "@/hooks/usePODs";
 
 export default function Prover() {
-  const [requestStr, setRequestStr] = useState("");
-  const [proofResult, setProofResult] = useState("");
+  const [proofRequestStr, setProofRequestStr] = useState("");
+  const [proofResult, setProofResult] = useState<string | null>(null);
 
   const identity = useIdentity();
   const { idPODStr, paystubPODStr } = usePODs();
 
-  const generate = useCallback(() => {
+  const generate = async () => {
     if (!identity) {
       alert("Identity cannot be empty!");
       return;
     }
 
-    generateProof(
+    const proof = await generateProof(
       identity,
       idPODStr,
       paystubPODStr,
-      requestStr,
-      setProofResult
+      proofRequestStr
     );
-  }, [identity, idPODStr, paystubPODStr, requestStr]);
+
+    setProofResult(proof);
+  };
 
   const reset = useCallback(() => {
     if (
@@ -69,9 +70,10 @@ export default function Prover() {
         </div>
         <textarea
           rows={20}
-          value={requestStr}
+          value={proofRequestStr}
           placeholder="Past your proof request here!"
-          onChange={(e) => setRequestStr(e.target.value.trim())}
+          onChange={(e) => setProofRequestStr(e.target.value.trim())}
+          id="proof-request"
         />
         <div>
           <button onClick={generate}>Generate Proof</button>
@@ -95,6 +97,7 @@ export default function Prover() {
               readOnly
               rows={30}
               value={proofResult}
+              id="proof-result"
             />
           </div>
         )}
diff --git a/apps/gpc-prover-client/app/util/generateProof.ts b/apps/gpc-prover-client/app/util/generateProof.ts
index 2ecf52a..000dcc5 100644
--- a/apps/gpc-prover-client/app/util/generateProof.ts
+++ b/apps/gpc-prover-client/app/util/generateProof.ts
@@ -1,9 +1,76 @@
-import { Dispatch } from "react";
 import JSONBig from "json-bigint";
-import { POD } from "@pcd/pod";
-import { GPCProofInputs, gpcArtifactDownloadURL, gpcProve } from "@pcd/gpc";
+import { POD, PODValue } from "@pcd/pod";
+import {
+  gpcArtifactDownloadURL,
+  gpcProve,
+  GPCProofInputs,
+  GPCProofConfig,
+  PODMembershipLists
+} from "@pcd/gpc";
 import { Identity } from "@semaphore-protocol/identity";
 
+// Proof request specifies what we want to prove, which can be sent to the prover
+// to request a proof.
+export type ProofRequest = {
+  proofConfig: GPCProofConfig;
+  membershipLists: PODMembershipLists;
+  externalNullifier: PODValue;
+  watermark: PODValue;
+};
+
+const prove = async (
+  identity: Identity,
+  idPOD: POD,
+  paystubPOD: POD,
+  proofRequest: ProofRequest
+) => {
+  // https://docs.pcd.team/types/_pcd_gpc.GPCProofInputs.html
+  // To generate a proof we need to pair the config with a set of inputs, including
+  // the PODs to prove about. Inputs can also enable extra security features of the proof.
+  const proofInputs: GPCProofInputs = {
+    pods: {
+      // The name "govID" here matches this POD with the config.
+      govID: idPOD,
+      // The name "paystub" here matches this POD with the config.
+      paystub: paystubPOD
+    },
+    owner: {
+      // The user's private identity info. It's never revealed in the
+      // proof, but used to prove the correctness of the `owner` entry as
+      // specified in the config.
+      // Note: we have to use semaphoreV3, e.g. "@semaphore-protocol/identity": "^3.15.2",
+      // the most recent version V4 changed the semphoreIdentity definition.
+      semaphoreV3: identity,
+      // We can optionally ask to generate a nullifier, which is tied to the user's
+      // identity and to the external nullifier value here. This can be used
+      // to identify duplicate proofs without de-anonymizing.
+      // Here, We don't want the same user to get more than one loan.
+      externalNullifier: proofRequest.externalNullifier
+    },
+    // Named lists of values for each list (non-)membership check.
+    // The names assigned here are ussed to link these lists to their (non-)membership
+    // checks in GPCProofEntryConfig.
+    // In our case, this is for the isNotMemberOf check on govID POD idNumber entry in
+    // our proofConfig.
+    membershipLists: proofRequest.membershipLists,
+    // If watermark is set, the given value will be included in the resulting
+    // proof. This allows identifying a proof as tied to a specific use case, to
+    // avoid reuse. Unlike a nullifier, this watermark is not cryptographically
+    // tied to any specific input data. When the proof is verified, the watermark is also
+    // verified (as a public input).
+    watermark: proofRequest.watermark
+  };
+
+  // We need a URL for downloading GPC artifacts depending on the configuration in the browser.
+  // https://docs.pcd.team/functions/_pcd_gpc.gpcArtifactDownloadURL.html
+  const artifactsURL = gpcArtifactDownloadURL("unpkg", "prod", undefined);
+  console.log("download artifacts from", artifactsURL);
+
+  // This is the core functionality which generates the proof.
+  // https://docs.pcd.team/functions/_pcd_gpc.gpcProve.html
+  return await gpcProve(proofRequest.proofConfig, proofInputs, artifactsURL);
+};
+
 const jsonBigSerializer = JSONBig({
   useNativeBigInt: true,
   alwaysParseAsBig: true
@@ -13,98 +80,40 @@ export const generateProof = async (
   identity: Identity,
   serializedIDPOD: string,
   serializedPaystubPOD: string,
-  serializedProofRequest: string,
-  setProofResult: Dispatch<string>
+  serializedProofRequest: string
 ) => {
   try {
-    if (!identity) {
-      throw new Error("Identity field cannot be empty!");
-    }
-
     if (!serializedIDPOD) {
       throw new Error("ID POD field cannot be empty!");
     }
-
     if (!serializedPaystubPOD) {
       throw new Error("Paystub POD field cannot be empty!");
     }
-
     if (!serializedProofRequest) {
       throw new Error("Proof quest field cannot be empty!");
     }
 
     const idPOD = POD.deserialize(serializedIDPOD);
-    const paytsubPOD = POD.deserialize(serializedPaystubPOD);
+    const paystubPOD = POD.deserialize(serializedPaystubPOD);
 
     // You can also use deserializeGPCProofConfig to deserialize the proofConfig,
     // and underlyingly it uses json-bitint like what we are doing here.
     // https://docs.pcd.team/functions/_pcd_gpc.deserializeGPCProofConfig.html
     const proofRequest = jsonBigSerializer.parse(serializedProofRequest);
-    const proofConfig = proofRequest.proofConfig;
-    const externalNullifier = proofRequest.externalNullifier || "ZooKyc";
-    const watermark = proofRequest.watermark || new Date().toISOString();
-
-    // https://docs.pcd.team/types/_pcd_gpc.GPCProofInputs.html
-    // To generate a proof we need to pair the config with a set of inputs, including
-    // the PODs to prove about. Inputs can also enable extra security features of the proof.
-    const proofInputs: GPCProofInputs = {
-      pods: {
-        // The name "govID" here matches this POD with the config.
-        govID: idPOD,
-        // The name "paystub" here matches this POD with the config.
-        paystub: paytsubPOD
-      },
-      owner: {
-        // The user's private identity info. It's never revealed in the
-        // proof, but used to prove the correctness of the `owner` entry as
-        // specified in the config.
-        // Note: we have to use semaphoreV3, e.g. "@semaphore-protocol/identity": "^3.15.2",
-        // the most recent version V4 changed the semphoreIdentity definition.
-        semaphoreV3: identity,
-        // We can optionally ask to generate a nullifier, which is tied to the user's
-        // identity and to the external nullifier value here. This can be used
-        // to identify duplicate proofs without de-anonymizing.
-        // Here, We don't want the same user to get more than one loan.
-        externalNullifier: { type: "string", value: externalNullifier }
-      },
-      membershipLists: proofRequest.membershipLists,
-      // If watermark is set, the given value will be included in the resulting
-      // proof. This allows identifying a proof as tied to a specific use case, to
-      // avoid reuse. Unlike a nullifier, this watermark is not cryptographically
-      // tied to any specific input data. When the proof is verified, the watermark is also
-      // verified (as a public input).
-      watermark: { type: "string", value: watermark }
-    };
-
-    const artifactsURL = gpcArtifactDownloadURL("unpkg", "prod", undefined);
-    console.log("download artifacts from", artifactsURL);
 
-    // https://docs.pcd.team/functions/_pcd_gpc.gpcProve.html
-    const { proof, boundConfig, revealedClaims } = await gpcProve(
-      proofConfig,
-      proofInputs,
-      artifactsURL
-    );
+    const proofResult = await prove(identity, idPOD, paystubPOD, proofRequest);
 
     // You can also use serializeGPCBoundConfig to serialize the boundConfig,
     // and use serializeGPCRevealedClaims to serialize the revealedClaims,
     // and underlyingly they use json-bigint like we do here.
     // https://docs.pcd.team/functions/_pcd_gpc.serializeGPCBoundConfig.html
     // https://docs.pcd.team/functions/_pcd_gpc.serializeGPCRevealedClaims.html
-    const serializedProof = JSONBig.stringify(
-      {
-        boundConfig,
-        proof,
-        revealedClaims
-      },
-      null,
-      2
-    );
-    setProofResult(serializedProof);
+    return JSONBig.stringify(proofResult, null, 2);
   } catch (e) {
-    alert("Error generate proof");
+    alert("Error generating proof");
     console.log(e);
   }
+  return null;
 };
 
 export default generateProof;
diff --git a/apps/gpc-prover-client/package.json b/apps/gpc-prover-client/package.json
index b72c9b3..4060a80 100644
--- a/apps/gpc-prover-client/package.json
+++ b/apps/gpc-prover-client/package.json
@@ -6,7 +6,8 @@
     "dev": "next dev -p 3002",
     "build": "next build",
     "start": "next start",
-    "lint": "eslint . --max-warnings 0"
+    "lint": "eslint . --max-warnings 0",
+    "localenv": "cp .env.example .env.local"
   },
   "dependencies": {
     "@pcd/gpc": "^0.1.0",
diff --git a/apps/gpc-prover-client/public/circles.svg b/apps/gpc-prover-client/public/circles.svg
deleted file mode 100644
index 6533be5..0000000
--- a/apps/gpc-prover-client/public/circles.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 100 100" width="614" height="614">
-  <defs xmlns="http://www.w3.org/2000/svg">
-		<radialGradient id="radial" gradientUnits="userSpaceOnUse">
-			<stop offset="0" stop-color="#fff"></stop>
-			<stop offset="60%" stop-color="#fff" stop-opacity="0"></stop>
-		</radialGradient>
-	</defs>
-	<circle cx="50" cy="50" r="25" stroke-width=".2" style="fill:none; stroke:rgba(255,255,255,.1);">
-		<animate attributeName="opacity" values="1;0.1;0.1;1" dur="3s" begin="0.2s" repeatCount="indefinite"></animate>
-	</circle>
-  <circle cx="50" cy="50" r="25" stroke-width=".2" style="fill:url(#radial); fill-opacity:.1;">
-		<animate attributeName="opacity" values="1;0.5;0.5;1" dur="3s" repeatCount="indefinite"></animate>
-	</circle><circle cx="50" cy="50" r="45" stroke-width=".2" style="fill:none; stroke:rgba(255,255,255,.1);">
-		<animate attributeName="opacity" values="1;0.1;0.1;1" dur="3s" begin="0.4s" repeatCount="indefinite"></animate>
-	</circle>
-</svg>
\ No newline at end of file
diff --git a/apps/gpc-prover-client/public/next.svg b/apps/gpc-prover-client/public/next.svg
deleted file mode 100644
index 5174b28..0000000
--- a/apps/gpc-prover-client/public/next.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>
\ No newline at end of file
diff --git a/apps/gpc-prover-client/public/turborepo.svg b/apps/gpc-prover-client/public/turborepo.svg
deleted file mode 100644
index 2f9aa1f..0000000
--- a/apps/gpc-prover-client/public/turborepo.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<svg width="104" height="104" viewBox="0 0 104 104" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_1_17)">
-<path d="M26.0192 7C42.0962 -2.28203 61.9038 -2.28203 77.9808 7C94.0577 16.282 103.962 33.4359 103.962 52C103.962 70.5641 94.0577 87.718 77.9808 97C61.9038 106.282 42.0962 106.282 26.0192 97C9.94229 87.718 0.038475 70.5641 0.038475 52C0.038475 33.4359 9.94229 16.282 26.0192 7Z" fill="black" fill-opacity="0.64"/>
-<path d="M26.0192 7C42.0962 -2.28203 61.9038 -2.28203 77.9808 7C94.0577 16.282 103.962 33.4359 103.962 52C103.962 70.5641 94.0577 87.718 77.9808 97C61.9038 106.282 42.0962 106.282 26.0192 97C9.94229 87.718 0.038475 70.5641 0.038475 52C0.038475 33.4359 9.94229 16.282 26.0192 7Z" fill="url(#paint0_linear_1_17)" fill-opacity="0.15"/>
-<path d="M26.0192 7C42.0962 -2.28203 61.9038 -2.28203 77.9808 7C94.0577 16.282 103.962 33.4359 103.962 52C103.962 70.5641 94.0577 87.718 77.9808 97C61.9038 106.282 42.0962 106.282 26.0192 97C9.94229 87.718 0.038475 70.5641 0.038475 52C0.038475 33.4359 9.94229 16.282 26.0192 7Z" fill="black" fill-opacity="0.5"/>
-<path d="M0.538475 52C0.538475 33.6146 10.347 16.6257 26.2692 7.43301C42.1915 -1.7597 61.8085 -1.7597 77.7308 7.43301C93.653 16.6257 103.462 33.6146 103.462 52C103.462 70.3854 93.653 87.3743 77.7308 96.567C61.8085 105.76 42.1915 105.76 26.2692 96.567C10.347 87.3743 0.538475 70.3854 0.538475 52Z" stroke="url(#paint1_radial_1_17)" stroke-opacity="0.15"/>
-<path d="M0.538475 52C0.538475 33.6146 10.347 16.6257 26.2692 7.43301C42.1915 -1.7597 61.8085 -1.7597 77.7308 7.43301C93.653 16.6257 103.462 33.6146 103.462 52C103.462 70.3854 93.653 87.3743 77.7308 96.567C61.8085 105.76 42.1915 105.76 26.2692 96.567C10.347 87.3743 0.538475 70.3854 0.538475 52Z" stroke="url(#paint2_linear_1_17)" stroke-opacity="0.5"/>
-<path d="M51.8878 37.9262C44.1892 37.9262 37.9258 44.1896 37.9258 51.8882C37.9258 59.5868 44.1892 65.8502 51.8878 65.8502C59.5864 65.8502 65.8498 59.5868 65.8498 51.8882C65.8498 44.1896 59.5864 37.9262 51.8878 37.9262ZM51.8878 59.1136C47.8968 59.1136 44.6624 55.8792 44.6624 51.8882C44.6624 47.8972 47.8968 44.6628 51.8878 44.6628C55.8788 44.6628 59.1132 47.8972 59.1132 51.8882C59.1132 55.8792 55.8788 59.1136 51.8878 59.1136Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M53.0581 35.633V30.42C64.3889 31.0258 73.3901 40.4066 73.3901 51.8882C73.3901 63.3698 64.3889 72.748 53.0581 73.3564V68.1434C61.5029 67.5402 68.1901 60.4838 68.1901 51.8882C68.1901 43.2926 61.5029 36.2362 53.0581 35.633ZM39.5745 62.5482C37.3359 59.9638 35.8929 56.6722 35.6355 53.0582H30.4199C30.6903 58.1152 32.7131 62.7042 35.8825 66.2376L39.5719 62.5482H39.5745ZM50.7182 73.3564V68.1434C47.1016 67.886 43.81 66.4456 41.2256 64.2044L37.5362 67.8938C41.0722 71.0658 45.6612 73.086 50.7156 73.3564H50.7182Z" fill="url(#paint3_linear_1_17)"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_1_17" x1="52" y1="-8" x2="52" y2="112" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3286F1"/>
-<stop offset="1" stop-color="#C43AC4"/>
-</linearGradient>
-<radialGradient id="paint1_radial_1_17" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(52 -7.99999) rotate(90) scale(154.286 154.286)">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="white"/>
-</radialGradient>
-<linearGradient id="paint2_linear_1_17" x1="-8" y1="-8" x2="18.25" y2="40.75" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint3_linear_1_17" x1="53.9007" y1="33.4389" x2="32.7679" y2="54.5717" gradientUnits="userSpaceOnUse">
-<stop stop-color="#0096FF"/>
-<stop offset="1" stop-color="#FF1E56"/>
-</linearGradient>
-<clipPath id="clip0_1_17">
-<rect width="104" height="104" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/apps/gpc-prover-client/public/vercel.svg b/apps/gpc-prover-client/public/vercel.svg
deleted file mode 100644
index d2f8422..0000000
--- a/apps/gpc-prover-client/public/vercel.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 283 64"><path fill="black" d="M141 16c-11 0-19 7-19 18s9 18 20 18c7 0 13-3 16-7l-7-5c-2 3-6 4-9 4-5 0-9-3-10-7h28v-3c0-11-8-18-19-18zm-9 15c1-4 4-7 9-7s8 3 9 7h-18zm117-15c-11 0-19 7-19 18s9 18 20 18c6 0 12-3 16-7l-8-5c-2 3-5 4-8 4-5 0-9-3-11-7h28l1-3c0-11-8-18-19-18zm-10 15c2-4 5-7 10-7s8 3 9 7h-19zm-39 3c0 6 4 10 10 10 4 0 7-2 9-5l8 5c-3 5-9 8-17 8-11 0-19-7-19-18s8-18 19-18c8 0 14 3 17 8l-8 5c-2-3-5-5-9-5-6 0-10 4-10 10zm83-29v46h-9V5h9zM37 0l37 64H0L37 0zm92 5-27 48L74 5h10l18 30 17-30h10zm59 12v10l-3-1c-6 0-10 4-10 10v15h-9V17h9v9c0-5 6-9 13-9z"/></svg>
\ No newline at end of file
diff --git a/apps/gpc-verifier/.env.example b/apps/gpc-verifier/.env.example
index 0b18398..7c08fcf 100644
--- a/apps/gpc-verifier/.env.example
+++ b/apps/gpc-verifier/.env.example
@@ -1,5 +1,18 @@
-NEXT_PUBLIC_GPC_PROVER_CLIENT_URL=
-NEXT_PUBLIC_GOV_EDDSA_PUBLIC_KEY=
-NEXT_PUBLIC_DEEL_EDDSA_PUBLIC_KEY=
-KV_REST_API_URL=
-KV_REST_API_TOKEN=
+# URLs to other Zukyc applications
+NEXT_PUBLIC_GPC_PROVER_CLIENT_URL=http://localhost:3002
+
+# The public keys corresponding to the private keys "GOV_EDDSA_PRIVATE_KEY" and
+# "DEEL_EDDSA_PRIVATE_KEY" specified in `pod-issuer-server/.env.example`.
+# The private keys are used for signing PODs and check the signature.
+# We have a script in `scripts/eddsaKeyGen.js`, you can replace the
+# "EDDSA_PRIVATE_KEY" variable with your own private key, and run
+# "node ./scripts/eddsaKeyGen.js" to generate the corresponding public key.
+NEXT_PUBLIC_GOV_EDDSA_PUBLIC_KEY=NnGAciO/OIz+R5aYBlTUb+QwCgD5xossqB8gZtKLOxs
+NEXT_PUBLIC_DEEL_EDDSA_PUBLIC_KEY=HLVAjjMzH0LVzBxt7dbEvoGjRNEzonnw/fUnxqLikx8
+
+# The REST API URL and REST API token to connect to the local Vercel KV instance
+# See this: https://github.com/vercel/storage/issues/281
+# You can also create a KV database on Vercel, and get the environment variables by
+# following this guide: https://vercel.com/docs/storage/vercel-kv/rest-api
+KV_REST_API_URL=http://localhost:8079
+KV_REST_API_TOKEN=example_token
diff --git a/apps/gpc-verifier/README.md b/apps/gpc-verifier/README.md
deleted file mode 100644
index 3d7b63a..0000000
--- a/apps/gpc-verifier/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-## Getting Started
-
-First, run the development server:
-
-```bash
-yarn dev
-```
-
-Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
-
-You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
-
-To create [API routes](https://nextjs.org/docs/app/building-your-application/routing/router-handlers) add an `api/` directory to the `app/` directory with a `route.ts` file. For individual endpoints, create a subfolder in the `api` directory, like `api/hello/route.ts` would map to [http://localhost:3000/api/hello](http://localhost:3000/api/hello).
-
-## Learn More
-
-To learn more about Next.js, take a look at the following resources:
-
-- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
-- [Learn Next.js](https://nextjs.org/learn/foundations/about-nextjs) - an interactive Next.js tutorial.
-
-You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!
-
-## Deploy on Vercel
-
-The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_source=github.com&utm_medium=referral&utm_campaign=turborepo-readme) from the creators of Next.js.
-
-Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.
diff --git a/apps/gpc-verifier/app/components/VerifyProof.tsx b/apps/gpc-verifier/app/components/VerifyProof.tsx
index 0ec4ae0..ee68c50 100644
--- a/apps/gpc-verifier/app/components/VerifyProof.tsx
+++ b/apps/gpc-verifier/app/components/VerifyProof.tsx
@@ -1,24 +1,26 @@
-import { useCallback, useState } from "react";
-import { useProofRequest } from "@/hooks/useProofRequest";
+import { useState } from "react";
 import verifyProof from "@/util/verifyProof";
+import { useProofRequest } from "@/hooks/useProofRequest";
 
 const VerifyProof = () => {
   const [proofStr, setProofStr] = useState("");
   const [verified, setVerified] = useState(false);
 
-  const { boundConfig, membershipLists, externalNullifier, watermark } =
-    useProofRequest();
+  const { proofRequest, proofRequestBoundConfig } = useProofRequest();
 
-  const verify = useCallback(() => {
-    verifyProof(
-      boundConfig,
-      membershipLists,
-      externalNullifier,
-      watermark,
-      proofStr,
-      setVerified
-    );
-  }, [boundConfig, membershipLists, externalNullifier, watermark, proofStr]);
+  const verify = async () => {
+    try {
+      const valid = await verifyProof(
+        proofRequest,
+        proofRequestBoundConfig,
+        proofStr
+      );
+      setVerified(valid);
+    } catch (e) {
+      alert(e);
+      setVerified(false);
+    }
+  };
 
   return (
     <>
@@ -29,6 +31,7 @@ const VerifyProof = () => {
           value={proofStr}
           placeholder="Past your proof here!"
           onChange={(e) => setProofStr(e.target.value.trim())}
+          id="proof"
         />
       </div>
 
diff --git a/apps/gpc-verifier/app/debug/page.tsx b/apps/gpc-verifier/app/debug/page.tsx
new file mode 100644
index 0000000..4a7f89e
--- /dev/null
+++ b/apps/gpc-verifier/app/debug/page.tsx
@@ -0,0 +1,48 @@
+"use client";
+
+import { useState } from "react";
+import { removeNullifierHash } from "@/util/persistence";
+
+export default function Debug() {
+  const [nullifier, setNullifier] = useState("");
+
+  const handleSubmit = async (event: any) => {
+    event.preventDefault();
+    await removeNullifierHash(nullifier);
+    alert("Successfully removed");
+  };
+
+  return (
+    <main className="p-6 m-0 flex flex-col gap-4">
+      <h1 className="text-xl font-bold">Admin</h1>
+      <h2 className="text-lg font-bold">For debugging</h2>
+      <p>
+        This page is for debugging only. It alows you to remove a nullfier hash
+        from the kv store.
+      </p>
+      <p>
+        We keep a set of nullifier hash in the kv store. When we verify a proof,
+        we check if the nullifier hash is already in the set. If it is, it means
+        the proof has already been used to get a loan, and the verification will
+        fail. If not and the proof is valid, we'll add the nullifier hash in our
+        set, so it cannot be used again.
+      </p>
+
+      <form onSubmit={handleSubmit} className="flex flex-col gap-4">
+        <input
+          type="text"
+          name="nullifier"
+          className="form-input border px-4 py-3 rounded"
+          placeholder="Nullifier hash"
+          value={nullifier}
+          onChange={(e) => setNullifier(e.target.value)}
+        />
+        <input
+          type="submit"
+          className="bg-gray-200 hover:bg-gray-300 form-input px-4 py-3 rounded"
+          value="Remove nullifier hash"
+        />
+      </form>
+    </main>
+  );
+}
diff --git a/apps/gpc-verifier/app/hooks/useProofRequest.ts b/apps/gpc-verifier/app/hooks/useProofRequest.ts
index e7797ad..1b00a20 100644
--- a/apps/gpc-verifier/app/hooks/useProofRequest.ts
+++ b/apps/gpc-verifier/app/hooks/useProofRequest.ts
@@ -1,123 +1,33 @@
 import { useMemo } from "react";
 import JSONBig from "json-bigint";
-import { gpcBindConfig, GPCProofConfig, PODMembershipLists } from "@pcd/gpc";
-import { POD_INT_MAX } from "@pcd/pod";
+import { gpcBindConfig } from "@pcd/gpc";
+import { proofRequest } from "@/util/proofRequest";
 
 const jsonBigSerializer = JSONBig({
   useNativeBigInt: true,
   alwaysParseAsBig: true
 });
 
-// https://docs.pcd.team/types/_pcd_gpc.GPCProofConfig.html
-const proofConfig: GPCProofConfig = {
-  // Each POD object mentioned here must be provided in GPCProofInputs.
-  // The names assigned here are used to refer these PODs in GPCProofInputs,
-  // as well as elsewhere in configuration.
-  pods: {
-    govID: {
-      entries: {
-        // Prove the presence of an entry called "idNumber", hide its value,
-        // and also prove that it is not a member of the sanctionsList.
-        idNumber: { isRevealed: false, isNotMemberOf: "sanctionsList" },
-        // Prove the presence of an entry called "firstName", hide its value.
-        firstName: { isRevealed: false },
-        // Prove the presence of an entry called "lastName", hide its value.
-        lastName: { isRevealed: false },
-        // Prove the presence of an entry called "age", hide its value.
-        // and prove that it is >= 18
-        age: {
-          isRevealed: false,
-          inRange: { min: 18n, max: POD_INT_MAX }
-        },
-        // Prove the presence of an entry called "owner", hide its value, and prove
-        // that I own the corresponding Semaphore identity secrets.
-        owner: { isRevealed: false, isOwnerID: true }
-      }
-    },
-    paystub: {
-      entries: {
-        // Prove the presence of an entry called "firstName", hide its value, and
-        // prove that it equals to the firstName in the govID POD.
-        firstName: { isRevealed: false, equalsEntry: "govID.firstName" },
-        // Prove the presence of an entry called "lastName", hide its value, and
-        // prove that it equals to the firstName in the govID POD.
-        lastName: { isRevealed: false, equalsEntry: "govID.lastName" },
-        // There's an entry "currentEmployer" in the paystub POD, because it is
-        // not specified here, it will be ignored, meaning the proof says nothiing
-        // about the entry, and the entry won't be in the revealed claims.
-        // currentEmployer: {}
-        // Prove the presence of an entry called "startDate", reveal its value.
-        startDate: { isRevealed: true },
-        // Prove the presence of an entry called "annualSalary", hide its value,
-        // and prove that it is >= 20000
-        annualSalary: {
-          isRevealed: false,
-          inRange: { min: 20000n, max: POD_INT_MAX }
-        },
-        // Prove the presence of an entry called "owner", hide its value, and prove
-        // that I own the corresponding Semaphore identity secrets.
-        owner: { isRevealed: false, isOwnerID: true }
-      }
-    }
-  }
-};
-
-// https://docs.pcd.team/types/_pcd_gpc.PODMembershipLists.html
-// There's an isNotMemberOf check for govID POD entry idNumber in the proofConfig.
-// This lists has to be both in the proof inputs and the revealed claims.
-const membershipLists: PODMembershipLists = {
-  sanctionsList: [
-    { type: "string", value: "G2345678" },
-    { type: "string", value: "G1987654" },
-    { type: "string", value: "G1657678" }
-  ]
-};
-
-// https://docs.pcd.team/functions/_pcd_gpc.gpcBindConfig.html
-// Checks, binds, and canonicalizes a GPCProofConfig so it can be reused for multiple proofs.
-const useBoundConfig = () => {
-  return useMemo(() => {
-    const { boundConfig } = gpcBindConfig(proofConfig);
-    return boundConfig;
-  }, []);
-};
-
-// We can optionally ask to generate a nullifier, which is tied to the user's
-// identity and to the external nullifier value here. This can be used
-// to identify duplicate proofs without de-anonymizing.
-const externalNullifier = "ZooKyc";
-
-// Watermark will be included in the resulting proof.
-// This allows identifying a proof as tied to a specific use case, to avoid reuse.
-const watermark = "ZooKyc ZooLender challenge";
-
 export const useProofRequest = () => {
-  const boundConfig = useBoundConfig();
-
+  // We need to memorize the proof request because some fields uses "new Date()" for time.
   return useMemo(() => {
     return {
-      boundConfig,
-      membershipLists,
-      externalNullifier,
-      watermark
+      proofRequest,
+      // Checks, binds, and canonicalizes a GPCProofConfig so it can be reused for multiple proofs.
+      // https://docs.pcd.team/functions/_pcd_gpc.gpcBindConfig.html
+      proofRequestBoundConfig: gpcBindConfig(proofRequest.proofConfig)
+        .boundConfig
     };
-  }, [boundConfig]);
+  }, []);
 };
 
 export const useSerializedProofRequest = () => {
+  const request = useProofRequest();
+
   return useMemo(() => {
     // You can also use serializeGPCProofConfig to serialize the proofConfig,
     // and underlyingly it uses json-bitint like what we are doing here.
     // https://docs.pcd.team/functions/_pcd_gpc.serializeGPCProofConfig.html
-    return jsonBigSerializer.stringify(
-      {
-        proofConfig,
-        membershipLists,
-        externalNullifier,
-        watermark
-      },
-      null,
-      2
-    );
-  }, []);
+    return jsonBigSerializer.stringify(request.proofRequest, null, 2);
+  }, [request]);
 };
diff --git a/apps/gpc-verifier/app/page.tsx b/apps/gpc-verifier/app/page.tsx
index 954ed60..34b6269 100644
--- a/apps/gpc-verifier/app/page.tsx
+++ b/apps/gpc-verifier/app/page.tsx
@@ -66,7 +66,7 @@ export default function Verifier() {
             📋
           </button>
         </div>
-        <textarea rows={24} value={proofRequest} readOnly />
+        <textarea rows={24} value={proofRequest} readOnly id="proof-request" />
       </div>
 
       <h3 className="font-bold">Step 2: verify your proof</h3>
diff --git a/apps/gpc-verifier/app/util/persistence.ts b/apps/gpc-verifier/app/util/persistence.ts
index 624642f..8eeeef6 100644
--- a/apps/gpc-verifier/app/util/persistence.ts
+++ b/apps/gpc-verifier/app/util/persistence.ts
@@ -6,12 +6,18 @@ const NULLIFIER_KV_SET = "nullifiers_hash";
 // Checks whether we've seen the nullifier hash before.
 // If yes, return false; otherwise, returns true, and add the nullfier hash to our set.
 export async function tryRecordNullifierHash(
-  nullifierHash: string
+  nullifierHash: bigint
 ): Promise<boolean> {
-  if (await kv.sismember(NULLIFIER_KV_SET, nullifierHash)) {
+  if (await kv.sismember(NULLIFIER_KV_SET, nullifierHash.toString())) {
     return false;
   }
-
-  await kv.sadd(NULLIFIER_KV_SET, nullifierHash);
+  await kv.sadd(NULLIFIER_KV_SET, nullifierHash.toString());
   return true;
 }
+
+// Remove the nullifier hash from the set. For debugging use.
+export async function removeNullifierHash(
+  nullifierHash: string
+): Promise<number> {
+  return await kv.srem(NULLIFIER_KV_SET, nullifierHash);
+}
diff --git a/apps/gpc-verifier/app/util/proofRequest.ts b/apps/gpc-verifier/app/util/proofRequest.ts
new file mode 100644
index 0000000..31eeddc
--- /dev/null
+++ b/apps/gpc-verifier/app/util/proofRequest.ts
@@ -0,0 +1,142 @@
+import { GPCProofConfig, PODMembershipLists } from "@pcd/gpc";
+import { POD_INT_MIN, POD_INT_MAX, PODValue } from "@pcd/pod";
+
+// This proof request specifies what we want to prove, which can be sent to the
+// prover to request a proof.
+// Once we get the proof, verifier can check whether the proof is valid based on
+// this proof request.
+export type ProofRequest = {
+  proofConfig: GPCProofConfig;
+  membershipLists: PODMembershipLists;
+  externalNullifier: PODValue;
+  watermark: PODValue;
+};
+
+const getDates = () => {
+  const now = new Date();
+
+  const oneWeekAgo = new Date(now);
+  oneWeekAgo.setDate(now.getDate() - 7);
+
+  const oneYearAgo = new Date(now);
+  oneYearAgo.setFullYear(now.getFullYear() - 1);
+
+  const eighteenYearsAgo = new Date(now);
+  eighteenYearsAgo.setFullYear(now.getFullYear() - 18);
+  return {
+    now,
+    oneWeekAgo,
+    oneYearAgo,
+    eighteenYearsAgo
+  };
+};
+
+// https://docs.pcd.team/types/_pcd_gpc.GPCProofConfig.html
+const proofConfig: GPCProofConfig = {
+  // Each POD object mentioned here must be provided in GPCProofInputs.
+  // The names assigned here are used to refer these PODs in GPCProofInputs,
+  // as well as elsewhere in configuration.
+  pods: {
+    govID: {
+      entries: {
+        // Prove the presence of an entry called "idNumber", hide its value,
+        // and also prove that it is not a member of the sanctionsList.
+        idNumber: { isRevealed: false, isNotMemberOf: "sanctionsList" },
+        // There's an entry "firstName" in the govID POD. Because it is not
+        // specified here, it will be ignored, meaning that the proof says nothiing
+        // about the entry, and the entry won't be in the revealed claims.
+        // firstName: {},
+
+        // Prove the presence of an entry called "dateOfBirth", hide its value.
+        // and prove that it is <= the timestamp of eight years ago.
+        // Because we would like to prove that the ID holder is at least 18 years old.
+        dateOfBirth: {
+          isRevealed: false,
+          inRange: {
+            min: POD_INT_MIN,
+            max: BigInt(getDates().eighteenYearsAgo.getTime())
+          }
+        },
+        // Prove the presence of an entry called "socialSecurityNumber", hide its value
+        socialSecurityNumber: { isRevealed: false },
+        // Prove the presence of an entry called "owner", hide its value, and prove
+        // that I own the corresponding Semaphore identity secrets.
+        owner: { isRevealed: false, isOwnerID: true }
+      }
+    },
+    paystub: {
+      entries: {
+        // Prove the presence of an entry called "socialSecurityNumber", hide its value,
+        // and prove that it equals to the socialSecurityNumber in the govID POD.
+        socialSecurityNumber: {
+          isRevealed: false,
+          equalsEntry: "govID.socialSecurityNumber"
+        },
+        // Prove the presence of an entry called "startDate", hide its value,
+        // and prove that it is <= the timestamp of one year ago.
+        // Because we would like to prove that the paystub holder has at least
+        // one year of consistent employment with this current employer.
+        startDate: {
+          isRevealed: false,
+          inRange: {
+            min: POD_INT_MIN,
+            max: BigInt(getDates().oneYearAgo.getTime())
+          }
+        },
+        // Prove the presence of an entry called "issueDate", hide its value,
+        // and prove that it is >= the timestamp of one week ago.
+        // Because we would like to prove the paystub holder is still employed
+        // by the current employer at least a week ago.
+        issueDate: {
+          isRevealed: false,
+          inRange: {
+            min: BigInt(getDates().oneWeekAgo.getTime()),
+            max: POD_INT_MAX
+          }
+        },
+        // Prove the presence of an entry called "annualSalary", hide its value,
+        // and prove that it is >= 20000
+        annualSalary: {
+          isRevealed: false,
+          inRange: { min: 20000n, max: POD_INT_MAX }
+        },
+        // Prove the presence of an entry called "owner", hide its value, and prove
+        // that I own the corresponding Semaphore identity secrets.
+        owner: { isRevealed: false, isOwnerID: true }
+      }
+    }
+  }
+};
+
+// https://docs.pcd.team/types/_pcd_gpc.PODMembershipLists.html
+// There's an isNotMemberOf check for govID POD entry idNumber in the proofConfig.
+// This lists has to be both in the proof inputs and the revealed claims.
+const membershipLists: PODMembershipLists = {
+  sanctionsList: [
+    { type: "string", value: "G2345678" },
+    { type: "string", value: "G1987654" },
+    { type: "string", value: "G1657678" }
+  ]
+};
+
+// We can optionally ask to generate a nullifier, which is tied to the user's
+// identity and to the external nullifier value here. This can be used
+// to identify duplicate proofs without de-anonymizing.
+const externalNullifier: PODValue = { type: "string", value: "ZooKyc" };
+
+// Watermark will be included in the resulting proof. It allows identifying a proof as tied
+// to a specific use case to avoid reuse.
+// Here we use the current timestamp. Also because it is good to know when this proof request
+// is created. Since in the proof config, we are checking the govID POD dateOfBirth entry is
+// <= the timestamp of eight years ago from the current timestamp.
+const watermark: PODValue = {
+  type: "string",
+  value: getDates().now.toISOString()
+};
+
+export const proofRequest: ProofRequest = {
+  proofConfig,
+  membershipLists,
+  externalNullifier,
+  watermark
+};
diff --git a/apps/gpc-verifier/app/util/verifyProof.ts b/apps/gpc-verifier/app/util/verifyProof.ts
index 96a17db..24627a1 100644
--- a/apps/gpc-verifier/app/util/verifyProof.ts
+++ b/apps/gpc-verifier/app/util/verifyProof.ts
@@ -1,11 +1,7 @@
-import { Dispatch } from "react";
 import JSONBig from "json-bigint";
-import {
-  GPCBoundConfig,
-  gpcArtifactDownloadURL,
-  gpcVerify,
-  PODMembershipLists
-} from "@pcd/gpc";
+import _ from "lodash";
+import { GPCBoundConfig, gpcArtifactDownloadURL, gpcVerify } from "@pcd/gpc";
+import { ProofRequest } from "@/util/proofRequest";
 import { tryRecordNullifierHash } from "@/util/persistence";
 
 const jsonBigSerializer = JSONBig({
@@ -14,105 +10,98 @@ const jsonBigSerializer = JSONBig({
 });
 
 export const verifyProof = async (
-  boundConfig: GPCBoundConfig,
-  membershipLists: PODMembershipLists,
-  externalNullifier: string,
-  watermark: string,
-  proofStr: string,
-  setVerified: Dispatch<boolean>
+  proofRequest: ProofRequest,
+  proofRequestBoundConfig: GPCBoundConfig,
+  proofStr: string
 ) => {
-  try {
-    if (!proofStr) {
-      throw new Error("Proof cannot be empty!");
-    }
-
-    // You can also use deserializeGPCBoundConfig to deserialize the boundConfig,
-    // and use deserializeGPCRevealedClaims to deserialize the revealedClaims,
-    // and underlyingly they use json-bigint like we do here.
-    // https://docs.pcd.team/functions/_pcd_gpc.deserializeGPCBoundConfig.html
-    // https://docs.pcd.team/functions/_pcd_gpc.deserializeGPCRevealedClaims.html
-    const proofObj = jsonBigSerializer.parse(proofStr);
+  if (!proofStr) {
+    throw new Error("Proof cannot be empty!");
+  }
 
-    // Use the boundConfig we provided.
-    // However, gpcBindConfig might not always pick the same circuit as gpcProve,
-    // since it doesn't know the size of the inputs.
-    // Here we would like to use the circuitIdentifier returned by gpcProve.
-    const vConfig = {
-      ...boundConfig,
-      circuitIdentifier: proofObj.boundConfig.circuitIdentifier
-    };
+  // You can also use deserializeGPCBoundConfig to deserialize the boundConfig,
+  // and use deserializeGPCRevealedClaims to deserialize the revealedClaims,
+  // and underlyingly they use json-bigint like we do here.
+  // https://docs.pcd.team/functions/_pcd_gpc.deserializeGPCBoundConfig.html
+  // https://docs.pcd.team/functions/_pcd_gpc.deserializeGPCRevealedClaims.html
+  const proofObj = jsonBigSerializer.parse(proofStr);
 
-    // Make sure the membershipLists in the revealed claims matches
-    // the lists we provided.
-    const vClaims = {
-      ...proofObj.revealedClaims,
-      membershipLists
-    };
+  // We need to make sure the proof is generated with the proofConfig provided in
+  // our proofRequest. So here we force the verifier to use the bound proofConfig in our proofRequest
+  // as part of the boundConfig, with the understanding that it will force the verification to fail
+  // if this boundConfig is not the one used to generate the proof.
+  // Note that gpcBindConfig might not always pick the same circuit as gpcProve, since it doesn't know
+  // the size of the inputs. so here we would like to use the circuitIdentifier returned by gpcProve.
+  const vConfig = {
+    ...proofRequestBoundConfig,
+    circuitIdentifier: proofObj.boundConfig.circuitIdentifier
+  };
 
-    const artifactsURL = gpcArtifactDownloadURL("unpkg", "prod", undefined);
-    console.log("download artifacts from", artifactsURL);
+  // We need to make sure the proof is generated with the membershipLists provided in our proofRequest.
+  // So here we force the verifier to use the membershipLists in our proofRequest as part of the
+  // revealed claims, with the understanding that it will force the verification to fail
+  // if this membershipLists is not the one used to generate the proof.
+  const vClaims = {
+    ...proofObj.revealedClaims,
+    membershipLists: proofRequest.membershipLists
+  };
 
-    const isValid = await gpcVerify(
-      proofObj.proof,
-      vConfig,
-      vClaims,
-      artifactsURL
-    );
-    if (!isValid) {
-      throw new Error("Your proof is not valid. Please try again.");
-    }
+  // We need a URL for downloading GPC artifacts depending on the configuration in the browser.
+  // https://docs.pcd.team/functions/_pcd_gpc.gpcArtifactDownloadURL.html
+  const artifactsURL = gpcArtifactDownloadURL("unpkg", "prod", undefined);
+  console.log("download artifacts from", artifactsURL);
 
-    // Note that `gpcVerify` only checks that the inputs are valid with
-    // respect to each other.  We still need to check that everything is as
-    // we expect.
+  // This is the core functionality which verifies the proof produced by gpcProve.
+  // https://docs.pcd.team/functions/_pcd_gpc.gpcVerify.html
+  const isValid = await gpcVerify(
+    proofObj.proof,
+    vConfig,
+    vClaims,
+    artifactsURL
+  );
+  if (!isValid) {
+    throw new Error("Your proof is not valid. Please try again.");
+  }
 
-    // Check the PODs are signed by a trusted authorities with known public keys.
-    if (
-      vClaims.pods.govID?.signerPublicKey !==
-      process.env.NEXT_PUBLIC_GOV_EDDSA_PUBLIC_KEY
-    ) {
-      throw new Error("Please make sure your ID POD is signed by ZooGov");
-    }
-    if (
-      vClaims.pods.paystub?.signerPublicKey !==
-      process.env.NEXT_PUBLIC_DEEL_EDDSA_PUBLIC_KEY
-    ) {
-      throw new Error("Please make sure your ID POD is signed by ZooDeel");
-    }
+  // Note that `gpcVerify` only checks that the inputs are valid with respect to each other.
+  // We still need to check that revealed claims are as expected.
 
-    // Checks the nullifer, we don't want the same user to get more than one loan.
-    if (vClaims.owner?.externalNullifier.value !== externalNullifier) {
-      throw new Error(
-        `Invalid external nullifier value, make sure it is ${externalNullifier}`
-      );
-    }
-    const nullifierHash = BigInt(vClaims.owner?.nullifierHash).toString();
-    if (!(await tryRecordNullifierHash(nullifierHash))) {
-      throw new Error(
-        "We've got a proof from you before. You cannot get more than one loan."
-      );
-    }
+  // Check the PODs are signed by a trusted authorities with known public keys.
+  if (
+    vClaims.pods.govID?.signerPublicKey !==
+    process.env.NEXT_PUBLIC_GOV_EDDSA_PUBLIC_KEY
+  ) {
+    throw new Error("Please make sure your ID POD is signed by ZooGov");
+  }
+  if (
+    vClaims.pods.paystub?.signerPublicKey !==
+    process.env.NEXT_PUBLIC_DEEL_EDDSA_PUBLIC_KEY
+  ) {
+    throw new Error("Please make sure your ID POD is signed by ZooDeel");
+  }
 
-    // Checks the watermark, it should be what we passed in
-    if (vClaims.watermark?.value !== watermark) {
-      throw new Error("Watermark does not match");
-    }
+  // Checks the watermark, it should be what we passed in
+  if (!_.isEqual(vClaims.watermark, proofRequest.watermark)) {
+    throw new Error("Watermark does not match");
+  }
 
-    // Do more checks with the revealed claims
-    const oneYearAfter = new Date(
-      vClaims.pods.paystub?.entries?.startDate?.value as string
+  // Checks the nullifer, we don't want the same user to get more than one loan.
+  if (
+    !_.isEqual(vClaims.owner?.externalNullifier, proofRequest.externalNullifier)
+  ) {
+    throw new Error(
+      `Invalid external nullifier value, make sure it is ${proofRequest.externalNullifier}`
     );
-    oneYearAfter.setFullYear(oneYearAfter.getFullYear() + 1);
-    if (oneYearAfter > new Date()) {
-      throw new Error(
-        "You haven't been with your current employer for at least a year"
-      );
-    }
-
-    setVerified(isValid);
-  } catch (e) {
-    alert(e);
   }
+  // This check has side-effects (recording the nullifierHash which indicates that the
+  // user got a loan). Therefore it should be the last thing to happen after all the
+  // other checks are successful.
+  if (!(await tryRecordNullifierHash(vClaims.owner?.nullifierHash))) {
+    throw new Error(
+      `Your proof is valid. But we've got a proof from you before. You cannot get more than one loan. See ${window.location.origin}/debug.`
+    );
+  }
+
+  return true;
 };
 
 export default verifyProof;
diff --git a/apps/gpc-verifier/package.json b/apps/gpc-verifier/package.json
index 1d49594..b27bad5 100644
--- a/apps/gpc-verifier/package.json
+++ b/apps/gpc-verifier/package.json
@@ -6,13 +6,15 @@
     "dev": "next dev -p 3001",
     "build": "next build",
     "start": "next start",
-    "lint": "eslint . --max-warnings 0"
+    "lint": "eslint . --max-warnings 0",
+    "localenv": "cp .env.example .env.local"
   },
   "dependencies": {
     "@pcd/gpc": "^0.1.0",
     "@pcd/pod": "^0.2.0",
     "@vercel/kv": "^2.0.0",
     "json-bigint": "^1.0.0",
+    "lodash": "^4.17.21",
     "next": "^14.1.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/apps/gpc-verifier/public/circles.svg b/apps/gpc-verifier/public/circles.svg
deleted file mode 100644
index 6533be5..0000000
--- a/apps/gpc-verifier/public/circles.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 100 100" width="614" height="614">
-  <defs xmlns="http://www.w3.org/2000/svg">
-		<radialGradient id="radial" gradientUnits="userSpaceOnUse">
-			<stop offset="0" stop-color="#fff"></stop>
-			<stop offset="60%" stop-color="#fff" stop-opacity="0"></stop>
-		</radialGradient>
-	</defs>
-	<circle cx="50" cy="50" r="25" stroke-width=".2" style="fill:none; stroke:rgba(255,255,255,.1);">
-		<animate attributeName="opacity" values="1;0.1;0.1;1" dur="3s" begin="0.2s" repeatCount="indefinite"></animate>
-	</circle>
-  <circle cx="50" cy="50" r="25" stroke-width=".2" style="fill:url(#radial); fill-opacity:.1;">
-		<animate attributeName="opacity" values="1;0.5;0.5;1" dur="3s" repeatCount="indefinite"></animate>
-	</circle><circle cx="50" cy="50" r="45" stroke-width=".2" style="fill:none; stroke:rgba(255,255,255,.1);">
-		<animate attributeName="opacity" values="1;0.1;0.1;1" dur="3s" begin="0.4s" repeatCount="indefinite"></animate>
-	</circle>
-</svg>
\ No newline at end of file
diff --git a/apps/gpc-verifier/public/next.svg b/apps/gpc-verifier/public/next.svg
deleted file mode 100644
index 5174b28..0000000
--- a/apps/gpc-verifier/public/next.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>
\ No newline at end of file
diff --git a/apps/gpc-verifier/public/turborepo.svg b/apps/gpc-verifier/public/turborepo.svg
deleted file mode 100644
index 2f9aa1f..0000000
--- a/apps/gpc-verifier/public/turborepo.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<svg width="104" height="104" viewBox="0 0 104 104" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_1_17)">
-<path d="M26.0192 7C42.0962 -2.28203 61.9038 -2.28203 77.9808 7C94.0577 16.282 103.962 33.4359 103.962 52C103.962 70.5641 94.0577 87.718 77.9808 97C61.9038 106.282 42.0962 106.282 26.0192 97C9.94229 87.718 0.038475 70.5641 0.038475 52C0.038475 33.4359 9.94229 16.282 26.0192 7Z" fill="black" fill-opacity="0.64"/>
-<path d="M26.0192 7C42.0962 -2.28203 61.9038 -2.28203 77.9808 7C94.0577 16.282 103.962 33.4359 103.962 52C103.962 70.5641 94.0577 87.718 77.9808 97C61.9038 106.282 42.0962 106.282 26.0192 97C9.94229 87.718 0.038475 70.5641 0.038475 52C0.038475 33.4359 9.94229 16.282 26.0192 7Z" fill="url(#paint0_linear_1_17)" fill-opacity="0.15"/>
-<path d="M26.0192 7C42.0962 -2.28203 61.9038 -2.28203 77.9808 7C94.0577 16.282 103.962 33.4359 103.962 52C103.962 70.5641 94.0577 87.718 77.9808 97C61.9038 106.282 42.0962 106.282 26.0192 97C9.94229 87.718 0.038475 70.5641 0.038475 52C0.038475 33.4359 9.94229 16.282 26.0192 7Z" fill="black" fill-opacity="0.5"/>
-<path d="M0.538475 52C0.538475 33.6146 10.347 16.6257 26.2692 7.43301C42.1915 -1.7597 61.8085 -1.7597 77.7308 7.43301C93.653 16.6257 103.462 33.6146 103.462 52C103.462 70.3854 93.653 87.3743 77.7308 96.567C61.8085 105.76 42.1915 105.76 26.2692 96.567C10.347 87.3743 0.538475 70.3854 0.538475 52Z" stroke="url(#paint1_radial_1_17)" stroke-opacity="0.15"/>
-<path d="M0.538475 52C0.538475 33.6146 10.347 16.6257 26.2692 7.43301C42.1915 -1.7597 61.8085 -1.7597 77.7308 7.43301C93.653 16.6257 103.462 33.6146 103.462 52C103.462 70.3854 93.653 87.3743 77.7308 96.567C61.8085 105.76 42.1915 105.76 26.2692 96.567C10.347 87.3743 0.538475 70.3854 0.538475 52Z" stroke="url(#paint2_linear_1_17)" stroke-opacity="0.5"/>
-<path d="M51.8878 37.9262C44.1892 37.9262 37.9258 44.1896 37.9258 51.8882C37.9258 59.5868 44.1892 65.8502 51.8878 65.8502C59.5864 65.8502 65.8498 59.5868 65.8498 51.8882C65.8498 44.1896 59.5864 37.9262 51.8878 37.9262ZM51.8878 59.1136C47.8968 59.1136 44.6624 55.8792 44.6624 51.8882C44.6624 47.8972 47.8968 44.6628 51.8878 44.6628C55.8788 44.6628 59.1132 47.8972 59.1132 51.8882C59.1132 55.8792 55.8788 59.1136 51.8878 59.1136Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M53.0581 35.633V30.42C64.3889 31.0258 73.3901 40.4066 73.3901 51.8882C73.3901 63.3698 64.3889 72.748 53.0581 73.3564V68.1434C61.5029 67.5402 68.1901 60.4838 68.1901 51.8882C68.1901 43.2926 61.5029 36.2362 53.0581 35.633ZM39.5745 62.5482C37.3359 59.9638 35.8929 56.6722 35.6355 53.0582H30.4199C30.6903 58.1152 32.7131 62.7042 35.8825 66.2376L39.5719 62.5482H39.5745ZM50.7182 73.3564V68.1434C47.1016 67.886 43.81 66.4456 41.2256 64.2044L37.5362 67.8938C41.0722 71.0658 45.6612 73.086 50.7156 73.3564H50.7182Z" fill="url(#paint3_linear_1_17)"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_1_17" x1="52" y1="-8" x2="52" y2="112" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3286F1"/>
-<stop offset="1" stop-color="#C43AC4"/>
-</linearGradient>
-<radialGradient id="paint1_radial_1_17" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(52 -7.99999) rotate(90) scale(154.286 154.286)">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="white"/>
-</radialGradient>
-<linearGradient id="paint2_linear_1_17" x1="-8" y1="-8" x2="18.25" y2="40.75" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint3_linear_1_17" x1="53.9007" y1="33.4389" x2="32.7679" y2="54.5717" gradientUnits="userSpaceOnUse">
-<stop stop-color="#0096FF"/>
-<stop offset="1" stop-color="#FF1E56"/>
-</linearGradient>
-<clipPath id="clip0_1_17">
-<rect width="104" height="104" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/apps/gpc-verifier/public/vercel.svg b/apps/gpc-verifier/public/vercel.svg
deleted file mode 100644
index d2f8422..0000000
--- a/apps/gpc-verifier/public/vercel.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 283 64"><path fill="black" d="M141 16c-11 0-19 7-19 18s9 18 20 18c7 0 13-3 16-7l-7-5c-2 3-6 4-9 4-5 0-9-3-10-7h28v-3c0-11-8-18-19-18zm-9 15c1-4 4-7 9-7s8 3 9 7h-18zm117-15c-11 0-19 7-19 18s9 18 20 18c6 0 12-3 16-7l-8-5c-2 3-5 4-8 4-5 0-9-3-11-7h28l1-3c0-11-8-18-19-18zm-10 15c2-4 5-7 10-7s8 3 9 7h-19zm-39 3c0 6 4 10 10 10 4 0 7-2 9-5l8 5c-3 5-9 8-17 8-11 0-19-7-19-18s8-18 19-18c8 0 14 3 17 8l-8 5c-2-3-5-5-9-5-6 0-10 4-10 10zm83-29v46h-9V5h9zM37 0l37 64H0L37 0zm92 5-27 48L74 5h10l18 30 17-30h10zm59 12v10l-3-1c-6 0-10 4-10 10v15h-9V17h9v9c0-5 6-9 13-9z"/></svg>
\ No newline at end of file
diff --git a/apps/pod-issuer-client/.env.example b/apps/pod-issuer-client/.env.example
index 30b3c51..0701a0a 100644
--- a/apps/pod-issuer-client/.env.example
+++ b/apps/pod-issuer-client/.env.example
@@ -1,2 +1,3 @@
-NEXT_PUBLIC_POD_ISSUER_SERVER_URL=
-NEXT_PUBLIC_GPC_PROVER_CLIENT_URL=
+# URLs to other Zukyc applications
+NEXT_PUBLIC_POD_ISSUER_SERVER_URL=http://localhost:8080
+NEXT_PUBLIC_GPC_PROVER_CLIENT_URL=http://localhost:3002
diff --git a/apps/pod-issuer-client/README.md b/apps/pod-issuer-client/README.md
deleted file mode 100644
index 3d7b63a..0000000
--- a/apps/pod-issuer-client/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-## Getting Started
-
-First, run the development server:
-
-```bash
-yarn dev
-```
-
-Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
-
-You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
-
-To create [API routes](https://nextjs.org/docs/app/building-your-application/routing/router-handlers) add an `api/` directory to the `app/` directory with a `route.ts` file. For individual endpoints, create a subfolder in the `api` directory, like `api/hello/route.ts` would map to [http://localhost:3000/api/hello](http://localhost:3000/api/hello).
-
-## Learn More
-
-To learn more about Next.js, take a look at the following resources:
-
-- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
-- [Learn Next.js](https://nextjs.org/learn/foundations/about-nextjs) - an interactive Next.js tutorial.
-
-You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!
-
-## Deploy on Vercel
-
-The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_source=github.com&utm_medium=referral&utm_campaign=turborepo-readme) from the creators of Next.js.
-
-Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.
diff --git a/apps/pod-issuer-client/app/debug/components/IDPOD.tsx b/apps/pod-issuer-client/app/debug/components/IDPOD.tsx
index 29814fa..7662bc2 100644
--- a/apps/pod-issuer-client/app/debug/components/IDPOD.tsx
+++ b/apps/pod-issuer-client/app/debug/components/IDPOD.tsx
@@ -24,7 +24,8 @@ export default function IDPOD() {
         idNumber: data.id,
         firstName: data.firstName,
         lastName: data.lastName,
-        age: data.age,
+        dateOfBirth: Date.parse(data.dateOfBirth),
+        socialSecurityNumber: data.ssn,
         semaphoreCommitment: data.semaphoreCommitment
       });
     },
@@ -76,34 +77,52 @@ export default function IDPOD() {
         )}
 
         <div className="form-group flex gap-20 items-center">
-          <label htmlFor="age">Age</label>
+          <label htmlFor="dateOfBirth">Date of birth</label>
           <input
-            {...register("age", {
-              required: "This is required",
-              valueAsNumber: true,
-              min: {
-                value: 0,
-                message: "Age has to be > 0."
+            {...register("dateOfBirth", {
+              required: "This is required.",
+              valueAsDate: true,
+              validate: {
+                beforeToday: (v) => v < new Date()
               }
             })}
-            type="number"
+            type="date"
             className="form-input px-4 py-3 rounded grow"
           />
-          {errors.age && (
-            <p className="text-red-500">{errors.age.message as string}</p>
+          {errors.dateOfBirth && (
+            <p className="text-red-500">
+              {(errors.dateOfBirth.message as string) ||
+                "Date of birth cannot be a future date."}
+            </p>
           )}
         </div>
 
+        <input
+          {...register("ssn", {
+            required: "This is required",
+            pattern: {
+              value: /^(?!(000|666|9))\d{3}-(?!00)\d{2}-(?!0000)\d{4}$/,
+              message:
+                "Entered value does not match social security number format."
+            }
+          })}
+          type="text"
+          className="form-input px-4 py-3 rounded"
+          placeholder="Social security number"
+        />
+        {errors.ssn && (
+          <p className="text-red-500">{errors.ssn.message as string}</p>
+        )}
+
         <input
           {...register("semaphoreCommitment", {
             required: "This is required.",
             pattern: {
               value: /\d+/,
-              message:
-                "Entered value does not match semaphore commitment format."
+              message: "Entered value should be bigint."
             }
           })}
-          type="text"
+          type="number"
           className="form-input px-4 py-3 rounded"
           placeholder="Public identifier (Semaphore identity commiment)"
         />
@@ -134,7 +153,13 @@ export default function IDPOD() {
             </button>
           </div>
 
-          <textarea className="border-none" readOnly rows={10} value={data} />
+          <textarea
+            className="border-none"
+            readOnly
+            rows={10}
+            value={data}
+            id="id-pod"
+          />
         </div>
       )}
 
diff --git a/apps/pod-issuer-client/app/debug/components/PaystubPOD.tsx b/apps/pod-issuer-client/app/debug/components/PaystubPOD.tsx
index 9f2bbe9..351af29 100644
--- a/apps/pod-issuer-client/app/debug/components/PaystubPOD.tsx
+++ b/apps/pod-issuer-client/app/debug/components/PaystubPOD.tsx
@@ -26,8 +26,9 @@ export default function PaystubPOD() {
         firstName: data.firstName,
         lastName: data.lastName,
         currentEmployer: data.currentEmployer,
-        startDate: data.startDate,
+        startDate: Date.parse(data.startDate),
         annualSalary: parseInt(data.annualSalary),
+        socialSecurityNumber: data.ssn,
         semaphoreCommitment: data.semaphoreCommitment
       });
     },
@@ -117,16 +118,32 @@ export default function PaystubPOD() {
           )}
         </div>
 
+        <input
+          {...register("ssn", {
+            required: "This is required",
+            pattern: {
+              value: /^(?!(000|666|9))\d{3}-(?!00)\d{2}-(?!0000)\d{4}$/,
+              message:
+                "Entered value does not match social security number format."
+            }
+          })}
+          type="text"
+          className="form-input px-4 py-3 rounded"
+          placeholder="Social security number"
+        />
+        {errors.ssn && (
+          <p className="text-red-500">{errors.ssn.message as string}</p>
+        )}
+
         <input
           {...register("semaphoreCommitment", {
             required: "This is required.",
             pattern: {
               value: /\d+/,
-              message:
-                "Entered value does not match semaphore commitment format."
+              message: "Entered value should be bigint."
             }
           })}
-          type="text"
+          type="number"
           className="form-input px-4 py-3 rounded"
           placeholder="Public identifier (Semaphore identity commiment)"
         />
@@ -157,7 +174,13 @@ export default function PaystubPOD() {
             </button>
           </div>
 
-          <textarea className="border-none" readOnly rows={10} value={data} />
+          <textarea
+            className="border-none"
+            readOnly
+            rows={10}
+            value={data}
+            id="paystub-pod"
+          />
         </div>
       )}
 
diff --git a/apps/pod-issuer-client/app/debug/hooks/useIssueDebugIDPOD.ts b/apps/pod-issuer-client/app/debug/hooks/useIssueDebugIDPOD.ts
index 3f460f0..c3e2cf1 100644
--- a/apps/pod-issuer-client/app/debug/hooks/useIssueDebugIDPOD.ts
+++ b/apps/pod-issuer-client/app/debug/hooks/useIssueDebugIDPOD.ts
@@ -34,6 +34,7 @@ export interface IIssueDebugIDPODArgs {
   idNumber: string;
   firstName: string;
   lastName: string;
-  age: number;
+  dateOfBirth: number;
+  socialSecurityNumber: string;
   semaphoreCommitment: string;
 }
diff --git a/apps/pod-issuer-client/app/debug/hooks/useIssueDebugPaystubPOD.ts b/apps/pod-issuer-client/app/debug/hooks/useIssueDebugPaystubPOD.ts
index 71cd6c3..0d86c04 100644
--- a/apps/pod-issuer-client/app/debug/hooks/useIssueDebugPaystubPOD.ts
+++ b/apps/pod-issuer-client/app/debug/hooks/useIssueDebugPaystubPOD.ts
@@ -34,7 +34,8 @@ export interface IIssueDebugPaystubPODArgs {
   firstName: string;
   lastName: string;
   currentEmployer: string;
-  startDate: string;
+  startDate: number;
   annualSalary: number;
+  socialSecurityNumber: string;
   semaphoreCommitment: string;
 }
diff --git a/apps/pod-issuer-client/app/deel/app.tsx b/apps/pod-issuer-client/app/deel/app.tsx
index 13d2ded..60da29a 100644
--- a/apps/pod-issuer-client/app/deel/app.tsx
+++ b/apps/pod-issuer-client/app/deel/app.tsx
@@ -2,9 +2,10 @@
 
 import { useCallback } from "react";
 import { Tooltip } from "react-tooltip";
-import { useForm, FieldValues } from "react-hook-form";
+import { FieldValues } from "react-hook-form";
 import { useIssuePaystubPOD } from "@/deel/hooks/useIssuePaystubPOD";
 import Login from "@/shared/components/Login";
+import InfoForm from "@/deel/components/InfoForm";
 import useLogin from "@/deel/hooks/useLogin";
 import logout from "@/shared/hooks/logout";
 import useStore from "@/shared/hooks/useStore";
@@ -14,6 +15,10 @@ export default function Deel() {
 
   const token = useStore((state) => state.deelToken);
   const paystubPOD = useStore((state) => state.paystubPOD);
+  const semaphoreCommitment = useStore((state) => state.semaphoreCommitment);
+  const setSemaphoreCommitment = useStore(
+    (state) => state.setSemaphoreCommitment
+  );
 
   const { mutate: login, error: loginError } = useLogin();
   const onLogin = useCallback(
@@ -26,19 +31,17 @@ export default function Deel() {
   const { mutate: issuePaystubPOD, error: issueError } = useIssuePaystubPOD();
   const issuePOD = useCallback(
     (data: FieldValues) => {
+      if (!semaphoreCommitment) {
+        setSemaphoreCommitment(data.semaphoreCommitment);
+      }
+      const commitment = semaphoreCommitment || data.semaphoreCommitment;
       issuePaystubPOD({
-        semaphoreCommitment: data.semaphoreCommitment
+        semaphoreCommitment: commitment
       });
     },
-    [issuePaystubPOD]
+    [semaphoreCommitment, setSemaphoreCommitment, issuePaystubPOD]
   );
 
-  const {
-    register,
-    handleSubmit,
-    formState: { errors }
-  } = useForm();
-
   if (!hasHydrated) {
     return <p>Loading...</p>;
   }
@@ -57,50 +60,7 @@ export default function Deel() {
         <p className="font-bold text-red-500">{`Error login: ${loginError.message}`}</p>
       )}
 
-      {token && !paystubPOD && (
-        <form
-          onSubmit={handleSubmit((data) => issuePOD(data))}
-          className="flex flex-col gap-4"
-        >
-          <p className="text-lg">
-            Please provide your public identifier (e.g.
-            <a href="https://docs.semaphore.pse.dev/V3/guides/identities">
-              Semaphore identity commitment
-            </a>
-            ). We'll issue your Paystub POD to this public identifier.
-            <span className="info-tooltip-anchor">❗</span>
-            <Tooltip anchorSelect=".info-tooltip-anchor">
-              You can get this from{" "}
-              {process.env.NEXT_PUBLIC_GPC_PROVER_CLIENT_URL}, see "Identity,
-              Public identifier".
-            </Tooltip>
-          </p>
-          <input
-            {...register("semaphoreCommitment", {
-              required: "This is required.",
-              pattern: {
-                value: /\d+/,
-                message:
-                  "Entered value does not match semaphore commitment format."
-              }
-            })}
-            type="text"
-            className="form-input px-4 py-3 rounded"
-            placeholder="Public identifier (Semaphore identity commiment)"
-          />
-          {errors.semaphoreCommitment && (
-            <p className="text-red-500">
-              {errors.semaphoreCommitment.message as string}
-            </p>
-          )}
-
-          <input
-            type="submit"
-            className="bg-gray-200 hover:bg-gray-300 form-input px-4 py-3 rounded"
-            value="Issue Paystub POD"
-          />
-        </form>
-      )}
+      {token && <InfoForm onSubmitInfo={issuePOD} />}
 
       {paystubPOD && (
         <div className="flex flex-col gap-2">
@@ -126,6 +86,7 @@ export default function Deel() {
             readOnly
             rows={10}
             value={paystubPOD}
+            id="paystub-pod"
           />
         </div>
       )}
diff --git a/apps/pod-issuer-client/app/deel/components/InfoForm.tsx b/apps/pod-issuer-client/app/deel/components/InfoForm.tsx
new file mode 100644
index 0000000..193cfdb
--- /dev/null
+++ b/apps/pod-issuer-client/app/deel/components/InfoForm.tsx
@@ -0,0 +1,70 @@
+"use client";
+
+import { useForm, FieldValues } from "react-hook-form";
+import { Tooltip } from "react-tooltip";
+import useStore from "@/shared/hooks/useStore";
+
+const InfoForm = ({
+  onSubmitInfo
+}: {
+  onSubmitInfo: (_data: FieldValues) => void;
+}) => {
+  const semaphoreCommitment = useStore((state) => state.semaphoreCommitment);
+
+  const {
+    register,
+    handleSubmit,
+    formState: { errors }
+  } = useForm();
+
+  return (
+    <form
+      onSubmit={handleSubmit((data) => onSubmitInfo(data))}
+      className="flex flex-col gap-4"
+    >
+      {!semaphoreCommitment && (
+        <>
+          <p className="text-lg">
+            Please provide your public identifier (e.g.
+            <a href="https://docs.semaphore.pse.dev/V3/guides/identities">
+              Semaphore identity commitment
+            </a>
+            ). We'll issue your Paystub POD to this public identifier.
+            <span className="info-tooltip-anchor">❗</span>
+            <Tooltip anchorSelect=".info-tooltip-anchor">
+              You can get this from{" "}
+              {process.env.NEXT_PUBLIC_GPC_PROVER_CLIENT_URL}, see "Identity,
+              Public identifier".
+            </Tooltip>
+          </p>
+          <input
+            {...register("semaphoreCommitment", {
+              required: "This is required.",
+              pattern: {
+                value: /\d+/,
+                message:
+                  "Entered value does not match semaphore commitment format."
+              }
+            })}
+            type="number"
+            className="form-input px-4 py-3 rounded"
+            placeholder="Public identifier (Semaphore identity commiment)"
+          />
+          {errors.semaphoreCommitment && (
+            <p className="text-red-500">
+              {errors.semaphoreCommitment.message as string}
+            </p>
+          )}
+        </>
+      )}
+
+      <input
+        type="submit"
+        className="bg-gray-200 hover:bg-gray-300 form-input px-4 py-3 rounded"
+        value="Issue New Paystub POD"
+      />
+    </form>
+  );
+};
+
+export default InfoForm;
diff --git a/apps/pod-issuer-client/app/deel/hooks/useIssuePaystubPOD.ts b/apps/pod-issuer-client/app/deel/hooks/useIssuePaystubPOD.ts
index f865669..3b42406 100644
--- a/apps/pod-issuer-client/app/deel/hooks/useIssuePaystubPOD.ts
+++ b/apps/pod-issuer-client/app/deel/hooks/useIssuePaystubPOD.ts
@@ -12,13 +12,14 @@ export const useIssuePaystubPOD = () => {
       if (!token) {
         throw new Error("Not logged in");
       }
+      setPaystubPOD(null);
       return issuePOD("deel", token, args);
     },
+    onMutate: () => {
+      setPaystubPOD(null);
+    },
     onSuccess: (data) => {
       setPaystubPOD(data);
-    },
-    onError: () => {
-      setPaystubPOD(null);
     }
   });
 };
diff --git a/apps/pod-issuer-client/app/gov/app.tsx b/apps/pod-issuer-client/app/gov/app.tsx
index 2219437..43ff6b9 100644
--- a/apps/pod-issuer-client/app/gov/app.tsx
+++ b/apps/pod-issuer-client/app/gov/app.tsx
@@ -77,7 +77,13 @@ export default function Gov() {
             </Tooltip>
           </div>
 
-          <textarea className="border-none" readOnly rows={10} value={idPOD} />
+          <textarea
+            className="border-none"
+            readOnly
+            rows={10}
+            value={idPOD}
+            id="id-pod"
+          />
         </div>
       )}
 
diff --git a/apps/pod-issuer-client/app/gov/components/InfoForm.tsx b/apps/pod-issuer-client/app/gov/components/InfoForm.tsx
index 8bfdc5a..4389dda 100644
--- a/apps/pod-issuer-client/app/gov/components/InfoForm.tsx
+++ b/apps/pod-issuer-client/app/gov/components/InfoForm.tsx
@@ -16,60 +16,56 @@ const InfoForm = ({
   } = useForm();
 
   return (
-    <>
-      <form
-        onSubmit={handleSubmit((data) => onSubmitInfo(data))}
-        className="flex flex-col gap-4"
-      >
-        <div className="flex items-center">
-          <h2 className="text-lg">Upload your driver's license or ID card</h2>
-          <p className="upload-tooltip-anchor">❗</p>
-          <Tooltip anchorSelect=".upload-tooltip-anchor">
-            For demo purposes, no need to upload
-          </Tooltip>
-        </div>
-        <Dropzone />
+    <form
+      onSubmit={handleSubmit((data) => onSubmitInfo(data))}
+      className="flex flex-col gap-4"
+    >
+      <div className="flex items-center">
+        <h2 className="text-lg">Upload your driver's license or ID card</h2>
+        <p className="upload-tooltip-anchor">❗</p>
+        <Tooltip anchorSelect=".upload-tooltip-anchor">
+          For demo purposes, no need to upload
+        </Tooltip>
+      </div>
+      <Dropzone />
 
-        <p className="text-lg">
-          Please provide your public identifier (e.g.
-          <a href="https://docs.semaphore.pse.dev/V3/guides/identities">
-            Semaphore identity commitment
-          </a>
-          ). We'll issue your ID POD to this public identifier.
-          <span className="info-tooltip-anchor">❗</span>
-          <Tooltip anchorSelect=".info-tooltip-anchor">
-            You can get this from{" "}
-            {process.env.NEXT_PUBLIC_GPC_PROVER_CLIENT_URL}, see "Identity,
-            Public identifier".
-          </Tooltip>
+      <p className="text-lg">
+        Please provide your public identifier (e.g.
+        <a href="https://docs.semaphore.pse.dev/V3/guides/identities">
+          Semaphore identity commitment
+        </a>
+        ). We'll issue your ID POD to this public identifier.
+        <span className="info-tooltip-anchor">❗</span>
+        <Tooltip anchorSelect=".info-tooltip-anchor">
+          You can get this from {process.env.NEXT_PUBLIC_GPC_PROVER_CLIENT_URL},
+          see "Identity, Public identifier".
+        </Tooltip>
+      </p>
+      <input
+        {...register("semaphoreCommitment", {
+          required: true,
+          pattern: {
+            value: /\d+/,
+            message: "Entered value does not match semaphore commitment format"
+          }
+        })}
+        type="number"
+        className="form-input px-4 py-3 rounded"
+        placeholder="Public identifier (Semaphore identity commiment)"
+      />
+      {errors.semaphoreCommitment && (
+        <p className="text-red-500">
+          {(errors.semaphoreCommitment.message as string) ||
+            "Public identifier is required."}
         </p>
-        <input
-          {...register("semaphoreCommitment", {
-            required: true,
-            pattern: {
-              value: /\d+/,
-              message:
-                "Entered value does not match semaphore commitment format"
-            }
-          })}
-          type="text"
-          className="form-input px-4 py-3 rounded"
-          placeholder="Public identifier (Semaphore identity commiment)"
-        />
-        {errors.semaphoreCommitment && (
-          <p className="text-red-500">
-            {(errors.semaphoreCommitment.message as string) ||
-              "Public identifier is required."}
-          </p>
-        )}
+      )}
 
-        <input
-          type="submit"
-          className="bg-gray-200 hover:bg-gray-300 form-input px-4 py-3 rounded"
-          value="Issue ID POD"
-        />
-      </form>
-    </>
+      <input
+        type="submit"
+        className="bg-gray-200 hover:bg-gray-300 form-input px-4 py-3 rounded"
+        value="Issue ID POD"
+      />
+    </form>
   );
 };
 
diff --git a/apps/pod-issuer-client/app/shared/components/Login.tsx b/apps/pod-issuer-client/app/shared/components/Login.tsx
index f26afd6..dfe17d5 100644
--- a/apps/pod-issuer-client/app/shared/components/Login.tsx
+++ b/apps/pod-issuer-client/app/shared/components/Login.tsx
@@ -38,6 +38,7 @@ const Login = ({ onLogin }: { onLogin: (_data: FieldValues) => void }) => {
                 message: "Entered value does not match email format."
               }
             })}
+            id="email"
             type="email"
             defaultValue={loginCreds.email}
             className="form-input px-4 py-3 rounded grow"
@@ -52,6 +53,7 @@ const Login = ({ onLogin }: { onLogin: (_data: FieldValues) => void }) => {
           <label htmlFor="password">Password:</label>
           <input
             {...register("password", { required: "Password is required." })}
+            id="password"
             type="password"
             defaultValue={loginCreds.password}
             className="form-input px-4 py-3 rounded grow"
diff --git a/apps/pod-issuer-client/app/shared/hooks/useLoginCreds.ts b/apps/pod-issuer-client/app/shared/hooks/useLoginCreds.ts
index 65ee8a7..741dd8e 100644
--- a/apps/pod-issuer-client/app/shared/hooks/useLoginCreds.ts
+++ b/apps/pod-issuer-client/app/shared/hooks/useLoginCreds.ts
@@ -15,7 +15,7 @@ const useLoginCreds = () => {
 
     let loginEmail = email;
     if (!loginEmail) {
-      const animal = chance.animal().replaceAll("'", "");
+      const animal = chance.animal().replace(/'| /g, "");
       const names = animal.split(" ");
       if (names.length < 2) {
         names.push(chance.last());
diff --git a/apps/pod-issuer-client/app/shared/hooks/useStore.ts b/apps/pod-issuer-client/app/shared/hooks/useStore.ts
index 27f3b96..e26e7db 100644
--- a/apps/pod-issuer-client/app/shared/hooks/useStore.ts
+++ b/apps/pod-issuer-client/app/shared/hooks/useStore.ts
@@ -26,6 +26,9 @@ interface State {
 
   paystubPOD: string | null;
   setPaystubPOD: (pod: string | null) => void;
+
+  semaphoreCommitment: string | null;
+  setSemaphoreCommitment: (commitment: string | null) => void;
 }
 
 const useStore = create<State>()(
@@ -67,7 +70,11 @@ const useStore = create<State>()(
         setIdPOD: (pod) => set(() => ({ idPOD: pod })),
 
         paystubPOD: null,
-        setPaystubPOD: (pod) => set(() => ({ paystubPOD: pod }))
+        setPaystubPOD: (pod) => set(() => ({ paystubPOD: pod })),
+
+        semaphoreCommitment: null,
+        setSemaphoreCommitment: (commitment) =>
+          set(() => ({ semaphoreCommitment: commitment }))
       })),
       {
         name: "Store",
diff --git a/apps/pod-issuer-client/app/shared/queries/issuePOD.ts b/apps/pod-issuer-client/app/shared/queries/issuePOD.ts
index 6fab2bc..319c3cc 100644
--- a/apps/pod-issuer-client/app/shared/queries/issuePOD.ts
+++ b/apps/pod-issuer-client/app/shared/queries/issuePOD.ts
@@ -27,5 +27,5 @@ export const issuePOD = async (
 };
 
 export interface IIssuePODArgs {
-  semaphoreCommitment: bigint;
+  semaphoreCommitment: string;
 }
diff --git a/apps/pod-issuer-client/package.json b/apps/pod-issuer-client/package.json
index 4bdcd42..062d188 100644
--- a/apps/pod-issuer-client/package.json
+++ b/apps/pod-issuer-client/package.json
@@ -6,7 +6,8 @@
     "dev": "next dev -p 3000",
     "build": "next build",
     "start": "next start",
-    "lint": "eslint . --max-warnings 0"
+    "lint": "eslint . --max-warnings 0",
+    "localenv": "cp .env.example .env.local"
   },
   "dependencies": {
     "@tailwindcss/forms": "^0.5.7",
diff --git a/apps/pod-issuer-client/public/circles.svg b/apps/pod-issuer-client/public/circles.svg
deleted file mode 100644
index 6533be5..0000000
--- a/apps/pod-issuer-client/public/circles.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 100 100" width="614" height="614">
-  <defs xmlns="http://www.w3.org/2000/svg">
-		<radialGradient id="radial" gradientUnits="userSpaceOnUse">
-			<stop offset="0" stop-color="#fff"></stop>
-			<stop offset="60%" stop-color="#fff" stop-opacity="0"></stop>
-		</radialGradient>
-	</defs>
-	<circle cx="50" cy="50" r="25" stroke-width=".2" style="fill:none; stroke:rgba(255,255,255,.1);">
-		<animate attributeName="opacity" values="1;0.1;0.1;1" dur="3s" begin="0.2s" repeatCount="indefinite"></animate>
-	</circle>
-  <circle cx="50" cy="50" r="25" stroke-width=".2" style="fill:url(#radial); fill-opacity:.1;">
-		<animate attributeName="opacity" values="1;0.5;0.5;1" dur="3s" repeatCount="indefinite"></animate>
-	</circle><circle cx="50" cy="50" r="45" stroke-width=".2" style="fill:none; stroke:rgba(255,255,255,.1);">
-		<animate attributeName="opacity" values="1;0.1;0.1;1" dur="3s" begin="0.4s" repeatCount="indefinite"></animate>
-	</circle>
-</svg>
\ No newline at end of file
diff --git a/apps/pod-issuer-client/public/next.svg b/apps/pod-issuer-client/public/next.svg
deleted file mode 100644
index 5174b28..0000000
--- a/apps/pod-issuer-client/public/next.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>
\ No newline at end of file
diff --git a/apps/pod-issuer-client/public/turborepo.svg b/apps/pod-issuer-client/public/turborepo.svg
deleted file mode 100644
index 2f9aa1f..0000000
--- a/apps/pod-issuer-client/public/turborepo.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<svg width="104" height="104" viewBox="0 0 104 104" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_1_17)">
-<path d="M26.0192 7C42.0962 -2.28203 61.9038 -2.28203 77.9808 7C94.0577 16.282 103.962 33.4359 103.962 52C103.962 70.5641 94.0577 87.718 77.9808 97C61.9038 106.282 42.0962 106.282 26.0192 97C9.94229 87.718 0.038475 70.5641 0.038475 52C0.038475 33.4359 9.94229 16.282 26.0192 7Z" fill="black" fill-opacity="0.64"/>
-<path d="M26.0192 7C42.0962 -2.28203 61.9038 -2.28203 77.9808 7C94.0577 16.282 103.962 33.4359 103.962 52C103.962 70.5641 94.0577 87.718 77.9808 97C61.9038 106.282 42.0962 106.282 26.0192 97C9.94229 87.718 0.038475 70.5641 0.038475 52C0.038475 33.4359 9.94229 16.282 26.0192 7Z" fill="url(#paint0_linear_1_17)" fill-opacity="0.15"/>
-<path d="M26.0192 7C42.0962 -2.28203 61.9038 -2.28203 77.9808 7C94.0577 16.282 103.962 33.4359 103.962 52C103.962 70.5641 94.0577 87.718 77.9808 97C61.9038 106.282 42.0962 106.282 26.0192 97C9.94229 87.718 0.038475 70.5641 0.038475 52C0.038475 33.4359 9.94229 16.282 26.0192 7Z" fill="black" fill-opacity="0.5"/>
-<path d="M0.538475 52C0.538475 33.6146 10.347 16.6257 26.2692 7.43301C42.1915 -1.7597 61.8085 -1.7597 77.7308 7.43301C93.653 16.6257 103.462 33.6146 103.462 52C103.462 70.3854 93.653 87.3743 77.7308 96.567C61.8085 105.76 42.1915 105.76 26.2692 96.567C10.347 87.3743 0.538475 70.3854 0.538475 52Z" stroke="url(#paint1_radial_1_17)" stroke-opacity="0.15"/>
-<path d="M0.538475 52C0.538475 33.6146 10.347 16.6257 26.2692 7.43301C42.1915 -1.7597 61.8085 -1.7597 77.7308 7.43301C93.653 16.6257 103.462 33.6146 103.462 52C103.462 70.3854 93.653 87.3743 77.7308 96.567C61.8085 105.76 42.1915 105.76 26.2692 96.567C10.347 87.3743 0.538475 70.3854 0.538475 52Z" stroke="url(#paint2_linear_1_17)" stroke-opacity="0.5"/>
-<path d="M51.8878 37.9262C44.1892 37.9262 37.9258 44.1896 37.9258 51.8882C37.9258 59.5868 44.1892 65.8502 51.8878 65.8502C59.5864 65.8502 65.8498 59.5868 65.8498 51.8882C65.8498 44.1896 59.5864 37.9262 51.8878 37.9262ZM51.8878 59.1136C47.8968 59.1136 44.6624 55.8792 44.6624 51.8882C44.6624 47.8972 47.8968 44.6628 51.8878 44.6628C55.8788 44.6628 59.1132 47.8972 59.1132 51.8882C59.1132 55.8792 55.8788 59.1136 51.8878 59.1136Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M53.0581 35.633V30.42C64.3889 31.0258 73.3901 40.4066 73.3901 51.8882C73.3901 63.3698 64.3889 72.748 53.0581 73.3564V68.1434C61.5029 67.5402 68.1901 60.4838 68.1901 51.8882C68.1901 43.2926 61.5029 36.2362 53.0581 35.633ZM39.5745 62.5482C37.3359 59.9638 35.8929 56.6722 35.6355 53.0582H30.4199C30.6903 58.1152 32.7131 62.7042 35.8825 66.2376L39.5719 62.5482H39.5745ZM50.7182 73.3564V68.1434C47.1016 67.886 43.81 66.4456 41.2256 64.2044L37.5362 67.8938C41.0722 71.0658 45.6612 73.086 50.7156 73.3564H50.7182Z" fill="url(#paint3_linear_1_17)"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_1_17" x1="52" y1="-8" x2="52" y2="112" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3286F1"/>
-<stop offset="1" stop-color="#C43AC4"/>
-</linearGradient>
-<radialGradient id="paint1_radial_1_17" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(52 -7.99999) rotate(90) scale(154.286 154.286)">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="white"/>
-</radialGradient>
-<linearGradient id="paint2_linear_1_17" x1="-8" y1="-8" x2="18.25" y2="40.75" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint3_linear_1_17" x1="53.9007" y1="33.4389" x2="32.7679" y2="54.5717" gradientUnits="userSpaceOnUse">
-<stop stop-color="#0096FF"/>
-<stop offset="1" stop-color="#FF1E56"/>
-</linearGradient>
-<clipPath id="clip0_1_17">
-<rect width="104" height="104" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/apps/pod-issuer-client/public/vercel.svg b/apps/pod-issuer-client/public/vercel.svg
deleted file mode 100644
index d2f8422..0000000
--- a/apps/pod-issuer-client/public/vercel.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 283 64"><path fill="black" d="M141 16c-11 0-19 7-19 18s9 18 20 18c7 0 13-3 16-7l-7-5c-2 3-6 4-9 4-5 0-9-3-10-7h28v-3c0-11-8-18-19-18zm-9 15c1-4 4-7 9-7s8 3 9 7h-18zm117-15c-11 0-19 7-19 18s9 18 20 18c6 0 12-3 16-7l-8-5c-2 3-5 4-8 4-5 0-9-3-11-7h28l1-3c0-11-8-18-19-18zm-10 15c2-4 5-7 10-7s8 3 9 7h-19zm-39 3c0 6 4 10 10 10 4 0 7-2 9-5l8 5c-3 5-9 8-17 8-11 0-19-7-19-18s8-18 19-18c8 0 14 3 17 8l-8 5c-2-3-5-5-9-5-6 0-10 4-10 10zm83-29v46h-9V5h9zM37 0l37 64H0L37 0zm92 5-27 48L74 5h10l18 30 17-30h10zm59 12v10l-3-1c-6 0-10 4-10 10v15h-9V17h9v9c0-5 6-9 13-9z"/></svg>
\ No newline at end of file
diff --git a/apps/pod-issuer-server/.env.example b/apps/pod-issuer-server/.env.example
index 2b6749d..8ad82da 100644
--- a/apps/pod-issuer-server/.env.example
+++ b/apps/pod-issuer-server/.env.example
@@ -1,5 +1,20 @@
-PORT=
-GOV_EDDSA_PRIVATE_KEY=
-DEEL_EDDSA_PRIVATE_KEY=
-KV_REST_API_URL=
-KV_REST_API_TOKEN=
+# The port on which this server runs
+PORT=8080
+
+# These keys are used for signing PODs. PODs are signed using EdDSA signatures.
+# The keys can be any 32 bytes encoded as Base64 or hex.
+GOV_EDDSA_PRIVATE_KEY=0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
+DEEL_EDDSA_PRIVATE_KEY=0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcde0
+
+# The secret used to sign the JWTs. We are using algorithm HS512 (HMAC using SHA-512).
+# You can generate your own secrets by running the following command:
+# openssl rand -base64 129 | tr -d '\n'
+GOV_JWT_SECRET_KEY=pLJJw/b+yFHMU215dayJtPfaTO3qgpfN47R3bWM56mHiqC5HwpSZTKuC+7CrNMQYEVlnnfB7CD55T6Wwx+6wAzHKTUYeWBYgh2GgKxv6ShjIIIMyVEyuMjsyNvVFvtbzTLG90G81FEM/TF8YDtBLvuvy9zn0emJGeKBDHXRDHW1o%
+DEEL_JWT_SECRET_KEY=E7TOF7b3jLnfFHWYOOH7v7XmfhEHF35IoarvilCO6jWhnkW8OKKtRoWYdq9brPpQ1g2f5syhMBaD/BiRAXT192YIh3nssJjFjpawjPofW9JwYN35TpvyVI+vIKEtLR+PlsHJ0Y2OvFx1Bguv7OBE0JHH0fpVLS2P0LkYcN0dzcaG%
+
+# The REST API URL and REST API token to connect to the local Vercel KV instance
+# See this: https://github.com/vercel/storage/issues/281
+# You can also create a KV database on Vercel, and get the environment variables by
+# following this guide: https://vercel.com/docs/storage/vercel-kv/rest-api
+KV_REST_API_URL=http://localhost:8079
+KV_REST_API_TOKEN=example_token
diff --git a/apps/pod-issuer-server/dist/routes/debug.js b/apps/pod-issuer-server/dist/routes/debug.js
index 3f8e9a9..35cf282 100644
--- a/apps/pod-issuer-server/dist/routes/debug.js
+++ b/apps/pod-issuer-server/dist/routes/debug.js
@@ -11,7 +11,8 @@ debug.post("/id/issue", (req, res) => {
     if (!inputs.idNumber ||
         !inputs.firstName ||
         !inputs.lastName ||
-        !inputs.age ||
+        !inputs.dateOfBirth ||
+        !inputs.socialSecurityNumber ||
         !inputs.semaphoreCommitment) {
         res.status(400).send("Missing query parameter");
         return;
@@ -20,8 +21,8 @@ debug.post("/id/issue", (req, res) => {
         res.status(400).send("Invalid ID number format");
         return;
     }
-    if (inputs.age < 0) {
-        res.status(400).send("Invalid age");
+    if (isNaN(inputs.dateOfBirth) || inputs.dateOfBirth > new Date().getTime()) {
+        res.status(400).send("Invalid date of birth");
         return;
     }
     try {
@@ -30,7 +31,11 @@ debug.post("/id/issue", (req, res) => {
             idNumber: { type: "string", value: inputs.idNumber },
             firstName: { type: "string", value: inputs.firstName },
             lastName: { type: "string", value: inputs.lastName },
-            age: { type: "int", value: BigInt(inputs.age) },
+            dateOfBirth: { type: "int", value: BigInt(inputs.dateOfBirth) },
+            socialSecurityNumber: {
+                type: "string",
+                value: inputs.socialSecurityNumber
+            },
             owner: {
                 type: "cryptographic",
                 value: BigInt(inputs.semaphoreCommitment)
@@ -41,7 +46,7 @@ debug.post("/id/issue", (req, res) => {
     }
     catch (e) {
         console.error(e);
-        res.status(500).send("Error issue ID POD: " + e);
+        res.status(500).send("Error issuing ID POD: " + e);
     }
 });
 debug.post("/paystub/issue", (req, res) => {
@@ -51,16 +56,16 @@ debug.post("/paystub/issue", (req, res) => {
         !inputs.currentEmployer ||
         !inputs.startDate ||
         !inputs.annualSalary ||
+        !inputs.socialSecurityNumber ||
         !inputs.semaphoreCommitment) {
         res.status(400).send("Missing query parameter");
         return;
     }
-    const startDate = Date.parse(inputs.startDate);
-    if (!startDate || startDate > new Date().getTime()) {
+    if (isNaN(inputs.startDate) || inputs.startDate > new Date().getTime()) {
         res.status(400).send("Invalid start date");
         return;
     }
-    if (inputs.annualSalary < 0) {
+    if (isNaN(inputs.annualSalary) || inputs.annualSalary < 0) {
         res.status(400).send("Invalid annual salary");
         return;
     }
@@ -70,8 +75,13 @@ debug.post("/paystub/issue", (req, res) => {
             firstName: { type: "string", value: inputs.firstName },
             lastName: { type: "string", value: inputs.lastName },
             currentEmployer: { type: "string", value: inputs.currentEmployer },
-            startDate: { type: "string", value: inputs.startDate },
+            startDate: { type: "int", value: BigInt(inputs.startDate) },
             annualSalary: { type: "int", value: BigInt(inputs.annualSalary) },
+            issueDate: { type: "int", value: BigInt(new Date().getTime()) },
+            socialSecurityNumber: {
+                type: "string",
+                value: inputs.socialSecurityNumber
+            },
             owner: {
                 type: "cryptographic",
                 value: BigInt(inputs.semaphoreCommitment)
diff --git a/apps/pod-issuer-server/dist/routes/deel.js b/apps/pod-issuer-server/dist/routes/deel.js
index 62f6cba..dfd7c40 100644
--- a/apps/pod-issuer-server/dist/routes/deel.js
+++ b/apps/pod-issuer-server/dist/routes/deel.js
@@ -5,34 +5,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = __importDefault(require("express"));
 const express_jwt_1 = require("express-jwt");
-const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const pod_1 = require("@pcd/pod");
 const deel_1 = require("../stores/deel");
+const loginHelper_1 = require("./util/loginHelper");
+const shared_1 = require("../stores/shared");
 const deel = express_1.default.Router();
 deel.post("/login", (req, res) => {
-    const inputs = req.body;
-    if (!inputs.email || !inputs.password) {
-        res.status(400).send("Missing query parameter");
-        return;
-    }
-    // In practice, get user information from database by email,
-    // Here for demo purposes, we'll allow any email with @zoo.com domain
-    if (!inputs.email.endsWith("@zoo.com")) {
-        res.status(401).send("Invalid email or password");
-        return;
-    }
-    // In practice, check if the encrypted password match
-    // This is just for demo purposes
-    if (!inputs.password.startsWith("zoo")) {
-        res.status(401).send("Invalid email or password");
-        return;
-    }
-    // Signing JWT, valid for 1 hour
-    const token = jsonwebtoken_1.default.sign({ email: inputs.email }, process.env.DEEL_EDDSA_PRIVATE_KEY, { algorithm: "HS512", expiresIn: "1h" });
-    res.send(token);
+    (0, loginHelper_1.handleLogin)(req, res, process.env.DEEL_JWT_SECRET_KEY);
 });
 deel.post("/issue", (0, express_jwt_1.expressjwt)({
-    secret: process.env.DEEL_EDDSA_PRIVATE_KEY,
+    secret: process.env.DEEL_JWT_SECRET_KEY,
     algorithms: ["HS512"]
 }), async (req, res) => {
     const email = req.auth?.email;
@@ -40,50 +22,50 @@ deel.post("/issue", (0, express_jwt_1.expressjwt)({
         res.status(401).send("Unauthorized");
         return;
     }
+    // In practice, the user should have to prove that they
+    // own the semaphore identity secret corresponding to this
+    // semaphore identity commiment.
     const inputs = req.body;
     if (!inputs.semaphoreCommitment) {
         res.status(400).send("Missing query parameter");
         return;
     }
     try {
-        // We already issued paystub POD for this user, return the POD
-        const podStr = await (0, deel_1.getPaystubPODByEmail)(email);
-        if (podStr !== null) {
-            const pod = pod_1.POD.deserialize(podStr);
-            const owner = pod.content.asEntries().owner.value;
-            if (owner !== BigInt(inputs.semaphoreCommitment)) {
-                res
-                    .status(400)
-                    .send("Already issued POD for this user, but Semaphore Commitment doesn't match.");
-                return;
-            }
-            res.status(200).json({ pod: podStr });
+        if (!(0, shared_1.checkSemaphoreCommitment)(email, inputs.semaphoreCommitment)) {
+            res
+                .status(400)
+                .send("Semaphore commitment does not match what is on the record.");
             return;
         }
-        const user = (0, deel_1.getDeelUserByEmail)(email);
+        const user = await (0, deel_1.getDeelUserByEmail)(email);
         if (user === null) {
             res.status(404).send("User not found");
             return;
         }
+        // Issue a paystub POD
         // For more info, see https://github.com/proofcarryingdata/zupass/blob/main/examples/pod-gpc-example/src/podExample.ts
         const pod = pod_1.POD.sign({
             firstName: { type: "string", value: user.firstName },
             lastName: { type: "string", value: user.lastName },
             currentEmployer: { type: "string", value: "ZooPark" },
-            startDate: { type: "string", value: user.startDate },
+            startDate: { type: "int", value: user.startDate },
+            issueDate: { type: "int", value: BigInt(new Date().getTime()) },
             annualSalary: { type: "int", value: BigInt(user.annualSalary) },
+            socialSecurityNumber: {
+                type: "string",
+                value: user.socialSecurityNumber
+            },
             owner: {
                 type: "cryptographic",
                 value: BigInt(inputs.semaphoreCommitment)
             }
         }, process.env.DEEL_EDDSA_PRIVATE_KEY);
         const serializedPOD = pod.serialize();
-        await (0, deel_1.savePaystubPOD)(email, serializedPOD);
         res.status(200).json({ pod: serializedPOD });
     }
     catch (e) {
         console.error(e);
-        res.status(500).send("Error issue Paystub POD: " + e);
+        res.status(500).send("Error issuing Paystub POD: " + e);
     }
 });
 exports.default = deel;
diff --git a/apps/pod-issuer-server/dist/routes/gov.js b/apps/pod-issuer-server/dist/routes/gov.js
index 5aeaa4a..a06db4d 100644
--- a/apps/pod-issuer-server/dist/routes/gov.js
+++ b/apps/pod-issuer-server/dist/routes/gov.js
@@ -5,34 +5,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = __importDefault(require("express"));
 const express_jwt_1 = require("express-jwt");
-const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const pod_1 = require("@pcd/pod");
 const gov_1 = require("../stores/gov");
+const loginHelper_1 = require("./util/loginHelper");
 const gov = express_1.default.Router();
 gov.post("/login", (req, res) => {
-    const inputs = req.body;
-    if (!inputs.email || !inputs.password) {
-        res.status(400).send("Missing query parameter");
-        return;
-    }
-    // In practice, get user information from database by email,
-    // Here for demo purposes, we'll allow any email with @zoo.com domain
-    if (!inputs.email.endsWith("@zoo.com")) {
-        res.status(401).send("Invalid email or password");
-        return;
-    }
-    // In practice, check if the encrypted password match
-    // This is just for demo purposes
-    if (!inputs.password.startsWith("zoo")) {
-        res.status(401).send("Invalid email or password");
-        return;
-    }
-    // Signing JWT, valid for 1 hour
-    const token = jsonwebtoken_1.default.sign({ email: inputs.email }, process.env.GOV_EDDSA_PRIVATE_KEY, { algorithm: "HS512", expiresIn: "1h" });
-    res.send(token);
+    (0, loginHelper_1.handleLogin)(req, res, process.env.GOV_JWT_SECRET_KEY);
 });
 gov.post("/issue", (0, express_jwt_1.expressjwt)({
-    secret: process.env.GOV_EDDSA_PRIVATE_KEY,
+    secret: process.env.GOV_JWT_SECRET_KEY,
     algorithms: ["HS512"]
 }), async (req, res) => {
     const email = req.auth?.email;
@@ -40,6 +21,9 @@ gov.post("/issue", (0, express_jwt_1.expressjwt)({
         res.status(401).send("Unauthorized");
         return;
     }
+    // In practice, the user should have to prove that they
+    // own the semaphore identity secret corresponding to this
+    // semaphore identity commiment.
     const inputs = req.body;
     if (!inputs.semaphoreCommitment) {
         res.status(400).send("Missing query parameter");
@@ -60,17 +44,23 @@ gov.post("/issue", (0, express_jwt_1.expressjwt)({
             res.status(200).json({ pod: podStr });
             return;
         }
-        const user = (0, gov_1.getGovUserByEmail)(email);
+        const user = await (0, gov_1.getGovUserByEmail)(email);
         if (user === null) {
             res.status(404).send("User not found");
             return;
         }
+        // In this case, we haven't issued a paystub POD for this user yet,
+        // need to issue one and save it for future use.
         // For more info, see https://github.com/proofcarryingdata/zupass/blob/main/examples/pod-gpc-example/src/podExample.ts
         const pod = pod_1.POD.sign({
             idNumber: { type: "string", value: user.idNumber },
             firstName: { type: "string", value: user.firstName },
             lastName: { type: "string", value: user.lastName },
-            age: { type: "int", value: BigInt(user.age) },
+            dateOfBirth: { type: "int", value: user.dateOfBirth },
+            socialSecurityNumber: {
+                type: "string",
+                value: user.socialSecurityNumber
+            },
             owner: {
                 type: "cryptographic",
                 value: BigInt(inputs.semaphoreCommitment)
@@ -82,7 +72,7 @@ gov.post("/issue", (0, express_jwt_1.expressjwt)({
     }
     catch (e) {
         console.error(e);
-        res.status(500).send("Error issue ID POD: " + e);
+        res.status(500).send("Error issuing ID POD: " + e);
     }
 });
 exports.default = gov;
diff --git a/apps/pod-issuer-server/dist/routes/util/loginHelper.js b/apps/pod-issuer-server/dist/routes/util/loginHelper.js
new file mode 100644
index 0000000..8a65f76
--- /dev/null
+++ b/apps/pod-issuer-server/dist/routes/util/loginHelper.js
@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleLogin = void 0;
+const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
+const handleLogin = (req, res, privateKey) => {
+    const inputs = req.body;
+    if (!inputs.email || !inputs.password) {
+        res.status(400).send("Missing query parameter");
+        return;
+    }
+    // In practice, get user information from database by email,
+    // Here for demo purposes, we'll allow any email with @zoo.com domain
+    if (!inputs.email.endsWith("@zoo.com")) {
+        res.status(401).send("Invalid email or password");
+        return;
+    }
+    // In practice, check if the encrypted password match
+    // This is just for demo purposes
+    if (!inputs.password.startsWith("zoo")) {
+        res.status(401).send("Invalid email or password");
+        return;
+    }
+    // Signing JWT, valid for 1 hour
+    const token = jsonwebtoken_1.default.sign({ email: inputs.email }, privateKey, {
+        algorithm: "HS512",
+        expiresIn: "1h"
+    });
+    res.send(token);
+};
+exports.handleLogin = handleLogin;
diff --git a/apps/pod-issuer-server/dist/stores/deel.js b/apps/pod-issuer-server/dist/stores/deel.js
index fc3a195..ffdae80 100644
--- a/apps/pod-issuer-server/dist/stores/deel.js
+++ b/apps/pod-issuer-server/dist/stores/deel.js
@@ -3,43 +3,36 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.savePaystubPOD = exports.getPaystubPODByEmail = exports.getDeelUserByEmail = void 0;
-const chance_1 = __importDefault(require("chance"));
+exports.getDeelUserByEmail = void 0;
 const lodash_1 = __importDefault(require("lodash"));
-const kv_1 = require("@vercel/kv");
-const podIssuerKV = (0, kv_1.createClient)({
-    url: process.env.KV_REST_API_URL,
-    token: process.env.KV_REST_API_TOKEN,
-    automaticDeserialization: false
-});
-const chance = new chance_1.default();
-function getDeelUserByEmail(email) {
+const shared_1 = require("./shared");
+async function getDeelUserByEmail(email) {
     // randomly generate DeelUser fields
     // In practice, look up the user in the database
+    const user = await shared_1.podIssuerKV.hget(email, "deelUser");
+    if (user !== null) {
+        return shared_1.jsonBigSerializer.parse(user);
+    }
     const names = email.replace(/@zoo.com$/, "").split(".");
     if (names.length < 2) {
         return null;
     }
-    const startDate = chance.birthday({
-        string: true,
-        type: "child"
+    const startDate = shared_1.chance.birthday({
+        year: shared_1.chance.year({ min: 2000, max: 2022 })
     });
-    const annualSalary = chance.integer({ min: 20000, max: 1000000 });
-    return {
+    const annualSalary = shared_1.chance.integer({ min: 20000, max: 1000000 });
+    const ssn = await (0, shared_1.getSSNByEmail)(email);
+    const deelUser = {
         email,
         firstName: lodash_1.default.upperFirst(names[0]),
         lastName: lodash_1.default.upperFirst(names[1]),
-        startDate,
-        annualSalary
+        startDate: BigInt(startDate.getTime()),
+        annualSalary: BigInt(annualSalary),
+        socialSecurityNumber: ssn
     };
+    await shared_1.podIssuerKV.hset(email, {
+        deelUser: shared_1.jsonBigSerializer.stringify(deelUser)
+    });
+    return deelUser;
 }
 exports.getDeelUserByEmail = getDeelUserByEmail;
-async function getPaystubPODByEmail(email) {
-    const key = `paystub-${email}`;
-    return await podIssuerKV.get(key);
-}
-exports.getPaystubPODByEmail = getPaystubPODByEmail;
-async function savePaystubPOD(email, serializedPOD) {
-    await podIssuerKV.set(`paystub-${email}`, serializedPOD);
-}
-exports.savePaystubPOD = savePaystubPOD;
diff --git a/apps/pod-issuer-server/dist/stores/gov.js b/apps/pod-issuer-server/dist/stores/gov.js
index 441bd95..a188b79 100644
--- a/apps/pod-issuer-server/dist/stores/gov.js
+++ b/apps/pod-issuer-server/dist/stores/gov.js
@@ -4,39 +4,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.saveIDPOD = exports.getIDPODByEmail = exports.getGovUserByEmail = void 0;
-const chance_1 = __importDefault(require("chance"));
 const lodash_1 = __importDefault(require("lodash"));
-const kv_1 = require("@vercel/kv");
-const podIssuerKV = (0, kv_1.createClient)({
-    url: process.env.KV_REST_API_URL,
-    token: process.env.KV_REST_API_TOKEN,
-    automaticDeserialization: false
-});
-const chance = new chance_1.default();
-function getGovUserByEmail(email) {
+const shared_1 = require("./shared");
+async function getGovUserByEmail(email) {
     // randomly generate GovUser fields
     // In practice, look up the user in the database
     const names = email.replace(/@zoo.com$/, "").split(".");
     if (names.length < 2) {
         return null;
     }
-    const age = chance.age({ type: "adult" });
-    const idNumber = chance.string({ pool: "0123456789", length: 7 });
+    const dateOfBirth = shared_1.chance.birthday({
+        year: shared_1.chance.year({ min: 1970, max: 2005 })
+    });
+    const idNumber = shared_1.chance.string({ pool: "0123456789", length: 7 });
+    const ssn = await (0, shared_1.getSSNByEmail)(email);
     return {
         email,
         firstName: lodash_1.default.upperFirst(names[0]),
         lastName: lodash_1.default.upperFirst(names[1]),
-        age,
-        idNumber: `G${idNumber}`
+        dateOfBirth: BigInt(dateOfBirth.getTime()),
+        idNumber: `G${idNumber}`,
+        socialSecurityNumber: ssn
     };
 }
 exports.getGovUserByEmail = getGovUserByEmail;
 async function getIDPODByEmail(email) {
-    const key = `id-${email}`;
-    return await podIssuerKV.get(key);
+    return await shared_1.podIssuerKV.hget(email, "idPOD");
 }
 exports.getIDPODByEmail = getIDPODByEmail;
 async function saveIDPOD(email, serializedPOD) {
-    await podIssuerKV.set(`id-${email}`, serializedPOD);
+    await shared_1.podIssuerKV.hset(email, { idPOD: serializedPOD });
 }
 exports.saveIDPOD = saveIDPOD;
diff --git a/apps/pod-issuer-server/dist/stores/shared.js b/apps/pod-issuer-server/dist/stores/shared.js
new file mode 100644
index 0000000..ebcb090
--- /dev/null
+++ b/apps/pod-issuer-server/dist/stores/shared.js
@@ -0,0 +1,39 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkSemaphoreCommitment = exports.getSSNByEmail = exports.podIssuerKV = exports.jsonBigSerializer = exports.chance = void 0;
+const chance_1 = __importDefault(require("chance"));
+const json_bigint_1 = __importDefault(require("json-bigint"));
+const kv_1 = require("@vercel/kv");
+exports.chance = new chance_1.default();
+exports.jsonBigSerializer = (0, json_bigint_1.default)({
+    useNativeBigInt: true,
+    alwaysParseAsBig: true
+});
+exports.podIssuerKV = (0, kv_1.createClient)({
+    url: process.env.KV_REST_API_URL,
+    token: process.env.KV_REST_API_TOKEN,
+    automaticDeserialization: false
+});
+async function getSSNByEmail(email) {
+    // randomly generate SSN
+    // In practice, look it up in the database
+    let ssn = await exports.podIssuerKV.hget(email, "ssn");
+    if (!ssn) {
+        ssn = exports.chance.ssn();
+    }
+    await exports.podIssuerKV.hset(email, { ssn: ssn });
+    return ssn;
+}
+exports.getSSNByEmail = getSSNByEmail;
+async function checkSemaphoreCommitment(email, semaphoreCommitment) {
+    const savedCommitment = await exports.podIssuerKV.hget(email, "semaphoreCommitment");
+    if (savedCommitment === null) {
+        await exports.podIssuerKV.hset(email, { semaphoreCommitment: semaphoreCommitment });
+        return true;
+    }
+    return savedCommitment === semaphoreCommitment;
+}
+exports.checkSemaphoreCommitment = checkSemaphoreCommitment;
diff --git a/apps/pod-issuer-server/package.json b/apps/pod-issuer-server/package.json
index 141b93a..b5fffaf 100644
--- a/apps/pod-issuer-server/package.json
+++ b/apps/pod-issuer-server/package.json
@@ -8,7 +8,8 @@
     "start": "NODE_OPTIONS=--max_old_space_size=4096 NODE_ENV=production PORT=8080 npx tsc && node dist/index.js",
     "lint": "eslint \"**/*.ts{,x}\"",
     "test": "echo \"Error: no test specified\"",
-    "prepare": "cd ../.. && husky install apps/pod-issuer-server/.husky"
+    "prepare": "cd ../.. && husky install apps/pod-issuer-server/.husky",
+    "localenv": "cp .env.example .env"
   },
   "dependencies": {
     "@pcd/pod": "^0.2.0",
@@ -17,6 +18,7 @@
     "cors": "^2.8.5",
     "express": "^4.19.2",
     "express-jwt": "^8.4.1",
+    "json-bigint": "^1.0.0",
     "jsonwebtoken": "^9.0.2",
     "lodash": "^4.17.21"
   },
diff --git a/apps/pod-issuer-server/src/routes/debug.ts b/apps/pod-issuer-server/src/routes/debug.ts
index af59587..95f9f8d 100644
--- a/apps/pod-issuer-server/src/routes/debug.ts
+++ b/apps/pod-issuer-server/src/routes/debug.ts
@@ -8,7 +8,8 @@ debug.post("/id/issue", (req: Request, res: Response) => {
     idNumber: string;
     firstName: string;
     lastName: string;
-    age: number;
+    dateOfBirth: number;
+    socialSecurityNumber: string;
     semaphoreCommitment: string;
   } = req.body;
 
@@ -16,7 +17,8 @@ debug.post("/id/issue", (req: Request, res: Response) => {
     !inputs.idNumber ||
     !inputs.firstName ||
     !inputs.lastName ||
-    !inputs.age ||
+    !inputs.dateOfBirth ||
+    !inputs.socialSecurityNumber ||
     !inputs.semaphoreCommitment
   ) {
     res.status(400).send("Missing query parameter");
@@ -28,8 +30,8 @@ debug.post("/id/issue", (req: Request, res: Response) => {
     return;
   }
 
-  if (inputs.age < 0) {
-    res.status(400).send("Invalid age");
+  if (isNaN(inputs.dateOfBirth) || inputs.dateOfBirth > new Date().getTime()) {
+    res.status(400).send("Invalid date of birth");
     return;
   }
 
@@ -40,7 +42,11 @@ debug.post("/id/issue", (req: Request, res: Response) => {
         idNumber: { type: "string", value: inputs.idNumber },
         firstName: { type: "string", value: inputs.firstName },
         lastName: { type: "string", value: inputs.lastName },
-        age: { type: "int", value: BigInt(inputs.age) },
+        dateOfBirth: { type: "int", value: BigInt(inputs.dateOfBirth) },
+        socialSecurityNumber: {
+          type: "string",
+          value: inputs.socialSecurityNumber
+        },
         owner: {
           type: "cryptographic",
           value: BigInt(inputs.semaphoreCommitment)
@@ -52,7 +58,7 @@ debug.post("/id/issue", (req: Request, res: Response) => {
     res.status(200).json({ pod: serializedPOD });
   } catch (e) {
     console.error(e);
-    res.status(500).send("Error issue ID POD: " + e);
+    res.status(500).send("Error issuing ID POD: " + e);
   }
 });
 
@@ -61,8 +67,9 @@ debug.post("/paystub/issue", (req: Request, res: Response) => {
     firstName: string;
     lastName: string;
     currentEmployer: string;
-    startDate: string;
+    startDate: number;
     annualSalary: number;
+    socialSecurityNumber: string;
     semaphoreCommitment: string;
   } = req.body;
 
@@ -72,19 +79,19 @@ debug.post("/paystub/issue", (req: Request, res: Response) => {
     !inputs.currentEmployer ||
     !inputs.startDate ||
     !inputs.annualSalary ||
+    !inputs.socialSecurityNumber ||
     !inputs.semaphoreCommitment
   ) {
     res.status(400).send("Missing query parameter");
     return;
   }
 
-  const startDate = Date.parse(inputs.startDate);
-  if (!startDate || startDate > new Date().getTime()) {
+  if (isNaN(inputs.startDate) || inputs.startDate > new Date().getTime()) {
     res.status(400).send("Invalid start date");
     return;
   }
 
-  if (inputs.annualSalary < 0) {
+  if (isNaN(inputs.annualSalary) || inputs.annualSalary < 0) {
     res.status(400).send("Invalid annual salary");
     return;
   }
@@ -96,8 +103,13 @@ debug.post("/paystub/issue", (req: Request, res: Response) => {
         firstName: { type: "string", value: inputs.firstName },
         lastName: { type: "string", value: inputs.lastName },
         currentEmployer: { type: "string", value: inputs.currentEmployer },
-        startDate: { type: "string", value: inputs.startDate },
+        startDate: { type: "int", value: BigInt(inputs.startDate) },
         annualSalary: { type: "int", value: BigInt(inputs.annualSalary) },
+        issueDate: { type: "int", value: BigInt(new Date().getTime()) },
+        socialSecurityNumber: {
+          type: "string",
+          value: inputs.socialSecurityNumber
+        },
         owner: {
           type: "cryptographic",
           value: BigInt(inputs.semaphoreCommitment)
diff --git a/apps/pod-issuer-server/src/routes/deel.ts b/apps/pod-issuer-server/src/routes/deel.ts
index 1087333..974d43e 100644
--- a/apps/pod-issuer-server/src/routes/deel.ts
+++ b/apps/pod-issuer-server/src/routes/deel.ts
@@ -1,49 +1,20 @@
 import express, { Request, Response } from "express";
 import { expressjwt, Request as JWTRequest } from "express-jwt";
-import jwt from "jsonwebtoken";
 import { POD, PODEntries } from "@pcd/pod";
-import {
-  getDeelUserByEmail,
-  getPaystubPODByEmail,
-  savePaystubPOD
-} from "../stores/deel";
+import { getDeelUserByEmail } from "../stores/deel";
+import { handleLogin } from "./util/loginHelper";
+import { checkSemaphoreCommitment } from "../stores/shared";
 
 const deel = express.Router();
 
 deel.post("/login", (req: Request, res: Response) => {
-  const inputs: { email: string; password: string } = req.body;
-  if (!inputs.email || !inputs.password) {
-    res.status(400).send("Missing query parameter");
-    return;
-  }
-
-  // In practice, get user information from database by email,
-  // Here for demo purposes, we'll allow any email with @zoo.com domain
-  if (!inputs.email.endsWith("@zoo.com")) {
-    res.status(401).send("Invalid email or password");
-    return;
-  }
-
-  // In practice, check if the encrypted password match
-  // This is just for demo purposes
-  if (!inputs.password.startsWith("zoo")) {
-    res.status(401).send("Invalid email or password");
-    return;
-  }
-
-  // Signing JWT, valid for 1 hour
-  const token = jwt.sign(
-    { email: inputs.email },
-    process.env.DEEL_EDDSA_PRIVATE_KEY!,
-    { algorithm: "HS512", expiresIn: "1h" }
-  );
-  res.send(token);
+  handleLogin(req, res, process.env.DEEL_JWT_SECRET_KEY!);
 });
 
 deel.post(
   "/issue",
   expressjwt({
-    secret: process.env.DEEL_EDDSA_PRIVATE_KEY!,
+    secret: process.env.DEEL_JWT_SECRET_KEY!,
     algorithms: ["HS512"]
   }),
   async (req: JWTRequest, res: Response) => {
@@ -53,6 +24,9 @@ deel.post(
       return;
     }
 
+    // In practice, the user should have to prove that they
+    // own the semaphore identity secret corresponding to this
+    // semaphore identity commiment.
     const inputs: {
       semaphoreCommitment: string;
     } = req.body;
@@ -63,37 +37,33 @@ deel.post(
     }
 
     try {
-      // We already issued paystub POD for this user, return the POD
-      const podStr = await getPaystubPODByEmail(email);
-      if (podStr !== null) {
-        const pod = POD.deserialize(podStr);
-        const owner = pod.content.asEntries().owner.value;
-        if (owner !== BigInt(inputs.semaphoreCommitment)) {
-          res
-            .status(400)
-            .send(
-              "Already issued POD for this user, but Semaphore Commitment doesn't match."
-            );
-          return;
-        }
-        res.status(200).json({ pod: podStr });
+      if (!checkSemaphoreCommitment(email, inputs.semaphoreCommitment)) {
+        res
+          .status(400)
+          .send("Semaphore commitment does not match what is on the record.");
         return;
       }
 
-      const user = getDeelUserByEmail(email);
+      const user = await getDeelUserByEmail(email);
       if (user === null) {
         res.status(404).send("User not found");
         return;
       }
 
+      // Issue a paystub POD
       // For more info, see https://github.com/proofcarryingdata/zupass/blob/main/examples/pod-gpc-example/src/podExample.ts
       const pod = POD.sign(
         {
           firstName: { type: "string", value: user.firstName },
           lastName: { type: "string", value: user.lastName },
           currentEmployer: { type: "string", value: "ZooPark" },
-          startDate: { type: "string", value: user.startDate },
+          startDate: { type: "int", value: user.startDate },
+          issueDate: { type: "int", value: BigInt(new Date().getTime()) },
           annualSalary: { type: "int", value: BigInt(user.annualSalary) },
+          socialSecurityNumber: {
+            type: "string",
+            value: user.socialSecurityNumber
+          },
           owner: {
             type: "cryptographic",
             value: BigInt(inputs.semaphoreCommitment)
@@ -101,13 +71,12 @@ deel.post(
         } satisfies PODEntries,
         process.env.DEEL_EDDSA_PRIVATE_KEY!
       );
-      const serializedPOD = pod.serialize();
 
-      await savePaystubPOD(email, serializedPOD);
+      const serializedPOD = pod.serialize();
       res.status(200).json({ pod: serializedPOD });
     } catch (e) {
       console.error(e);
-      res.status(500).send("Error issue Paystub POD: " + e);
+      res.status(500).send("Error issuing Paystub POD: " + e);
     }
   }
 );
diff --git a/apps/pod-issuer-server/src/routes/gov.ts b/apps/pod-issuer-server/src/routes/gov.ts
index 7a97776..14215e7 100644
--- a/apps/pod-issuer-server/src/routes/gov.ts
+++ b/apps/pod-issuer-server/src/routes/gov.ts
@@ -1,45 +1,19 @@
 import express, { Request, Response } from "express";
 import { expressjwt, Request as JWTRequest } from "express-jwt";
-import jwt from "jsonwebtoken";
 import { POD, PODEntries } from "@pcd/pod";
 import { getGovUserByEmail, getIDPODByEmail, saveIDPOD } from "../stores/gov";
+import { handleLogin } from "./util/loginHelper";
 
 const gov = express.Router();
 
 gov.post("/login", (req: Request, res: Response) => {
-  const inputs: { email: string; password: string } = req.body;
-  if (!inputs.email || !inputs.password) {
-    res.status(400).send("Missing query parameter");
-    return;
-  }
-
-  // In practice, get user information from database by email,
-  // Here for demo purposes, we'll allow any email with @zoo.com domain
-  if (!inputs.email.endsWith("@zoo.com")) {
-    res.status(401).send("Invalid email or password");
-    return;
-  }
-
-  // In practice, check if the encrypted password match
-  // This is just for demo purposes
-  if (!inputs.password.startsWith("zoo")) {
-    res.status(401).send("Invalid email or password");
-    return;
-  }
-
-  // Signing JWT, valid for 1 hour
-  const token = jwt.sign(
-    { email: inputs.email },
-    process.env.GOV_EDDSA_PRIVATE_KEY!,
-    { algorithm: "HS512", expiresIn: "1h" }
-  );
-  res.send(token);
+  handleLogin(req, res, process.env.GOV_JWT_SECRET_KEY!);
 });
 
 gov.post(
   "/issue",
   expressjwt({
-    secret: process.env.GOV_EDDSA_PRIVATE_KEY!,
+    secret: process.env.GOV_JWT_SECRET_KEY!,
     algorithms: ["HS512"]
   }),
   async (req: JWTRequest, res: Response) => {
@@ -49,6 +23,9 @@ gov.post(
       return;
     }
 
+    // In practice, the user should have to prove that they
+    // own the semaphore identity secret corresponding to this
+    // semaphore identity commiment.
     const inputs: {
       semaphoreCommitment: string;
     } = req.body;
@@ -76,19 +53,25 @@ gov.post(
         return;
       }
 
-      const user = getGovUserByEmail(email);
+      const user = await getGovUserByEmail(email);
       if (user === null) {
         res.status(404).send("User not found");
         return;
       }
 
+      // In this case, we haven't issued a paystub POD for this user yet,
+      // need to issue one and save it for future use.
       // For more info, see https://github.com/proofcarryingdata/zupass/blob/main/examples/pod-gpc-example/src/podExample.ts
       const pod = POD.sign(
         {
           idNumber: { type: "string", value: user.idNumber },
           firstName: { type: "string", value: user.firstName },
           lastName: { type: "string", value: user.lastName },
-          age: { type: "int", value: BigInt(user.age) },
+          dateOfBirth: { type: "int", value: user.dateOfBirth },
+          socialSecurityNumber: {
+            type: "string",
+            value: user.socialSecurityNumber
+          },
           owner: {
             type: "cryptographic",
             value: BigInt(inputs.semaphoreCommitment)
@@ -102,7 +85,7 @@ gov.post(
       res.status(200).json({ pod: serializedPOD });
     } catch (e) {
       console.error(e);
-      res.status(500).send("Error issue ID POD: " + e);
+      res.status(500).send("Error issuing ID POD: " + e);
     }
   }
 );
diff --git a/apps/pod-issuer-server/src/routes/util/loginHelper.ts b/apps/pod-issuer-server/src/routes/util/loginHelper.ts
new file mode 100644
index 0000000..52a5382
--- /dev/null
+++ b/apps/pod-issuer-server/src/routes/util/loginHelper.ts
@@ -0,0 +1,36 @@
+import { Request, Response } from "express";
+import jwt from "jsonwebtoken";
+
+export const handleLogin = (
+  req: Request,
+  res: Response,
+  privateKey: string
+) => {
+  const inputs: { email: string; password: string } = req.body;
+
+  if (!inputs.email || !inputs.password) {
+    res.status(400).send("Missing query parameter");
+    return;
+  }
+
+  // In practice, get user information from database by email,
+  // Here for demo purposes, we'll allow any email with @zoo.com domain
+  if (!inputs.email.endsWith("@zoo.com")) {
+    res.status(401).send("Invalid email or password");
+    return;
+  }
+
+  // In practice, check if the encrypted password match
+  // This is just for demo purposes
+  if (!inputs.password.startsWith("zoo")) {
+    res.status(401).send("Invalid email or password");
+    return;
+  }
+
+  // Signing JWT, valid for 1 hour
+  const token = jwt.sign({ email: inputs.email }, privateKey, {
+    algorithm: "HS512",
+    expiresIn: "1h"
+  });
+  res.send(token);
+};
diff --git a/apps/pod-issuer-server/src/stores/deel.ts b/apps/pod-issuer-server/src/stores/deel.ts
index fcb321f..4ab2746 100644
--- a/apps/pod-issuer-server/src/stores/deel.ts
+++ b/apps/pod-issuer-server/src/stores/deel.ts
@@ -1,54 +1,53 @@
-import Chance from "chance";
 import _ from "lodash";
-import { createClient } from "@vercel/kv";
-
-const podIssuerKV = createClient({
-  url: process.env.KV_REST_API_URL,
-  token: process.env.KV_REST_API_TOKEN,
-  automaticDeserialization: false
-});
-
-const chance = new Chance();
+import {
+  jsonBigSerializer,
+  podIssuerKV,
+  chance,
+  getSSNByEmail
+} from "./shared";
 
 export type DeelUser = {
   email: string;
   // hashedpassword: string;
   firstName: string;
   lastName: string;
-  startDate: string;
-  annualSalary: number;
+  startDate: bigint;
+  annualSalary: bigint;
+  socialSecurityNumber: string;
 };
 
-export function getDeelUserByEmail(email: string): DeelUser | null {
+export async function getDeelUserByEmail(
+  email: string
+): Promise<DeelUser | null> {
   // randomly generate DeelUser fields
   // In practice, look up the user in the database
+
+  const user = await podIssuerKV.hget<string>(email, "deelUser");
+  if (user !== null) {
+    return jsonBigSerializer.parse(user);
+  }
+
   const names = email.replace(/@zoo.com$/, "").split(".");
   if (names.length < 2) {
     return null;
   }
 
   const startDate = chance.birthday({
-    string: true,
-    type: "child"
-  }) as string;
+    year: chance.year({ min: 2000, max: 2022 })
+  }) as Date;
   const annualSalary = chance.integer({ min: 20000, max: 1000000 });
+  const ssn = await getSSNByEmail(email);
 
-  return {
+  const deelUser = {
     email,
     firstName: _.upperFirst(names[0]),
     lastName: _.upperFirst(names[1]),
-    startDate,
-    annualSalary
+    startDate: BigInt(startDate.getTime()),
+    annualSalary: BigInt(annualSalary),
+    socialSecurityNumber: ssn
   };
-}
-
-export async function getPaystubPODByEmail(
-  email: string
-): Promise<string | null> {
-  const key = `paystub-${email}`;
-  return await podIssuerKV.get<string>(key);
-}
-
-export async function savePaystubPOD(email: string, serializedPOD: string) {
-  await podIssuerKV.set(`paystub-${email}`, serializedPOD);
+  await podIssuerKV.hset(email, {
+    deelUser: jsonBigSerializer.stringify(deelUser)
+  });
+  return deelUser;
 }
diff --git a/apps/pod-issuer-server/src/stores/gov.ts b/apps/pod-issuer-server/src/stores/gov.ts
index da70368..cb8eb32 100644
--- a/apps/pod-issuer-server/src/stores/gov.ts
+++ b/apps/pod-issuer-server/src/stores/gov.ts
@@ -1,25 +1,19 @@
-import Chance from "chance";
 import _ from "lodash";
-import { createClient } from "@vercel/kv";
-
-const podIssuerKV = createClient({
-  url: process.env.KV_REST_API_URL,
-  token: process.env.KV_REST_API_TOKEN,
-  automaticDeserialization: false
-});
-
-const chance = new Chance();
+import { podIssuerKV, chance, getSSNByEmail } from "./shared";
 
 export type GovUser = {
   email: string;
   // hashedpassword: string;
   firstName: string;
   lastName: string;
-  age: number;
+  dateOfBirth: bigint;
   idNumber: string;
+  socialSecurityNumber: string;
 };
 
-export function getGovUserByEmail(email: string): GovUser | null {
+export async function getGovUserByEmail(
+  email: string
+): Promise<GovUser | null> {
   // randomly generate GovUser fields
   // In practice, look up the user in the database
   const names = email.replace(/@zoo.com$/, "").split(".");
@@ -27,32 +21,26 @@ export function getGovUserByEmail(email: string): GovUser | null {
     return null;
   }
 
-  const age = chance.age({ type: "adult" });
+  const dateOfBirth = chance.birthday({
+    year: chance.year({ min: 1970, max: 2005 })
+  }) as Date;
   const idNumber = chance.string({ pool: "0123456789", length: 7 });
+  const ssn = await getSSNByEmail(email);
 
   return {
     email,
     firstName: _.upperFirst(names[0]),
     lastName: _.upperFirst(names[1]),
-    age,
-    idNumber: `G${idNumber}`
+    dateOfBirth: BigInt(dateOfBirth.getTime()),
+    idNumber: `G${idNumber}`,
+    socialSecurityNumber: ssn
   };
 }
 
 export async function getIDPODByEmail(email: string): Promise<string | null> {
-  const key = `id-${email}`;
-  return await podIssuerKV.get<string>(key);
+  return await podIssuerKV.hget<string>(email, "idPOD");
 }
 
 export async function saveIDPOD(email: string, serializedPOD: string) {
-  await podIssuerKV.set(`id-${email}`, serializedPOD);
+  await podIssuerKV.hset(email, { idPOD: serializedPOD });
 }
-
-export type DeelUser = {
-  email: string;
-  // hashedpassword: string;
-  firstName: string;
-  lastName: string;
-  startDate: string;
-  annualSalary: number;
-};
diff --git a/apps/pod-issuer-server/src/stores/shared.ts b/apps/pod-issuer-server/src/stores/shared.ts
new file mode 100644
index 0000000..f3d9960
--- /dev/null
+++ b/apps/pod-issuer-server/src/stores/shared.ts
@@ -0,0 +1,42 @@
+import Chance from "chance";
+import JSONBig from "json-bigint";
+import { createClient } from "@vercel/kv";
+
+export const chance = new Chance();
+
+export const jsonBigSerializer = JSONBig({
+  useNativeBigInt: true,
+  alwaysParseAsBig: true
+});
+
+export const podIssuerKV = createClient({
+  url: process.env.KV_REST_API_URL,
+  token: process.env.KV_REST_API_TOKEN,
+  automaticDeserialization: false
+});
+
+export async function getSSNByEmail(email: string) {
+  // randomly generate SSN
+  // In practice, look it up in the database
+  let ssn = await podIssuerKV.hget<string>(email, "ssn");
+  if (!ssn) {
+    ssn = chance.ssn();
+  }
+  await podIssuerKV.hset(email, { ssn: ssn });
+  return ssn;
+}
+
+export async function checkSemaphoreCommitment(
+  email: string,
+  semaphoreCommitment: string
+) {
+  const savedCommitment = await podIssuerKV.hget<string>(
+    email,
+    "semaphoreCommitment"
+  );
+  if (savedCommitment === null) {
+    await podIssuerKV.hset(email, { semaphoreCommitment: semaphoreCommitment });
+    return true;
+  }
+  return savedCommitment === semaphoreCommitment;
+}
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..9670591
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,20 @@
+version: "3.1"
+
+services:
+  # This is the local Redis database that will be running on your computer; Within docker it has the hostname `redis` and it exposes the port 6379 to your pc and other containers
+  redis:
+    image: redis
+    ports:
+      - "6379:6379"
+
+  # This is the serverless router that allows the Vercel KV libraries to send queries to the redis server above (redis:6379)
+  # It uses the port 80 internally, so it is mapped to an arbitrary port 8079, so that it doesn't conflict with your potential web app on port 80
+  # Think of this as local Vercel KV, and you could even rename this to local-vercel-kv if that helps you to understand this structure
+  serverless-redis-http:
+    ports:
+      - "8079:80"
+    image: vzheng41/serverless-redis-http-cors
+    environment:
+      SRH_MODE: env
+      SRH_TOKEN: example_token # This is your local Vercel KV instance's API token (KV_REST_API_TOKEN), and you can change it to anything or keep it as is for development
+      SRH_CONNECTION_STRING: "redis://redis:6379" # Using `redis` hostname since they're in the same Docker network.
diff --git a/package.json b/package.json
index c9834b5..1b60fee 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,9 @@
     "build": "turbo run build",
     "dev": "turbo run dev",
     "lint": "turbo run lint",
-    "format": "prettier --write \"**/*.{ts,tsx,md}\""
+    "format": "prettier --write \"**/*.{ts,tsx,md}\"",
+    "localenv": "turbo run localenv",
+    "localdb": "docker-compose up"
   },
   "devDependencies": {
     "prettier": "^3.2.5",
diff --git a/scripts/eddsaKeyGen.js b/scripts/eddsaKeyGen.js
new file mode 100644
index 0000000..d8b0abf
--- /dev/null
+++ b/scripts/eddsaKeyGen.js
@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+
+// These keys are used for signing PODs. PODs are signed using EdDSA signatures.
+
+// The private keys can be any 32 bytes encoded as Base64 or hex.
+// You can change this to your own private key you choose
+const EDDSA_PRIVATE_KEY =
+  "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef";
+
+const POD = require("@pcd/pod");
+const EDDSA = require("@zk-kit/eddsa-poseidon");
+
+const privateKeyBytes = POD.decodePrivateKey(EDDSA_PRIVATE_KEY);
+const unpackedPublicKey = EDDSA.derivePublicKey(privateKeyBytes);
+const publicKey = POD.encodePublicKey(unpackedPublicKey);
+
+console.log(publicKey);
diff --git a/turbo.json b/turbo.json
index a93a936..c9a3e32 100644
--- a/turbo.json
+++ b/turbo.json
@@ -12,6 +12,9 @@
     "dev": {
       "cache": false,
       "persistent": true
+    },
+    "localenv": {
+      "dependsOn": ["^localenv"]
     }
   },
   "globalEnv": [
@@ -26,6 +29,8 @@
     "PORT",
     "GOV_EDDSA_PRIVATE_KEY",
     "DEEL_EDDSA_PRIVATE_KEY",
+    "GOV_JWT_SECRET_KEY",
+    "DEEL_JWT_SECRET_KEY",
     "KV_REST_API_URL",
     "KV_REST_API_TOKEN",
     "NEXT_PUBLIC_GOV_EDDSA_PUBLIC_KEY",