diff --git a/eob-fetcher/build.gradle b/eob-fetcher/build.gradle
index e7b0f1e..d2d8b8a 100644
--- a/eob-fetcher/build.gradle
+++ b/eob-fetcher/build.gradle
@@ -10,10 +10,10 @@ dependencies {
     implementation 'com.amazonaws:aws-lambda-java-events:3.11.0'
     implementation 'org.springframework:spring-context:5.3.25'
     implementation 'com.newrelic.agent.java:newrelic-api:8.2.0'
-    implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-dstu3:6.6.0'
-    implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-r4:6.1.3'
+    implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-dstu3:6.6.2'
+    implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-r4:6.6.2'
     implementation 'gov.cms.ab2d:ab2d-aggregator:1.2.5'
-    implementation 'gov.cms.ab2d:ab2d-bfd:2.0.2'
+    implementation 'gov.cms.ab2d:ab2d-bfd:2.4.0'
     implementation 'gov.cms.ab2d:ab2d-events-client:1.11.2'
     implementation 'gov.cms.ab2d:ab2d-fhir:1.1.5'
     implementation 'gov.cms.ab2d:ab2d-filters:1.6.5'
@@ -39,8 +39,8 @@ task wrapper(type: Wrapper) {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 repositories {
diff --git a/eob-fetcher/src/main/java/gov/cms/ab2d/fetcher/model/JobFetchPayload.java b/eob-fetcher/src/main/java/gov/cms/ab2d/fetcher/model/JobFetchPayload.java
index e67b5e4..f28af38 100644
--- a/eob-fetcher/src/main/java/gov/cms/ab2d/fetcher/model/JobFetchPayload.java
+++ b/eob-fetcher/src/main/java/gov/cms/ab2d/fetcher/model/JobFetchPayload.java
@@ -19,6 +19,8 @@ public class JobFetchPayload {
     @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSSz")
     private OffsetDateTime since;
     @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSSz")
+    private OffsetDateTime until;
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSSz")
     private Date attestationDate;
     private PatientCoverage[] beneficiaries;
 }
diff --git a/eob-fetcher/src/main/java/gov/cms/ab2d/worker/processor/PatientClaimsProcessorImpl.java b/eob-fetcher/src/main/java/gov/cms/ab2d/worker/processor/PatientClaimsProcessorImpl.java
index 46b24d4..fb9027f 100644
--- a/eob-fetcher/src/main/java/gov/cms/ab2d/worker/processor/PatientClaimsProcessorImpl.java
+++ b/eob-fetcher/src/main/java/gov/cms/ab2d/worker/processor/PatientClaimsProcessorImpl.java
@@ -153,7 +153,7 @@ List<IBaseResource> getEobBundleResources(JobFetchPayload payload, PatientCovera
 
             // Make first request and begin looping over remaining pages
             eobBundle = bfdClient.requestEOBFromServer(payload.getVersion(),
-                    patientCoverage.getBeneId(), payload.getSince(), payload.getContract());
+                    patientCoverage.getBeneId(), payload.getSince(), payload.getUntil(),  payload.getContract());
             List<IBaseResource> eobs = new ArrayList<>(PatientClaimsFilter.filterEntries(eobBundle, patientCoverage, payload.getAttestationDate(),
                     payload.isSkipBillablePeriodCheck(), payload.getSince(), payload.getVersion()));