diff --git a/microservices/S3Bucket/Controllers/AuthController.cs b/microservices/S3Bucket/Controllers/AuthController.cs
index e5bed75..ba00ff4 100644
--- a/microservices/S3Bucket/Controllers/AuthController.cs
+++ b/microservices/S3Bucket/Controllers/AuthController.cs
@@ -151,7 +151,7 @@ namespace OnlineAssessment.Controllers
         }
 
         [Route("updateFile")]
-        [HttpPut]
+        [HttpPost]
         public async Task<IActionResult> UpdateFile(UploadFileName uploadFileName, string fileName)
         {
             var result = await _AWSS3FileService.UpdateFile(uploadFileName, fileName);
@@ -159,7 +159,7 @@ namespace OnlineAssessment.Controllers
         }
 
         [Route("deleteMyPic")]
-        [HttpDelete]
+        [HttpPost]
         [Authorize(Roles = "Admin,Teacher,Student")]
         public async Task<IActionResult> DeleteMyPic()
         {
@@ -178,7 +178,7 @@ namespace OnlineAssessment.Controllers
         }
 
         [Route("deleteFile/{fileName}")]
-        [HttpDelete]
+        [HttpPost]
         public async Task<IActionResult> DeleteFile(string fileName)
         {
             var result = await _AWSS3FileService.DeleteFile(fileName);
diff --git a/microservices/_layers/data/EFCore/EFCoreExamAttemptRepository.cs b/microservices/_layers/data/EFCore/EFCoreExamAttemptRepository.cs
index 9269463..0c0718c 100644
--- a/microservices/_layers/data/EFCore/EFCoreExamAttemptRepository.cs
+++ b/microservices/_layers/data/EFCore/EFCoreExamAttemptRepository.cs
@@ -394,7 +394,7 @@ namespace OnlineAssessment.Data.EFCore
                 details.total_time = (int)exam.ExamDurationInSeconds;
                 details.total_likes = _context.BookmarkedExams.Where(b => b.ExamId == exam_id && b.IsActive == true).ToList().Count; ;
                 details.author_id = exam.CreatedBy;
-                //details.points_needed = 0;
+                details.points_needed = 0;
                 details.attempts_allowed = (int)exam.AttemptsAllowed;
 
                 /* SUBSDELETE
@@ -410,10 +410,10 @@ namespace OnlineAssessment.Data.EFCore
                     SubscribedExams subsExam = _context.SubscribedExams.Where(se => se.SubscriptionId == svm.id && se.ExamId == exam_id && se.IsActive == true).FirstOrDefault();
                     details.isSubscribed = subsExam != null ? true : false;
                 }
-                
+                */
                 details.points_available = 1;
                 details.isSubscribed = true;
-                */
+                
 
                 List <ExamAttempts> allAttempts = _context.ExamAttempts.Where(a => a.ExamId == exam_id && a.IsActive == true).ToList();
                 List<ExamAttempts> myAttempts;
diff --git a/microservices/_layers/data/EFCore/EfCoreCommonRepository.cs b/microservices/_layers/data/EFCore/EfCoreCommonRepository.cs
index 472681e..f948735 100644
--- a/microservices/_layers/data/EFCore/EfCoreCommonRepository.cs
+++ b/microservices/_layers/data/EFCore/EfCoreCommonRepository.cs
@@ -1147,9 +1147,9 @@ namespace OnlineAssessment.Data.EFCore
                                                  name = e.Name,
                                                  sections_count = 0,//_context.ExamSections.Where(es => es.IsActive == true && es.ExamId == e.Id).ToList().Count,
                                                  sections_status = StatusCode.DRAFT.ToString(),
-                                                 //examtype_id = (int)e.ExamTypeId,
-                                                 //language_id = e.LanguageId,
-                                                 //exam_status = e.ExamStatus,
+                                                 examtype_id = (int)e.ExamTypeId, //Comment
+                                                 language_id = e.LanguageId, //Comment
+                                                 exam_status = e.ExamStatus,
                                                  //complexity = (short)e.Complexity,
                                                  created_on = e.CreatedOn,
                                                  updated_on = e.UpdatedOn,
@@ -1330,7 +1330,7 @@ namespace OnlineAssessment.Data.EFCore
                                                module_id = p.ModuleId,
                                                language_code = _context.Languages.Where(l => l.Id == p.LanguageId).FirstOrDefault().Code.ToString(),
                                                status = p.Status,
-                                               complexity = (short)p.Complexity,
+                                               //complexity = (short)p.Complexity,
                                                start_date = p.OpenDatetime,
                                                created_on = p.CreatedOn,
                                                updated_on = p.UpdatedOn,
diff --git a/microservices/admin/V1/Controllers/ExamTypesController.cs b/microservices/admin/V1/Controllers/ExamTypesController.cs
index 4a88861..7e4ea2f 100644
--- a/microservices/admin/V1/Controllers/ExamTypesController.cs
+++ b/microservices/admin/V1/Controllers/ExamTypesController.cs
@@ -107,7 +107,7 @@ namespace OnlineAssessment.V1.Controllers
         /// This endpoint will update the examtype(SU).
         /// </summary>
         /// <returns></returns>
-        [HttpPut("{id}")]
+        [HttpPost("{id}/Update")]
         [Authorize(Roles = "SuperAdmin")]
         public IActionResult UpdateExamType(int id, [FromBody] ExamTypeEditModel theExamType)
         {
@@ -134,7 +134,7 @@ namespace OnlineAssessment.V1.Controllers
         /// This endpoint will restore the deleted examtypes(SU).
         /// </summary>
         /// <returns></returns>
-        [HttpPut("{id}/Restore")]
+        [HttpPost("{id}/Restore")]
         [Authorize(Roles = "SuperAdmin")]
         public IActionResult RestoreExamType(int id)
         {
diff --git a/microservices/admin/V1/Controllers/InstitutesController.cs b/microservices/admin/V1/Controllers/InstitutesController.cs
index 619d5e6..e40ef35 100644
--- a/microservices/admin/V1/Controllers/InstitutesController.cs
+++ b/microservices/admin/V1/Controllers/InstitutesController.cs
@@ -104,7 +104,7 @@ namespace OnlineAssessment.V1.Controllers
         }
 
 
-        [HttpPut("{id}")]
+        [HttpPost("{id}/Update")]
         [Authorize(Roles = "SuperAdmin")]
         public IActionResult UpdateInstitute(int id, [FromBody] InstituteEditModel theInstitute)
         {
diff --git a/microservices/admin/V1/Controllers/LanguagesController.cs b/microservices/admin/V1/Controllers/LanguagesController.cs
index 44d731b..575ae76 100644
--- a/microservices/admin/V1/Controllers/LanguagesController.cs
+++ b/microservices/admin/V1/Controllers/LanguagesController.cs
@@ -134,7 +134,7 @@ namespace OnlineAssessment.V1.Controllers
         /// This endpoint will update the language(SU).
         /// </summary>
         /// <returns></returns>
-        [HttpPut("{id}")]
+        [HttpPost("{id}/Update")]
         [Authorize(Roles = "SuperAdmin")]
         public IActionResult UpdateLanguage(int id, [FromBody] LanguageEditModel theLanguage)
         {
@@ -161,7 +161,7 @@ namespace OnlineAssessment.V1.Controllers
         /// This endpoint will restore the deleted languages(SU).
         /// </summary>
         /// <returns></returns>
-        [HttpPut("{id}/Restore")]
+        [HttpPost("{id}/Restore")]
         [Authorize(Roles = "SuperAdmin")]
         public IActionResult RestoreLanguage(int id)
         {
diff --git a/microservices/admin/V1/Controllers/QuestionTypesController.cs b/microservices/admin/V1/Controllers/QuestionTypesController.cs
index 8679fde..b017a73 100644
--- a/microservices/admin/V1/Controllers/QuestionTypesController.cs
+++ b/microservices/admin/V1/Controllers/QuestionTypesController.cs
@@ -106,7 +106,7 @@ namespace OnlineAssessment.V1.Controllers
         /// This endpoint will update the language(SU).
         /// </summary>
         /// <returns></returns>
-        [HttpPut("{id}")]
+        [HttpPost("{id}/Update")]
         [Authorize(Roles = "SuperAdmin")]
         public IActionResult UpdateQuestionType(int id, [FromBody] QuestionTypeEditModel theQnsType)
         {
@@ -133,7 +133,7 @@ namespace OnlineAssessment.V1.Controllers
         /// This endpoint will restore the deleted questiontypes(SU).
         /// </summary>
         /// <returns></returns>
-        [HttpPut("{id}/Restore")]
+        [HttpPost("{id}/Restore")]
         [Authorize(Roles = "SuperAdmin")]
         public IActionResult RestoreQuestionType(int id)
         {
diff --git a/microservices/admin/V1/Controllers/RolesController.cs b/microservices/admin/V1/Controllers/RolesController.cs
index 604d8da..a8b3fc8 100644
--- a/microservices/admin/V1/Controllers/RolesController.cs
+++ b/microservices/admin/V1/Controllers/RolesController.cs
@@ -110,7 +110,7 @@ namespace OnlineAssessment.V1.Controllers
         /// This endpoint will update the role(SU).
         /// </summary>
         /// <returns></returns>
-        [HttpPut("{id}")]
+        [HttpPost("{id}/Update")]
         [Authorize(Roles = "SuperAdmin")]
         public IActionResult UpdateRole(int id, [FromBody] RoleEditModel theRole)
         {
@@ -137,7 +137,7 @@ namespace OnlineAssessment.V1.Controllers
         /// This endpoint will restore the deleted role(SU).
         /// </summary>
         /// <returns></returns>
-        [HttpPut("{id}/Restore")]
+        [HttpPost("{id}/Restore")]
         [Authorize(Roles = "SuperAdmin")]
         public IActionResult RestoreRole(int id)
         {
diff --git a/microservices/admin/V1/Controllers/_BaseController.cs b/microservices/admin/V1/Controllers/_BaseController.cs
index aadbfbb..f6bf123 100644
--- a/microservices/admin/V1/Controllers/_BaseController.cs
+++ b/microservices/admin/V1/Controllers/_BaseController.cs
@@ -124,7 +124,7 @@ namespace OnlineAssessment.V1.Controllers
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        [HttpDelete("{id}")]
+        [HttpPost("{id}")]
         public IActionResult Delete(int id)
         {
             IActionResult returnResponse = null;
diff --git a/microservices/institute/V1/Controllers/ExamsController.cs b/microservices/institute/V1/Controllers/ExamsController.cs
index 450414a..0b554e7 100644
--- a/microservices/institute/V1/Controllers/ExamsController.cs
+++ b/microservices/institute/V1/Controllers/ExamsController.cs
@@ -21,7 +21,7 @@ namespace OnlineAssessment.V1.Controllers
         {
             _repository = repository;
         }
-
+        
         #region Exams 
         /// <summary>
         /// Add new exam 
@@ -104,7 +104,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="exam_id"></param>
         /// <param name="examSectionList"></param>
         /// <returns></returns>
-        [HttpPut("Exams/{exam_id}/ArrangeSections")]
+        [HttpPost("Exams/{exam_id}/ArrangeSections")]
         [Authorize(Roles = "Admin")]
         public IActionResult ReorderExamSectionOfTheExam(int exam_id, [FromBody] ExamSectionsList examSectionList)
         {
@@ -124,7 +124,7 @@ namespace OnlineAssessment.V1.Controllers
             }
             return returnResponse;
         }
-
+        
         /// <summary>
         /// Attach Questions To Exam Sections
         /// </summary>
@@ -199,7 +199,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="exam_section_id"></param>
         /// <param name="questionList"></param>
         /// <returns></returns>
-        [HttpPut("ExamSections/{exam_section_id}/MarkQuestions")]
+        [HttpPost("ExamSections/{exam_section_id}/MarkQuestions")]
         [Authorize(Roles = "Admin")]
         public IActionResult AssignMarksToExamSectionQuestions(int exam_section_id, [FromBody] QuestionMarksList questionList)
         {
@@ -225,7 +225,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="exam_id"></param>
         /// <param name="scheduleExam"></param>
         /// <returns></returns>
-        [HttpPut("Exams/{exam_id}/Publish")]
+        [HttpPost("Exams/{exam_id}/Publish")]
         [Authorize(Roles = "Admin")]
         public IActionResult PublishExam(string language, int exam_id, [FromBody] ExamPublishModel scheduleExam)
         {
@@ -417,7 +417,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="exam_id"></param>
         /// <param name="theExam"></param>
         /// <returns></returns>
-        [HttpPut("Exams/{exam_id}")]
+        [HttpPost("Exams/{exam_id}/Update")]
         [Authorize(Roles = "Admin")]
         public IActionResult UpdateExamOfTheInstitute(int exam_id, [FromBody] ExamEditModel theExam)
         {
@@ -442,7 +442,7 @@ namespace OnlineAssessment.V1.Controllers
         /// </summary>
         /// <param name="exam_id"></param>
         /// <returns></returns>
-        [HttpDelete("Exams/{exam_id}")]
+        [HttpPost("Exams/{exam_id}/Delete")]
         [Authorize(Roles = "Admin")]
         public IActionResult DeleteExamOfTheInstitute(int exam_id)
         {
@@ -469,7 +469,7 @@ namespace OnlineAssessment.V1.Controllers
         /// </summary>
         /// <param name="exam_section_id"></param>
         /// <returns></returns>
-        [HttpDelete("ExamSections/{exam_section_id}")]
+        [HttpPost("ExamSections/{exam_section_id}")]
         [Authorize(Roles = "Admin")]
         public IActionResult DeleteExamSectionOfTheInstitute(int exam_section_id)
         {
@@ -560,6 +560,7 @@ namespace OnlineAssessment.V1.Controllers
             }
         }
 */
+        
         /// <summary>
         /// Attach usergroups to Exam  
         /// </summary>
@@ -641,7 +642,7 @@ namespace OnlineAssessment.V1.Controllers
         /// </summary>
         /// <param name="exam_id"></param>
         /// <returns></returns>
-        [HttpPut("Exams/{exam_id}/StopExam")]
+        [HttpPost("Exams/{exam_id}/StopExam")]
         [Authorize(Roles = "Admin")]
         public IActionResult StopExam(int exam_id)
         {
@@ -659,7 +660,8 @@ namespace OnlineAssessment.V1.Controllers
             }
             return returnResponse;
         }
+        
         #endregion
-
+       
     }
 }
diff --git a/microservices/institute/V1/Controllers/InstitutesController.cs b/microservices/institute/V1/Controllers/InstitutesController.cs
index 3c93039..6e0f15b 100644
--- a/microservices/institute/V1/Controllers/InstitutesController.cs
+++ b/microservices/institute/V1/Controllers/InstitutesController.cs
@@ -22,6 +22,7 @@ namespace OnlineAssessment.V1.Controllers
             _repository = repository;
         }
 
+        
         #region Institute
         /// <summary>
         /// Get the detail of a institute
@@ -79,7 +80,7 @@ namespace OnlineAssessment.V1.Controllers
         /// Update the theme of an institute
         /// </summary>
         /// <returns></returns>
-        [HttpPut("Theme")]
+        [HttpPost("Theme/update")]
         [Authorize(Roles = "Admin")]
         public IActionResult UpdateTheme([FromBody] string color)
         {
@@ -224,7 +225,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="class_id"></param>
         /// <param name="theClass"></param>
         /// <returns></returns>
-        [HttpPut("Classes/{class_id}")]
+        [HttpPost("Classes/{class_id}/Update")]
         [Authorize(Roles = "Admin")]
         public IActionResult UpdateClassOfTheInstitute(int class_id, [FromBody] ClassEditModel theClass)
         {
@@ -256,7 +257,7 @@ namespace OnlineAssessment.V1.Controllers
         /// </summary>
         /// <param name="class_id"></param>
         /// <returns></returns>
-        [HttpDelete("Classes/{class_id}")]
+        [HttpPost("Classes/{class_id}/Delete")]
         [Authorize(Roles = "Admin")]
         public IActionResult DeleteClassOfTheInstitute(int class_id)
         {
@@ -352,7 +353,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="subject_id"></param>
         /// <param name="theSubject"></param>
         /// <returns></returns>
-        [HttpPut("Subjects/{subject_id}")]
+        [HttpPost("Subjects/{subject_id}/Update")]
         [Authorize(Roles = "Admin")]
         public IActionResult UpdateSubjectOfTheInstitute(int subject_id, [FromBody] SubjectEditModel theSubject)
         {
@@ -386,7 +387,7 @@ namespace OnlineAssessment.V1.Controllers
         /// </summary>
         /// <param name="subject_id"></param>
         /// <returns></returns>
-        [HttpDelete("Subjects/{subject_id}")]
+        [HttpPost("Subjects/{subject_id}/Delete")]
         [Authorize(Roles = "Admin")]
         public IActionResult DeleteSubjectOfTheClass(int subject_id)
         {
@@ -482,7 +483,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="category_id"></param>
         /// <param name="theCategory"></param>
         /// <returns></returns>
-        [HttpPut("Categories/{category_id}")]
+        [HttpPost("Categories/{category_id}/Update")]
         [Authorize(Roles = "Admin")]
         public IActionResult UpdateCategoryByID(int category_id, [FromBody] CategoryEditModel theCategory)
         {
@@ -512,7 +513,7 @@ namespace OnlineAssessment.V1.Controllers
         ///  Delete Category (Logic) - category id should be from same institute, category should be active 
         /// <param name="category_id"></param>
         /// <returns></returns>
-        [HttpDelete("Categories/{category_id}")]
+        [HttpPost("Categories/{category_id}/Delete")]
         [Authorize(Roles = "Admin")]
         public IActionResult DeleteCategoryByID(int category_id)
         {
@@ -595,7 +596,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="tag_id"></param>
         /// <param name="tag"></param>
         /// <returns></returns>
-        [HttpPut("Tags/{tag_id}")]
+        [HttpPost("Tags/{tag_id}/Update")]
         [Authorize(Roles = "Admin")]
         public IActionResult UpdateTagOfTheInstitute(int tag_id, [FromBody] TagEditModel tag)
         {
@@ -627,7 +628,7 @@ namespace OnlineAssessment.V1.Controllers
         /// </summary>
         /// <param name="tag_id"></param>
         /// <returns></returns>
-        [HttpDelete("Tags/{tag_id}")]
+        [HttpPost("Tags/{tag_id}/Delete")]
         [Authorize(Roles = "Admin")]
         public IActionResult DeleteTagOfTheInstitute(int tag_id)
         {
@@ -696,5 +697,6 @@ namespace OnlineAssessment.V1.Controllers
 
 
         #endregion
+        
     }
 }
diff --git a/microservices/institute/V1/Controllers/NotificationController.cs b/microservices/institute/V1/Controllers/NotificationController.cs
index 6e7d1ec..e198e46 100644
--- a/microservices/institute/V1/Controllers/NotificationController.cs
+++ b/microservices/institute/V1/Controllers/NotificationController.cs
@@ -23,6 +23,7 @@ namespace OnlineAssessment.V1.Controllers
         }
 
 
+        
         /// <summary>
         /// Attch users to the user group
         /// </summary>
@@ -62,6 +63,6 @@ namespace OnlineAssessment.V1.Controllers
 
             return returnResponse;
         }
-
+        
     }
 }
diff --git a/microservices/institute/V1/Controllers/PlansController.cs b/microservices/institute/V1/Controllers/PlansController.cs
index 723ff73..9903938 100644
--- a/microservices/institute/V1/Controllers/PlansController.cs
+++ b/microservices/institute/V1/Controllers/PlansController.cs
@@ -22,6 +22,7 @@ namespace OnlineAssessment.V1.Controllers
             _repository = repository;
         }
 
+        
         #region Plans
 
         /// <summary>
@@ -59,7 +60,7 @@ namespace OnlineAssessment.V1.Controllers
         /// </summary>
         /// <param name="plan_code"></param>
         /// <returns></returns>
-        [HttpPut("Plans/{plan_code}/Publish")]
+        [HttpPost("Plans/{plan_code}/Publish")]
         [Authorize(Roles = "Admin, Teacher")]
         public IActionResult PublishPlans(string plan_code)
         {
@@ -91,7 +92,7 @@ namespace OnlineAssessment.V1.Controllers
         /// </summary>
         /// <param name="plan_code"></param>
         /// <returns></returns>
-        [HttpPut("Plans/{plan_code}/Delete")]
+        [HttpPost("Plans/{plan_code}/Delete")]
         [Authorize(Roles = "Admin, Teacher")]
         public IActionResult DeletePlans(string plan_code)
         {
@@ -143,5 +144,6 @@ namespace OnlineAssessment.V1.Controllers
         }
 
         #endregion
+        
     }
 }
diff --git a/microservices/institute/V1/Controllers/PracticesController.cs b/microservices/institute/V1/Controllers/PracticesController.cs
index eacb992..091fe13 100644
--- a/microservices/institute/V1/Controllers/PracticesController.cs
+++ b/microservices/institute/V1/Controllers/PracticesController.cs
@@ -23,6 +23,7 @@ namespace OnlineAssessment.V1.Controllers
         }
 
 
+        
         #region Practices 
 
         /// <summary>
@@ -69,7 +70,7 @@ namespace OnlineAssessment.V1.Controllers
         /// </summary>
         /// <param name="practice_id"></param>
         /// <returns></returns>
-        [HttpDelete("Practices/{practice_id}")]
+        [HttpPost("Practices/{practice_id}")]
         [Authorize(Roles = "Admin")]
         public IActionResult DeletePracticeOfTheInstitute(int practice_id)
         {
@@ -430,7 +431,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="practice_id"></param>
         /// <param name="questionList"></param>
         /// <returns></returns>
-        [HttpPut("Practices/{practice_id}/ReviewQuestions")]
+        [HttpPost("Practices/{practice_id}/ReviewQuestions")]
         [Authorize(Roles = "Admin")]
         public IActionResult AssignDurationToPracticeQuestions(int practice_id, [FromBody] QuestionDurationList questionList)
         {
@@ -455,7 +456,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="practice_id"></param>
         /// <param name="schedulePractice"></param>
         /// <returns></returns>
-        [HttpPut("Practices/{practice_id}/Publish")]
+        [HttpPost("Practices/{practice_id}/Publish")]
         [Authorize(Roles = "Admin")]
         public IActionResult PublishPractice(int practice_id, [FromBody] PracticePublishModel schedulePractice)
         {
@@ -548,33 +549,9 @@ namespace OnlineAssessment.V1.Controllers
             return returnResponse;
         }
 
-        /*
-                /// <summary>
-                /// Stop Exam
-                /// </summary>
-                /// <param name="exam_id"></param>
-                /// <returns></returns>
-                [HttpPut("Exams/{exam_id}/StopExam")]
-                [Authorize(Roles = "Admin")]
-                public IActionResult StopExam(int exam_id)
-                {
-                    IActionResult returnResponse = null;
-
-                    int exam_code = _repository.StopExam(exam_id);
-                    if (exam_code < 0)
-                    {
-                        responseMessage = _repository.GetMessageByCode(Message.ObjectNotUpdated.ToString(), Constant.StudyNote);
-                        returnResponse = Ok(ReturnResponse.GetFailureStatus(responseMessage));
-                    }
-                    else
-                    {
-                        returnResponse = Ok(ReturnResponse.GetSuccessStatus(exam_id));
-                    }
-                    return returnResponse;
-                }
-                */
-
+        
         #endregion
+        
 
     }
 }
diff --git a/microservices/institute/V1/Controllers/QuestionsController.cs b/microservices/institute/V1/Controllers/QuestionsController.cs
index 6d725c4..3274718 100644
--- a/microservices/institute/V1/Controllers/QuestionsController.cs
+++ b/microservices/institute/V1/Controllers/QuestionsController.cs
@@ -22,7 +22,7 @@ namespace OnlineAssessment.V1.Controllers
             _repository = repository;
         }
 
-
+        
         #region Questions
 
         /// <summary>
@@ -442,7 +442,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="question_id"></param>
         /// <param name="question"></param>
         /// <returns></returns>
-        [HttpPut("{language}/Questions/{question_id}")]
+        [HttpPost("{language}/Questions/{question_id}/Update")]
         [Authorize(Roles = "Admin")]
         public IActionResult UpdateQuestionOfTheInstitute(string language, int question_id, [FromBody] QuestionEditModel question)
         {
@@ -478,7 +478,7 @@ namespace OnlineAssessment.V1.Controllers
         /// </summary>
         /// <param name="question_id"></param>
         /// <returns></returns>
-        [HttpDelete("Questions/{question_id}")]
+        [HttpPost("Questions/{question_id}/Delete")]
         [Authorize(Roles = "Admin")]
         public IActionResult DeleteQuestionOfTheInstitute(int question_id)
         {
@@ -506,7 +506,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="language"></param>
         /// <param name="questionIdList"></param>
         /// <returns></returns>
-        [HttpDelete("{language}/Questions")]
+        [HttpPost("{language}/Questions/Delete")]
         [Authorize(Roles = "SuperAdmin,Admin")]
         public IActionResult DeleteQuestions(string language, [FromBody] IntegerList questionIdList)
         {
@@ -771,6 +771,6 @@ namespace OnlineAssessment.V1.Controllers
         }
 
         #endregion
-
+        
     }
 }
diff --git a/microservices/institute/V1/Controllers/UserGroupsController.cs b/microservices/institute/V1/Controllers/UserGroupsController.cs
index ce2e365..efafeae 100644
--- a/microservices/institute/V1/Controllers/UserGroupsController.cs
+++ b/microservices/institute/V1/Controllers/UserGroupsController.cs
@@ -22,6 +22,8 @@ namespace OnlineAssessment.V1.Controllers
             _repository = repository;
         }
 
+
+        
         /// <summary>
         /// Get list of all User Groups of a class
         /// </summary>
@@ -158,7 +160,7 @@ namespace OnlineAssessment.V1.Controllers
         ///<param name="user_group_id"></param>
         /// <param name="usergroup"></param>
         /// <returns></returns>
-        [HttpPut("{user_group_id}")]
+        [HttpPost("{user_group_id}/Update")]
         [Authorize(Roles = "Admin")]
         public IActionResult UpdateUserGroupOfTheInstitute(int user_group_id, [FromBody] UserGroupEditModel usergroup)
         {
@@ -209,7 +211,7 @@ namespace OnlineAssessment.V1.Controllers
         /// </summary>
         /// <param name="user_group_id"></param>
         /// <returns></returns>
-        [HttpDelete("{user_group_id}")]
+        [HttpPost("{user_group_id}/Delete")]
         [Authorize(Roles = "Admin")]
         public IActionResult DeleteUserGroup(int user_group_id)
         {
@@ -294,6 +296,6 @@ namespace OnlineAssessment.V1.Controllers
             }
             return returnResponse;
         }
-
+        
     }
 }
diff --git a/microservices/student/V1/Controllers/ExamAttemptsController.cs b/microservices/student/V1/Controllers/ExamAttemptsController.cs
index fcf4976..f8f5d2a 100644
--- a/microservices/student/V1/Controllers/ExamAttemptsController.cs
+++ b/microservices/student/V1/Controllers/ExamAttemptsController.cs
@@ -559,7 +559,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="exam_attempt_id"></param>
         /// <response code="-4000">Invalid input</response>
         /// <response code="-1">Unknown error</response>
-        [HttpPut("{language}/ExamAttempts/{exam_attempt_id}/End")]
+        [HttpPost("{language}/ExamAttempts/{exam_attempt_id}/End")]
         [ProducesResponseType(typeof(int), 200)]
         [Authorize(Roles = "Student")]
         public IActionResult EndExamAttempt(int exam_attempt_id)
@@ -596,7 +596,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <response code="-4000">Invalid input</response>
         /// <response code="-4010">Resource is not allowed</response>
         /// <response code="-1">Unknown error</response>
-        [HttpPut("{language}/ExamAttempts/{attempt_id}/Pause")]
+        [HttpPost("{language}/ExamAttempts/{attempt_id}/Pause")]
         [ProducesResponseType(typeof(DurationView), 200)]
         [Authorize(Roles = "Student")]
         public IActionResult PauseExamAttempt(int attempt_id)
@@ -691,7 +691,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="attempt_id"></param>
         /// <response code="-4010">Resource is not allowed</response>
         /// <response code="-1">Unknown error</response>
-        [HttpPut("ExamAttempts/{attempt_id}/HeartBeat")]
+        [HttpPost("ExamAttempts/{attempt_id}/HeartBeat")]
         [ProducesResponseType(typeof(DurationView), 200)]
         [Authorize(Roles = "Student")]
 
@@ -729,7 +729,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <response code="-4000">Invalid input</response>
         /// <response code="-4010">Resource is not allowed</response>
         /// <response code="-1">Unknown error</response>
-        [HttpPut("ExamAttempts/{attempt_id}/UpdateAnswer")]
+        [HttpPost("ExamAttempts/{attempt_id}/UpdateAnswer")]
         [ProducesResponseType(typeof(DurationView), 200)]
         [Authorize(Roles = "Student")]
 
@@ -748,6 +748,7 @@ namespace OnlineAssessment.V1.Controllers
             if(time is DurationView)
             {
                 returnResponse = Ok(ReturnResponse.GetSuccessStatus(time));
+                return returnResponse;
             }
             if (time is int && time == (int)Message.NotAllowedToResource)
             {
diff --git a/microservices/student/V1/Controllers/PracticeAttemptsController.cs b/microservices/student/V1/Controllers/PracticeAttemptsController.cs
index d48d81e..ac47343 100644
--- a/microservices/student/V1/Controllers/PracticeAttemptsController.cs
+++ b/microservices/student/V1/Controllers/PracticeAttemptsController.cs
@@ -427,7 +427,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="attempt_id"></param>
         /// <param name="report"></param>
         /// <returns></returns>
-        [HttpPut("PracticeAttempts/{attempt_id}/End")]
+        [HttpPost("PracticeAttempts/{attempt_id}/End")]
         [ProducesResponseType(typeof(CorrectnessCount), 200)]
         [Authorize(Roles = "Student")]
 
diff --git a/microservices/student/V1/Controllers/UserGroupsController.cs b/microservices/student/V1/Controllers/UserGroupsController.cs
index 39edaf3..8c00a81 100644
--- a/microservices/student/V1/Controllers/UserGroupsController.cs
+++ b/microservices/student/V1/Controllers/UserGroupsController.cs
@@ -171,7 +171,7 @@ namespace OnlineAssessment.V1.Controllers
         ///<param name="user_group_id"></param>
         /// <param name="usergroup"></param>
         /// <returns></returns>
-        [HttpPut("{user_group_id}")]
+        [HttpPost("{user_group_id}/Update")]
         [Authorize(Roles = "Admin")]
         public IActionResult UpdateUserGroupOfTheInstitute(int user_group_id, [FromBody] UserGroupEditModel usergroup)
         {
@@ -222,7 +222,7 @@ namespace OnlineAssessment.V1.Controllers
         /// </summary>
         /// <param name="user_group_id"></param>
         /// <returns></returns>
-        [HttpDelete("{user_group_id}")]
+        [HttpPost("{user_group_id}/Delete")]
         [Authorize(Roles = "Admin")]
         public IActionResult DeleteUserGroup(int user_group_id)
         {
diff --git a/microservices/student/V1/Controllers/UsersController.cs b/microservices/student/V1/Controllers/UsersController.cs
index 64ab309..0f6f6bc 100644
--- a/microservices/student/V1/Controllers/UsersController.cs
+++ b/microservices/student/V1/Controllers/UsersController.cs
@@ -294,7 +294,7 @@ namespace OnlineAssessment.V1.Controllers
         /// </summary>
         /// <param name="language"></param>
         /// <returns></returns>
-        [HttpPut("{language}/UpdatePreference")]
+        [HttpPost("{language}/UpdatePreference")]
         [Authorize(Roles = "Student")]
         public IActionResult UpdatePreference(string language)
         {
@@ -334,7 +334,7 @@ namespace OnlineAssessment.V1.Controllers
         /// </summary>
         /// <param name="profileDetailView"></param>
         /// <returns></returns>
-        [HttpPut("UpdateMyDetails")]
+        [HttpPost("UpdateMyDetails")]
         [Authorize(Roles = "Student")]
         public IActionResult UpdateMyDetails([FromBody] ProfileDetailView profileDetailView)
         {
diff --git a/microservices/teacher/V1/Controllers/ExamsController.cs b/microservices/teacher/V1/Controllers/ExamsController.cs
index b382d03..0b51e7c 100644
--- a/microservices/teacher/V1/Controllers/ExamsController.cs
+++ b/microservices/teacher/V1/Controllers/ExamsController.cs
@@ -24,7 +24,6 @@ namespace OnlineAssessment.V1.Controllers
 
 
         #region Exams 
-
         /// <summary>
         /// Add new exam 
         /// </summary>
@@ -106,7 +105,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="exam_id"></param>
         /// <param name="examSectionList"></param>
         /// <returns></returns>
-        [HttpPut("Exams/{exam_id}/ArrangeSections")]
+        [HttpPost("Exams/{exam_id}/ArrangeSections")]
         [Authorize(Roles = "Admin,Teacher")]
         public IActionResult ReorderExamSectionOfTheExam(int exam_id, [FromBody] ExamSectionsList examSectionList)
         {
@@ -201,7 +200,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="exam_section_id"></param>
         /// <param name="questionList"></param>
         /// <returns></returns>
-        [HttpPut("ExamSections/{exam_section_id}/MarkQuestions")]
+        [HttpPost("ExamSections/{exam_section_id}/MarkQuestions")]
         [Authorize(Roles = "Admin,Teacher")]
         public IActionResult AssignMarksToExamSectionQuestions(int exam_section_id, [FromBody] QuestionMarksList questionList)
         {
@@ -227,7 +226,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="exam_id"></param>
         /// <param name="scheduleExam"></param>
         /// <returns></returns>
-        [HttpPut("Exams/{exam_id}/Publish")]
+        [HttpPost("Exams/{exam_id}/Publish")]
         [Authorize(Roles = "Admin,Teacher")]
         public IActionResult PublishExam(string language, int exam_id, [FromBody] ExamPublishModel scheduleExam)
         {
@@ -499,7 +498,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="exam_id"></param>
         /// <param name="theExam"></param>
         /// <returns></returns>
-        [HttpPut("Exams/{exam_id}")]
+        [HttpPost("Exams/{exam_id}/Update")]
         [Authorize(Roles = "Admin,Teacher")]
         public IActionResult UpdateExamOfTheInstitute(int exam_id, [FromBody] ExamEditModel theExam)
         {
@@ -524,7 +523,7 @@ namespace OnlineAssessment.V1.Controllers
         /// </summary>
         /// <param name="exam_id"></param>
         /// <returns></returns>
-        [HttpDelete("Exams/{exam_id}")]
+        [HttpPost("Exams/{exam_id}/Delete")]
         [Authorize(Roles = "Admin,Teacher")]
         public IActionResult DeleteExamOfTheInstitute(int exam_id)
         {
@@ -551,7 +550,7 @@ namespace OnlineAssessment.V1.Controllers
         /// </summary>
         /// <param name="exam_section_id"></param>
         /// <returns></returns>
-        [HttpDelete("ExamSections/{exam_section_id}")]
+        [HttpPost("ExamSections/{exam_section_id}/Delete")]
         [Authorize(Roles = "Admin,Teacher")]
         public IActionResult DeleteExamSectionOfTheInstitute(int exam_section_id)
         {
diff --git a/microservices/teacher/V1/Controllers/PracticesController.cs b/microservices/teacher/V1/Controllers/PracticesController.cs
index cc7f0c7..5b18c51 100644
--- a/microservices/teacher/V1/Controllers/PracticesController.cs
+++ b/microservices/teacher/V1/Controllers/PracticesController.cs
@@ -68,7 +68,7 @@ namespace OnlineAssessment.V1.Controllers
         /// </summary>
         /// <param name="practice_id"></param>
         /// <returns></returns>
-        [HttpDelete("Practices/{practice_id}")]
+        [HttpPost("Practices/{practice_id}/Delete")]
         [Authorize(Roles = "Admin,Teacher")]
         public IActionResult DeletePracticeOfTheInstitute(int practice_id)
         {
@@ -529,7 +529,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="practice_id"></param>
         /// <param name="questionList"></param>
         /// <returns></returns>
-        [HttpPut("Practices/{practice_id}/ReviewQuestions")]
+        [HttpPost("Practices/{practice_id}/ReviewQuestions")]
         [Authorize(Roles = "Admin,Teacher")]
         public IActionResult AssignDurationToPracticeQuestions(int practice_id, [FromBody] QuestionDurationList questionList)
         {
@@ -562,7 +562,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="practice_id"></param>
         /// <param name="schedulePractice"></param>
         /// <returns></returns>
-        [HttpPut("Practices/{practice_id}/Publish")]
+        [HttpPost("Practices/{practice_id}/Publish")]
         [Authorize(Roles = "Admin,Teacher")]
         public IActionResult PublishPractice(int practice_id, [FromBody] PracticePublishModel schedulePractice)
         {
diff --git a/microservices/teacher/V1/Controllers/QuestionsController.cs b/microservices/teacher/V1/Controllers/QuestionsController.cs
index ccca28f..6915091 100644
--- a/microservices/teacher/V1/Controllers/QuestionsController.cs
+++ b/microservices/teacher/V1/Controllers/QuestionsController.cs
@@ -476,7 +476,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="question_id"></param>
         /// <param name="question"></param>
         /// <returns></returns>
-        [HttpPut("{language}/Questions/{question_id}")]
+        [HttpPost("{language}/Questions/{question_id}/Update")]
         [Authorize(Roles = "Admin,Teacher")]
         public IActionResult UpdateQuestionOfTheInstitute(string language, int question_id, [FromBody] QuestionEditModel question)
         {
@@ -520,7 +520,7 @@ namespace OnlineAssessment.V1.Controllers
         /// </summary>
         /// <param name="question_id"></param>
         /// <returns></returns>
-        [HttpDelete("Questions/{question_id}")]
+        [HttpPost("Questions/{question_id}/Delete")]
         [Authorize(Roles = "Admin,Teacher")]
         public IActionResult DeleteQuestionOfTheInstitute(int question_id)
         {
@@ -547,7 +547,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="language"></param>
         /// <param name="questionIdList"></param>
         /// <returns></returns>
-        [HttpDelete("{language}/Questions")]
+        [HttpPost("{language}/Questions/Delete")]
         [Authorize(Roles = "SuperAdmin,Admin,Teacher")]
         public IActionResult DeleteQuestions(string language, [FromBody] IntegerList questionIdList)
         {
diff --git a/microservices/user/V1/Controllers/UsersController.cs b/microservices/user/V1/Controllers/UsersController.cs
index b4453a9..b36a2f4 100644
--- a/microservices/user/V1/Controllers/UsersController.cs
+++ b/microservices/user/V1/Controllers/UsersController.cs
@@ -285,7 +285,7 @@ namespace OnlineAssessment.V1.Controllers
         /// <param name="id">The id of the user to edit</param>
         /// <param name="userEdit">User's data to edit</param>
         /// <returns></returns>
-        [HttpPut("{id}")]
+        [HttpPost("{id}/Update")]
         [Authorize(Roles = "SuperAdmin")]
         public IActionResult Put(int id, [FromBody] UserEditModel userEdit)
         {
@@ -318,7 +318,7 @@ namespace OnlineAssessment.V1.Controllers
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        [HttpDelete("{id}")]
+        [HttpPost("{id}/Delete")]
         [Authorize(Roles = "SuperAdmin")]
         public IActionResult Delete(int id)
         {
@@ -1339,7 +1339,7 @@ namespace OnlineAssessment.V1.Controllers
         /// </summary>
         /// <param name="language"></param>
         /// <returns></returns>
-        [HttpPut("{language}/UpdatePreference")]
+        [HttpPost("{language}/UpdatePreference")]
         [Authorize(Roles = "Student")]
         public IActionResult UpdatePreference(string language)
         {
diff --git a/microservices/user/V2/Controllers/UsersController.cs b/microservices/user/V2/Controllers/UsersController.cs
index 4388ba6..7bcf618 100644
--- a/microservices/user/V2/Controllers/UsersController.cs
+++ b/microservices/user/V2/Controllers/UsersController.cs
@@ -232,7 +232,7 @@ namespace OnlineAssessment.V2.Controllers
         /// <param name="id">The id of the user to edit</param>
         /// <param name="userEdit">User's data to edit</param>
         /// <returns></returns>
-        [HttpPut("{id}")]
+        [HttpPost("{id}")]
         [Authorize(Roles = "SuperAdmin")]
         public IActionResult Put(int id, [FromBody] UserEditModel userEdit)
         {
@@ -265,7 +265,7 @@ namespace OnlineAssessment.V2.Controllers
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        [HttpDelete("{id}")]
+        [HttpPost("{id}")]
         [Authorize(Roles = "SuperAdmin")]
         public IActionResult Delete(int id)
         {
@@ -367,7 +367,7 @@ namespace OnlineAssessment.V2.Controllers
         /// </summary>
         /// <param name="language"></param>
         /// <returns></returns>
-        [HttpPut("{language}/UpdatePreference")]
+        [HttpPost("{language}/UpdatePreference")]
         [Authorize(Roles = "Student")]
         public IActionResult UpdatePreference(string language)
         {