diff --git a/complete/src/main/java/com/example/restservice/config/JacksonConfiguration.java b/complete/src/main/java/com/example/restservice/config/JacksonConfiguration.java
new file mode 100644
index 0000000..b79759b
--- /dev/null
+++ b/complete/src/main/java/com/example/restservice/config/JacksonConfiguration.java
@@ -0,0 +1,17 @@
+package com.example.restservice.config;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class JacksonConfiguration {
+    @Bean
+    public ObjectMapper objectMapper() {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+        return mapper;
+    }
+}
diff --git a/complete/src/main/java/com/example/restservice/controller/QueueController.java b/complete/src/main/java/com/example/restservice/controller/QueueController.java
index f4a49ca..b3c8b3a 100644
--- a/complete/src/main/java/com/example/restservice/controller/QueueController.java
+++ b/complete/src/main/java/com/example/restservice/controller/QueueController.java
@@ -1,22 +1,15 @@
 package com.example.restservice.controller;
 
-import com.example.restservice.controller.model.queue.CreateQueueRequest;
-import com.example.restservice.controller.model.queue.CreateQueueResponse;
-import com.example.restservice.controller.model.queue.MyQueuesResponse;
-import com.example.restservice.controller.model.queue.QueueDetailsResponse;
-import com.example.restservice.controller.model.queue.QueueStatusResponse;
+import com.example.restservice.controller.model.queue.*;
+import com.example.restservice.dao.CustomQuestions;
 import com.example.restservice.service.QueueService;
-import javax.validation.Valid;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
 
 @RestController
 @RequestMapping("/v1")
@@ -54,4 +47,11 @@ public ResponseEntity<QueueStatusResponse> getQueueStatus(
       return new ResponseEntity(HttpStatus.BAD_REQUEST); // Todo Give reason
     }
   }
+
+  @PostMapping(path = "/queue/{queueId}/custom-questions")
+  public ResponseEntity<CustomQuestions> createCustomQuestions(
+          @PathVariable("queueId") String queueId,
+          @RequestBody String customQuestions) throws JsonProcessingException {
+    return ResponseEntity.ok(queueService.createCustomQuestions(queueId ,customQuestions));
+  }
 }
diff --git a/complete/src/main/java/com/example/restservice/controller/model/queue/QueueStatusResponse.java b/complete/src/main/java/com/example/restservice/controller/model/queue/QueueStatusResponse.java
index 136bea7..1b0727d 100644
--- a/complete/src/main/java/com/example/restservice/controller/model/queue/QueueStatusResponse.java
+++ b/complete/src/main/java/com/example/restservice/controller/model/queue/QueueStatusResponse.java
@@ -1,8 +1,10 @@
 package com.example.restservice.controller.model.queue;
 
