diff --git a/src/pages/exercises/object-exam/_assets/object-exams.pu b/src/pages/exercises/object-exam/_assets/object-exams.pu
index 36cf076..5e600ad 100644
--- a/src/pages/exercises/object-exam/_assets/object-exams.pu
+++ b/src/pages/exercises/object-exam/_assets/object-exams.pu
@@ -3,12 +3,12 @@ skinparam classAttributeIconSize 0
 skinparam monochrome true
 hide circle
 
-class Exams {
+class Exam {
   -weight: Weight
   -answer: Answer
-  -exams: Exam
+  -exams: Array<Answer>
   +__construct(answer: Answer, weight: Weight)
-  +add(exam: Exam): void
+  +add(exam: Answer): void
   +avg(): float
   +min([count: float]): Array<float>
   +max([count: float]): Array<float>
diff --git a/src/pages/exercises/object-exam/_assets/object-exams.svg b/src/pages/exercises/object-exam/_assets/object-exams.svg
index 70826c1..a484695 100644
--- a/src/pages/exercises/object-exam/_assets/object-exams.svg
+++ b/src/pages/exercises/object-exam/_assets/object-exams.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="226px" preserveAspectRatio="none" style="width:366px;height:226px;background:#FFFFFF;" version="1.1" viewBox="0 0 366 226" width="366px" zoomAndPan="magnify"><defs/><g><!--class Exams--><g id="elem_Exams"><rect codeLine="5" fill="#F1F1F1" height="205.2656" id="Exams" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="345" x="7" y="7"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="46" x="156.5" y="24.9951">Exams</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="351" y1="33.2969" y2="33.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="50.292">-weight: Weight</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="66.5889">-answer: Answer</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="13" y="82.8857">-exams: Exam</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="351" y1="90.1875" y2="90.1875"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="333" x="13" y="107.1826">+__construct(answer: Answer, weight: Weight)</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="173" x="13" y="123.4795">+add(exam: Exam): void</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="89" x="13" y="139.7764">+avg(): float</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="245" x="13" y="156.0732">+min([count: float]): Array&lt;float&gt;</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="248" x="13" y="172.3701">+max([count: float]): Array&lt;float&gt;</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="221" x="13" y="188.667">+lt([limit: float]): Array&lt;float&gt;</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="226" x="13" y="204.9639">+gt([limit: float]): Array&lt;float&gt;</text></g><!--SRC=[XOqx2m8n48Jx_8ej8ofO7o9SOM5jOI4YQswzMyn3afnF_EycKGGRhOQP_MOs7DWUqQC1fJ64EaRFkpxIGZcxv1l1H8GFOfnrglFE44JVa-Yu8L3ibIOXIX_c5pG1xW9WV2PkkrZ1gcXEq8Op-GhgeZcXZ5UbbUnmkqrlGzfMKNx38_YU6sGScqRcXTV0e8AJuwOSJgrCTgyTviT3mrQkbUjjV8URTAszn-kqs5c1yF8Vqb6kDHl-nRJ_cCSJ]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="226px" preserveAspectRatio="none" style="width:356px;height:226px;background:#FFFFFF;" version="1.1" viewBox="0 0 356 226" width="356px" zoomAndPan="magnify"><defs/><g><!--class Exam--><g id="elem_Exam"><rect codeLine="5" fill="#F1F1F1" height="205.2656" id="Exam" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="335" x="7" y="7"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="37" x="156" y="24.9951">Exam</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="341" y1="33.2969" y2="33.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="108" x="13" y="50.292">-weight: Weight</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="115" x="13" y="66.5889">-answer: Answer</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="168" x="13" y="82.8857">-exams: Array&lt;Answer&gt;</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="341" y1="90.1875" y2="90.1875"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="323" x="13" y="107.1826">+__construct(answer: Answer, weight: Weight)</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="182" x="13" y="123.4795">+add(exam: Answer): void</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="84" x="13" y="139.7764">+avg(): float</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="231" x="13" y="156.0732">+min([count: float]): Array&lt;float&gt;</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="234" x="13" y="172.3701">+max([count: float]): Array&lt;float&gt;</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="201" x="13" y="188.667">+lt([limit: float]): Array&lt;float&gt;</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="207" x="13" y="204.9639">+gt([limit: float]): Array&lt;float&gt;</text></g><!--SRC=[XOwx3i8m34NtV8N7L834N24a1WPc1eOAeP2QrY8FbAIqWFXtal2GM62oV7piQtyaSn9EQ91AUBy8mT6-2xYIrgpfYZ1b_gDeQwnidTK8mNN8MgeH93cfaB6y3yiXUZS6CEcHcZQKiCar4M5yZww4HQw9OBHz1Cw9o-o9vv6FThiOxsE63FnxQmpVTukaYxhcwTHRAaeuMwhpwDpms1wK5Uc7aIR3Asax4rvmMxppSvlZjHZ-IohmIf6cNqxppxa_0000]--></g></svg>
\ No newline at end of file
diff --git a/src/pages/exercises/object-exam/_codes/js/code/exam.print.js b/src/pages/exercises/object-exam/_codes/js/code/exam.print.js
index 5e2f612..c8a5166 100644
--- a/src/pages/exercises/object-exam/_codes/js/code/exam.print.js
+++ b/src/pages/exercises/object-exam/_codes/js/code/exam.print.js
@@ -3,12 +3,17 @@ import { Exam } from './exam.js';
 // Exam Tool
 
 const weight = { q1: 2, q2: 2, q3: 2, q4: 2, q5: 2 };
-const answer = { q1: 'a', q2: 'b', q3: 'a', q4: 'c', q5: 'd' };
+
+const answer = {
+  person: 'Professor',
+  values: { q1: 'a', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
+};
+
 const exam = new Exam(answer, weight);
 
 exam.add({
   student: 'Alice',
-  answer: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
+  values: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
 });
 
 console.log(exam.avg());
@@ -28,7 +33,7 @@ console.log([]);
 
 exam.add({
   student: 'Bob',
-  answer: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
+  values: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
 });
 
 console.log(exam.avg());
diff --git a/src/pages/exercises/object-exam/_codes/js/code/exam.test.js b/src/pages/exercises/object-exam/_codes/js/code/exam.test.js
index 17cb610..6f11824 100644
--- a/src/pages/exercises/object-exam/_codes/js/code/exam.test.js
+++ b/src/pages/exercises/object-exam/_codes/js/code/exam.test.js
@@ -8,7 +8,10 @@ describe('Exam Tool', () => {
   beforeEach(() => {
     const weight = { q1: 2, q2: 2, q3: 2, q4: 2, q5: 2 };
 
-    const answer = { q1: 'a', q2: 'b', q3: 'a', q4: 'c', q5: 'd' };
+    const answer = {
+      person: 'Professor',
+      values: { q1: 'a', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
+    };
 
     exam = new Exam(answer, weight);
   });
@@ -16,14 +19,14 @@ describe('Exam Tool', () => {
   it('should calculate average', () => {
     exam.add({
       student: 'Alice',
-      answer: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
+      values: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
     });
 
     assert.equal(exam.avg(), 4);
 
     exam.add({
       student: 'Bob',
-      answer: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
+      values: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
     });
 
     assert.equal(exam.avg(), 6);
@@ -32,14 +35,14 @@ describe('Exam Tool', () => {
   it('should calculate minimum value', () => {
     exam.add({
       student: 'Alice',
-      answer: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
+      values: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
     });
 
     assert.deepEqual(exam.min(), [4]);
 
     exam.add({
       student: 'Bob',
-      answer: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
+      values: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
     });
 
     assert.deepEqual(exam.min(), [4]);
@@ -48,14 +51,14 @@ describe('Exam Tool', () => {
   it('should calculate minimum value', () => {
     exam.add({
       student: 'Alice',
-      answer: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
+      values: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
     });
 
     assert.deepEqual(exam.min(), [4]);
 
     exam.add({
       student: 'Bob',
-      answer: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
+      values: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
     });
 
     assert.deepEqual(exam.min(), [4]);
@@ -64,14 +67,14 @@ describe('Exam Tool', () => {
   it('should calculate maximum value', () => {
     exam.add({
       student: 'Alice',
-      answer: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
+      values: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
     });
 
     assert.deepEqual(exam.max(), [4]);
 
     exam.add({
       student: 'Bob',
-      answer: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
+      values: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
     });
 
     assert.deepEqual(exam.max(), [8]);
@@ -80,14 +83,14 @@ describe('Exam Tool', () => {
   it('should calculate the values is less than a value', () => {
     exam.add({
       student: 'Alice',
-      answer: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
+      values: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
     });
 
     assert.deepEqual(exam.lt(7), [4]);
 
     exam.add({
       student: 'Bob',
-      answer: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
+      values: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
     });
 
     assert.deepEqual(exam.lt(7), [4]);
@@ -96,14 +99,14 @@ describe('Exam Tool', () => {
   it('should calculate the values is greater than a value', () => {
     exam.add({
       student: 'Alice',
-      answer: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
+      values: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
     });
 
     assert.deepEqual(exam.gt(7), []);
 
     exam.add({
       student: 'Bob',
-      answer: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
+      values: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
     });
 
     assert.deepEqual(exam.gt(7), [8]);
diff --git a/src/pages/exercises/object-exam/_codes/js/response/exam.js b/src/pages/exercises/object-exam/_codes/js/response/exam.js
index 0535c67..b7a453e 100644
--- a/src/pages/exercises/object-exam/_codes/js/response/exam.js
+++ b/src/pages/exercises/object-exam/_codes/js/response/exam.js
@@ -6,8 +6,10 @@ export class Exam {
   }
 
   add(exam) {
-    exam.grade = Object.keys(exam.answer).reduce((total, q) => {
-      return total + (exam.answer[q] === this.answer[q] ? this.weight[q] : 0);
+    exam.grade = Object.keys(exam.values).reduce((total, q) => {
+      return (
+        total + (exam.values[q] === this.answer.values[q] ? this.weight[q] : 0)
+      );
     }, 0);
 
     this.exams.push(exam);
diff --git a/src/pages/exercises/object-exam/_codes/js/response/exam.print.js b/src/pages/exercises/object-exam/_codes/js/response/exam.print.js
index 5e2f612..c8a5166 100644
--- a/src/pages/exercises/object-exam/_codes/js/response/exam.print.js
+++ b/src/pages/exercises/object-exam/_codes/js/response/exam.print.js
@@ -3,12 +3,17 @@ import { Exam } from './exam.js';
 // Exam Tool
 
 const weight = { q1: 2, q2: 2, q3: 2, q4: 2, q5: 2 };
-const answer = { q1: 'a', q2: 'b', q3: 'a', q4: 'c', q5: 'd' };
+
+const answer = {
+  person: 'Professor',
+  values: { q1: 'a', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
+};
+
 const exam = new Exam(answer, weight);
 
 exam.add({
   student: 'Alice',
-  answer: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
+  values: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
 });
 
 console.log(exam.avg());
@@ -28,7 +33,7 @@ console.log([]);
 
 exam.add({
   student: 'Bob',
-  answer: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
+  values: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
 });
 
 console.log(exam.avg());
diff --git a/src/pages/exercises/object-exam/_codes/js/response/exam.test.js b/src/pages/exercises/object-exam/_codes/js/response/exam.test.js
index 17cb610..6f11824 100644
--- a/src/pages/exercises/object-exam/_codes/js/response/exam.test.js
+++ b/src/pages/exercises/object-exam/_codes/js/response/exam.test.js
@@ -8,7 +8,10 @@ describe('Exam Tool', () => {
   beforeEach(() => {
     const weight = { q1: 2, q2: 2, q3: 2, q4: 2, q5: 2 };
 
-    const answer = { q1: 'a', q2: 'b', q3: 'a', q4: 'c', q5: 'd' };
+    const answer = {
+      person: 'Professor',
+      values: { q1: 'a', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
+    };
 
     exam = new Exam(answer, weight);
   });
@@ -16,14 +19,14 @@ describe('Exam Tool', () => {
   it('should calculate average', () => {
     exam.add({
       student: 'Alice',
-      answer: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
+      values: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
     });
 
     assert.equal(exam.avg(), 4);
 
     exam.add({
       student: 'Bob',
-      answer: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
+      values: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
     });
 
     assert.equal(exam.avg(), 6);
@@ -32,14 +35,14 @@ describe('Exam Tool', () => {
   it('should calculate minimum value', () => {
     exam.add({
       student: 'Alice',
-      answer: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
+      values: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
     });
 
     assert.deepEqual(exam.min(), [4]);
 
     exam.add({
       student: 'Bob',
-      answer: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
+      values: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
     });
 
     assert.deepEqual(exam.min(), [4]);
@@ -48,14 +51,14 @@ describe('Exam Tool', () => {
   it('should calculate minimum value', () => {
     exam.add({
       student: 'Alice',
-      answer: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
+      values: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
     });
 
     assert.deepEqual(exam.min(), [4]);
 
     exam.add({
       student: 'Bob',
-      answer: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
+      values: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
     });
 
     assert.deepEqual(exam.min(), [4]);
@@ -64,14 +67,14 @@ describe('Exam Tool', () => {
   it('should calculate maximum value', () => {
     exam.add({
       student: 'Alice',
-      answer: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
+      values: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
     });
 
     assert.deepEqual(exam.max(), [4]);
 
     exam.add({
       student: 'Bob',
-      answer: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
+      values: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
     });
 
     assert.deepEqual(exam.max(), [8]);
@@ -80,14 +83,14 @@ describe('Exam Tool', () => {
   it('should calculate the values is less than a value', () => {
     exam.add({
       student: 'Alice',
-      answer: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
+      values: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
     });
 
     assert.deepEqual(exam.lt(7), [4]);
 
     exam.add({
       student: 'Bob',
-      answer: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
+      values: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
     });
 
     assert.deepEqual(exam.lt(7), [4]);
@@ -96,14 +99,14 @@ describe('Exam Tool', () => {
   it('should calculate the values is greater than a value', () => {
     exam.add({
       student: 'Alice',
-      answer: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
+      values: { q1: 'a', q2: 'b', q3: 'b', q4: 'b', q5: 'b' },
     });
 
     assert.deepEqual(exam.gt(7), []);
 
     exam.add({
       student: 'Bob',
-      answer: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
+      values: { q1: 'c', q2: 'b', q3: 'a', q4: 'c', q5: 'd' },
     });
 
     assert.deepEqual(exam.gt(7), [8]);