diff --git a/batch-models/pom.xml b/batch-models/pom.xml
index 117d9448..242b9453 100644
--- a/batch-models/pom.xml
+++ b/batch-models/pom.xml
@@ -387,6 +387,14 @@
 					</filters>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>8</source>
+					<target>8</target>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
\ No newline at end of file
diff --git a/batch-models/src/main/scala/org/ekstep/analytics/exhaust/OnDemandDruidExhaustJob.scala b/batch-models/src/main/scala/org/ekstep/analytics/exhaust/OnDemandDruidExhaustJob.scala
index 7143ab88..3d9b8079 100644
--- a/batch-models/src/main/scala/org/ekstep/analytics/exhaust/OnDemandDruidExhaustJob.scala
+++ b/batch-models/src/main/scala/org/ekstep/analytics/exhaust/OnDemandDruidExhaustJob.scala
@@ -28,6 +28,9 @@ case class OnDemandDruidResponse(file: List[String], status: String, statusMsg:
 case class Metrics(totalRequests: Option[Int], failedRequests: Option[Int], successRequests: Option[Int])
 
 object OnDemandDruidExhaustJob extends BaseReportsJob with Serializable with IJob with OnDemandBaseExhaustJob with BaseDruidQueryProcessor {
+  /**
+   * Define implicit variables and constants required for Job
+   */
   implicit override val className: String = "org.sunbird.analytics.exhaust.OnDemandDruidExhaustJob"
 
   val jobId: String = "druid-dataset"
@@ -46,6 +49,10 @@ object OnDemandDruidExhaustJob extends BaseReportsJob with Serializable with IJo
 
     implicit val frameworkContext: FrameworkContext = getReportingFrameworkContext()
     implicit val conf = spark.sparkContext.hadoopConfiguration
+    /**
+     * This code block performs job execution, metrics generation, error handling, and cleanup tasks, ensuring accurate measurement of job performance and logging of relevant information.
+     * Additionally, it dispatches metric events to a Kafka topic based on configuration settings, enabling further analysis and monitoring of the job's execution.
+     */
     try {
       val res = CommonUtil.time(execute());
       // generate metric event and push it to kafka topic