-import java.util.Date;
+import com.example.restservice.dao.CustomQuestions;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class QueueStatusResponse {
 
@@ -12,4 +14,5 @@ public class QueueStatusResponse {
   final Long numberOfActiveTokens;
   final Long totalNumberOfTokens;
   final Date queueCreationTimestamp;
+  final CustomQuestions customQuestions;
 }
diff --git a/complete/src/main/java/com/example/restservice/dao/CustomQuestions.java b/complete/src/main/java/com/example/restservice/dao/CustomQuestions.java
new file mode 100644
index 0000000..c6dbc93
--- /dev/null
+++ b/complete/src/main/java/com/example/restservice/dao/CustomQuestions.java
@@ -0,0 +1,63 @@
+package com.example.restservice.dao;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.UUID;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CustomQuestions {
+
+    @JsonProperty("questions")
+    List<Question> questions;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public static class Question {
+        @JsonProperty("questionId")
+        private String questionId;
+        @JsonProperty("type")
+        private String type;
+        @JsonProperty("label")
+        private String label;
+        @JsonProperty("repeatable")
+        private Boolean repeatable;
+        @JsonProperty("subQuestions")
+        private List<SubQuestion> subQuestions;
+
+        public Question() {
+            if(this.questionId == null) {
+                this.questionId = UUID.randomUUID().toString();
+            }
+        }
+
+        @JsonInclude(JsonInclude.Include.NON_NULL)
+        public static class Option {
+            @JsonProperty("text")
+            private String text;
+        }
+
+        @JsonInclude(JsonInclude.Include.NON_NULL)
+        public static class SubQuestion {
+            @JsonProperty("questionId")
+            private String questionId;
+            @JsonProperty("label")
+            private String label;
+            @JsonProperty("type")
+            private String type;
+            @JsonProperty("options")
+            private List<Option> options;
+
+            public SubQuestion() {
+                if(this.questionId == null) {
+                    this.questionId = UUID.randomUUID().toString();
+                }
+            }
+        }
+    }
+}
diff --git a/complete/src/main/java/com/example/restservice/dao/Queue.java b/complete/src/main/java/com/example/restservice/dao/Queue.java
index 29f860d..9ed9e80 100644
--- a/complete/src/main/java/com/example/restservice/dao/Queue.java
+++ b/complete/src/main/java/com/example/restservice/dao/Queue.java
@@ -1,21 +1,14 @@
 package com.example.restservice.dao;
 
-import java.util.Date;
-import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hibernate.annotations.GenericGenerator;
 
+import javax.persistence.*;
+import java.util.Date;
+import java.util.List;
+
 @Entity
 @Table(name = "queue")
 @Getter
@@ -40,6 +33,9 @@ public class Queue {
   @Temporal(TemporalType.TIMESTAMP)
   Date queueCreationTimestamp;
 
+  @Column(length = 100000)
+  private String customQuestions;
+
   public Queue(String queueName, String ownerId) {
     this.queueName = queueName;
     this.ownerId = ownerId;
diff --git a/complete/src/main/java/com/example/restservice/service/QueueService.java b/complete/src/main/java/com/example/restservice/service/QueueService.java
index be1302e..b13b848 100644
--- a/complete/src/main/java/com/example/restservice/service/QueueService.java
+++ b/complete/src/main/java/com/example/restservice/service/QueueService.java
@@ -7,6 +7,7 @@
 import com.example.restservice.controller.model.queue.MyQueuesResponse;
 import com.example.restservice.controller.model.queue.QueueDetailsResponse;
 import com.example.restservice.controller.model.queue.QueueStatusResponse;
+import com.example.restservice.dao.CustomQuestions;
 import com.example.restservice.dao.Queue;
 import com.example.restservice.dao.QueueRepository;
 import com.example.restservice.dao.Token;
@@ -14,11 +15,16 @@
 import com.example.restservice.exceptions.SQInternalServerException;
 import com.example.restservice.exceptions.SQInvalidRequestException;
 import java.util.Comparator;
+import java.util.function.BooleanSupplier;
 import java.util.stream.Collectors;
 import javax.transaction.Transactional;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Service;
+import springfox.documentation.spring.web.json.Json;
 
 @Service
 @RequiredArgsConstructor
@@ -26,6 +32,7 @@ public class QueueService {
 
   private final QueueRepository queueRepository;
   private final LoggedInUserInfo loggedInUserInfo;
+  private final ObjectMapper mapper;
 
   @Transactional
   public CreateQueueResponse createQueue(CreateQueueRequest createQueueRequest) {
@@ -68,14 +75,25 @@ public QueueStatusResponse getQueueStatus(String queueId) {
         .findById(queueId)
         .map(
             queue ->
-                new QueueStatusResponse(
-                    queueId,
-                    queue.getQueueName(),
-                    queue.getTokens().stream()
-                        .filter(user -> user.getStatus().equals(TokenStatus.WAITING))
-                        .count(),
-                    Long.valueOf(queue.getTokens().size()),
-                    queue.getQueueCreationTimestamp()))
+            {
+                try {
+                    CustomQuestions customQuestions = queue.getCustomQuestions() != null
+                            ? mapper.readValue(queue.getCustomQuestions(), CustomQuestions.class)
+                            : null;
+                    return new QueueStatusResponse(
+                        queueId,
+                        queue.getQueueName(),
+                        queue.getTokens().stream()
+                            .filter(user -> user.getStatus().equals(TokenStatus.WAITING))
+                            .count(),
+                        Long.valueOf(queue.getTokens().size()),
+                        queue.getQueueCreationTimestamp(),
+                        customQuestions);
+                } catch (JsonProcessingException e) {
+                    e.printStackTrace();
+                }
+                return null;
+            })
         .orElseThrow(SQInvalidRequestException::queueNotFoundException);
   }
 
@@ -99,14 +117,46 @@ public QueueStatusResponse getQueueStatusByName(String queueName) {
         .findByQueueName(queueName)
         .map(
             queue ->
-                new QueueStatusResponse(
-                    queue.getQueueId(),
-                    queue.getQueueName(),
-                    queue.getTokens().stream()
-                        .filter(user -> user.getStatus().equals(TokenStatus.WAITING))
-                        .count(),
-                    Long.valueOf(queue.getTokens().size()),
-                    queue.getQueueCreationTimestamp()))
+            {
+                try {
+                    CustomQuestions customQuestions = queue.getCustomQuestions() != null
+                            ? mapper.readValue(queue.getCustomQuestions(), CustomQuestions.class)
+                            : null;
+                    return new QueueStatusResponse(
+                        queue.getQueueId(),
+                        queue.getQueueName(),
+                        queue.getTokens().stream()
+                            .filter(user -> user.getStatus().equals(TokenStatus.WAITING))
+                            .count(),
+                        Long.valueOf(queue.getTokens().size()),
+                        queue.getQueueCreationTimestamp(),
+                        customQuestions);
+                } catch (JsonProcessingException e) {
+                    e.printStackTrace();
+                }
+                return null;
+            })
         .orElseThrow(SQInvalidRequestException::queueNotFoundException);
   }
+
+  @Transactional
+  public CustomQuestions createCustomQuestions(String queueId, String customQuestions) throws JsonProcessingException {
+    CustomQuestions customQuestionsObject = mapper.readValue(customQuestions, CustomQuestions.class);
+    var queue =  queueRepository
+            .findById(queueId)
+            .map(
+                queue1 -> {
+                  if (!queue1.getOwnerId().equals(loggedInUserInfo.getUserId())) {
+                    throw new SQAccessDeniedException("You do not have access to this queue");
+                  }
+                    try {
+                        queue1.setCustomQuestions(mapper.writeValueAsString(customQuestionsObject));
+                    } catch (JsonProcessingException e) {
+                        e.printStackTrace();
+                    }
+                    return queueRepository.save(queue1);
+                })
+            .orElseThrow(SQInvalidRequestException::queueNotFoundException);
+    return customQuestionsObject;
+  }
 }