diff --git a/alerting-config-service-impl/src/main/java/org/hypertrace/alerting/config/service/EventConditionConfigServiceImpl.java b/alerting-config-service-impl/src/main/java/org/hypertrace/alerting/config/service/EventConditionConfigServiceImpl.java
index ad2481cf..45aa67ea 100644
--- a/alerting-config-service-impl/src/main/java/org/hypertrace/alerting/config/service/EventConditionConfigServiceImpl.java
+++ b/alerting-config-service-impl/src/main/java/org/hypertrace/alerting/config/service/EventConditionConfigServiceImpl.java
@@ -4,6 +4,7 @@
 import io.grpc.Status;
 import io.grpc.stub.StreamObserver;
 import java.util.UUID;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.hypertrace.alerting.config.service.v1.CreateEventConditionRequest;
 import org.hypertrace.alerting.config.service.v1.CreateEventConditionResponse;
@@ -17,6 +18,7 @@
 import org.hypertrace.alerting.config.service.v1.NewEventCondition;
 import org.hypertrace.alerting.config.service.v1.UpdateEventConditionRequest;
 import org.hypertrace.alerting.config.service.v1.UpdateEventConditionResponse;
+import org.hypertrace.config.objectstore.ContextualConfigObject;
 import org.hypertrace.config.service.change.event.api.ConfigChangeEventGenerator;
 import org.hypertrace.core.grpcutils.context.RequestContext;
 
@@ -50,7 +52,8 @@ public void createEventCondition(
       builder.setId(UUID.randomUUID().toString());
       responseObserver.onNext(
           CreateEventConditionResponse.newBuilder()
-              .setEventCondition(eventConditionStore.upsertObject(requestContext, builder.build()))
+              .setEventCondition(
+                  eventConditionStore.upsertObject(requestContext, builder.build()).getData())
               .build());
       responseObserver.onCompleted();
     } catch (Exception e) {
@@ -69,7 +72,9 @@ public void updateEventCondition(
       responseObserver.onNext(
           UpdateEventConditionResponse.newBuilder()
               .setEventCondition(
-                  eventConditionStore.upsertObject(requestContext, request.getEventCondition()))
+                  eventConditionStore
+                      .upsertObject(requestContext, request.getEventCondition())
+                      .getData())
               .build());
       responseObserver.onCompleted();
     } catch (Exception e) {
@@ -87,7 +92,10 @@ public void getAllEventConditions(
       requestValidator.validateGetAllEventConditionsRequest(requestContext, request);
       responseObserver.onNext(
           GetAllEventConditionsResponse.newBuilder()
-              .addAllEventCondition(eventConditionStore.getAllObjects(requestContext))
+              .addAllEventCondition(
+                  eventConditionStore.getAllObjects(requestContext).stream()
+                      .map(ContextualConfigObject::getData)
+                      .collect(Collectors.toUnmodifiableList()))
               .build());
       responseObserver.onCompleted();
     } catch (Exception e) {
diff --git a/alerting-config-service-impl/src/main/java/org/hypertrace/alerting/config/service/EventConditionStore.java b/alerting-config-service-impl/src/main/java/org/hypertrace/alerting/config/service/EventConditionStore.java
index b28fbc58..5c173361 100644
--- a/alerting-config-service-impl/src/main/java/org/hypertrace/alerting/config/service/EventConditionStore.java
+++ b/alerting-config-service-impl/src/main/java/org/hypertrace/alerting/config/service/EventConditionStore.java
@@ -32,7 +32,7 @@ public EventConditionStore(
   }
 
   @Override
-  protected Optional<EventCondition> buildObjectFromValue(Value value) {
+  protected Optional<EventCondition> buildDataFromValue(Value value) {
     EventCondition.Builder builder = EventCondition.newBuilder();
     try {
       ConfigProtoConverter.mergeFromValue(value, builder);
@@ -45,12 +45,12 @@ protected Optional<EventCondition> buildObjectFromValue(Value value) {
 
   @SneakyThrows
   @Override
-  protected Value buildValueFromObject(EventCondition object) {
+  protected Value buildValueFromData(EventCondition object) {
     return ConfigProtoConverter.convertToValue(object);
   }
 
   @Override
-  protected String getContextFromObject(EventCondition object) {
+  protected String getContextFromData(EventCondition object) {
     return object.getId();
   }
 }
diff --git a/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java b/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java
index e595b062..3c06b3cf 100644
--- a/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java
+++ b/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleConfigServiceImpl.java
@@ -5,6 +5,8 @@
 import io.grpc.stub.StreamObserver;
 import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
+import org.hypertrace.config.objectstore.ConfigObject;
 import org.hypertrace.config.objectstore.IdentifiedObjectStore;
 import org.hypertrace.config.service.change.event.api.ConfigChangeEventGenerator;
 import org.hypertrace.config.service.v1.ConfigServiceGrpc;
@@ -51,7 +53,9 @@ public void createLabelApplicationRule(
               .setData(request.getData())
               .build();
       LabelApplicationRule createdLabelApplicationRule =
-          this.labelApplicationRuleStore.upsertObject(requestContext, labelApplicationRule);
+          this.labelApplicationRuleStore
+              .upsertObject(requestContext, labelApplicationRule)
+              .getData();
       responseObserver.onNext(
           CreateLabelApplicationRuleResponse.newBuilder()
               .setLabelApplicationRule(createdLabelApplicationRule)
@@ -70,7 +74,9 @@ public void getLabelApplicationRules(
       RequestContext requestContext = RequestContext.CURRENT.get();
       this.requestValidator.validateOrThrow(requestContext, request);
       List<LabelApplicationRule> labelApplicationRules =
-          this.labelApplicationRuleStore.getAllObjects(requestContext);
+          this.labelApplicationRuleStore.getAllObjects(requestContext).stream()
+              .map(ConfigObject::getData)
+              .collect(Collectors.toUnmodifiableList());
       responseObserver.onNext(
           GetLabelApplicationRulesResponse.newBuilder()
               .addAllLabelApplicationRules(labelApplicationRules)
@@ -90,12 +96,14 @@ public void updateLabelApplicationRule(
       this.requestValidator.validateOrThrow(requestContext, request);
       LabelApplicationRule existingRule =
           this.labelApplicationRuleStore
-              .getObject(requestContext, request.getId())
+              .getData(requestContext, request.getId())
               .orElseThrow(Status.NOT_FOUND::asRuntimeException);
       LabelApplicationRule updateLabelApplicationRule =
           existingRule.toBuilder().setData(request.getData()).build();
       LabelApplicationRule upsertedLabelApplicationRule =
-          this.labelApplicationRuleStore.upsertObject(requestContext, updateLabelApplicationRule);
+          this.labelApplicationRuleStore
+              .upsertObject(requestContext, updateLabelApplicationRule)
+              .getData();
       responseObserver.onNext(
           UpdateLabelApplicationRuleResponse.newBuilder()
               .setLabelApplicationRule(upsertedLabelApplicationRule)
diff --git a/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleStore.java b/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleStore.java
index 7cb8e0d5..7b787c9a 100644
--- a/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleStore.java
+++ b/label-application-rule-config-service-impl/src/main/java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleStore.java
@@ -25,7 +25,7 @@ public class LabelApplicationRuleStore extends IdentifiedObjectStore<LabelApplic
   }
 
   @Override
-  protected Optional<LabelApplicationRule> buildObjectFromValue(Value value) {
+  protected Optional<LabelApplicationRule> buildDataFromValue(Value value) {
     try {
       LabelApplicationRule.Builder builder = LabelApplicationRule.newBuilder();
       ConfigProtoConverter.mergeFromValue(value, builder);
@@ -37,12 +37,12 @@ protected Optional<LabelApplicationRule> buildObjectFromValue(Value value) {
 
   @SneakyThrows
   @Override
-  protected Value buildValueFromObject(LabelApplicationRule object) {
+  protected Value buildValueFromData(LabelApplicationRule object) {
     return ConfigProtoConverter.convertToValue(object);
   }
 
   @Override
-  protected String getContextFromObject(LabelApplicationRule object) {
+  protected String getContextFromData(LabelApplicationRule object) {
     return object.getId();
   }
 }
diff --git a/labels-config-service-impl/src/main/java/org/hypertrace/label/config/service/LabelStore.java b/labels-config-service-impl/src/main/java/org/hypertrace/label/config/service/LabelStore.java
index 02e3c2ec..698fe9c6 100644
--- a/labels-config-service-impl/src/main/java/org/hypertrace/label/config/service/LabelStore.java
+++ b/labels-config-service-impl/src/main/java/org/hypertrace/label/config/service/LabelStore.java
@@ -24,7 +24,7 @@ protected LabelStore(
   }
 
   @Override
-  protected Optional<Label> buildObjectFromValue(Value value) {
+  protected Optional<Label> buildDataFromValue(Value value) {
     try {
       Label.Builder builder = Label.newBuilder();
       ConfigProtoConverter.mergeFromValue(value, builder);
@@ -36,12 +36,12 @@ protected Optional<Label> buildObjectFromValue(Value value) {
 
   @Override
   @SneakyThrows
-  protected Value buildValueFromObject(Label object) {
+  protected Value buildValueFromData(Label object) {
     return ConfigProtoConverter.convertToValue(object);
   }
 
   @Override
-  protected String getContextFromObject(Label object) {
+  protected String getContextFromData(Label object) {
     return object.getId();
   }
 }
diff --git a/labels-config-service-impl/src/main/java/org/hypertrace/label/config/service/LabelsConfigServiceImpl.java b/labels-config-service-impl/src/main/java/org/hypertrace/label/config/service/LabelsConfigServiceImpl.java
index a21647c8..779bb70d 100644
--- a/labels-config-service-impl/src/main/java/org/hypertrace/label/config/service/LabelsConfigServiceImpl.java
+++ b/labels-config-service-impl/src/main/java/org/hypertrace/label/config/service/LabelsConfigServiceImpl.java
@@ -21,6 +21,7 @@
 import java.util.stream.Collectors;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.hypertrace.config.objectstore.ContextualConfigObject;
 import org.hypertrace.config.service.change.event.api.ConfigChangeEventGenerator;
 import org.hypertrace.config.service.v1.ConfigServiceGrpc;
 import org.hypertrace.core.grpcutils.client.RequestContextClientCallCredsProviderFactory;
@@ -117,7 +118,7 @@ public void createLabel(
                   .setId(UUID.randomUUID().toString())
                   .setKey(createLabel.getKey())
                   .build();
-          Label createdLabel = labelStore.upsertObject(requestContext, label);
+          Label createdLabel = labelStore.upsertObject(requestContext, label).getData();
           responseObserver.onNext(CreateLabelResponse.newBuilder().setLabel(createdLabel).build());
           responseObserver.onCompleted();
         } finally {
@@ -142,7 +143,7 @@ public void getLabel(GetLabelRequest request, StreamObserver<GetLabelResponse> r
       } else {
         label =
             labelStore
-                .getObject(requestContext, labelId)
+                .getData(requestContext, labelId)
                 .orElseThrow(Status.NOT_FOUND::asRuntimeException);
       }
       responseObserver.onNext(GetLabelResponse.newBuilder().setLabel(label).build());
@@ -158,7 +159,10 @@ public void getLabels(
     RequestContext requestContext = RequestContext.CURRENT.get();
     List<Label> allLabels = new ArrayList<>();
     allLabels.addAll(systemLabels);
-    List<Label> tenantLabels = labelStore.getAllObjects(requestContext);
+    List<Label> tenantLabels =
+        labelStore.getAllObjects(requestContext).stream()
+            .map(ContextualConfigObject::getData)
+            .collect(Collectors.toUnmodifiableList());
     allLabels.addAll(tenantLabels);
     responseObserver.onNext(GetLabelsResponse.newBuilder().addAllLabels(allLabels).build());
     responseObserver.onCompleted();
@@ -184,9 +188,10 @@ public void updateLabel(
             return;
           }
           labelStore
-              .getObject(requestContext, updatedLabelInReq.getId())
+              .getData(requestContext, updatedLabelInReq.getId())
               .orElseThrow(Status.NOT_FOUND::asRuntimeException);
-          Label updatedLabelInRes = labelStore.upsertObject(requestContext, updatedLabelInReq);
+          Label updatedLabelInRes =
+              labelStore.upsertObject(requestContext, updatedLabelInReq).getData();
           responseObserver.onNext(
               UpdateLabelResponse.newBuilder().setLabel(updatedLabelInRes).build());
           responseObserver.onCompleted();
@@ -234,7 +239,10 @@ public void deleteLabel(
 
   private boolean isDuplicateKey(String key) {
     RequestContext requestContext = RequestContext.CURRENT.get();
-    List<Label> labelList = labelStore.getAllObjects(requestContext);
+    List<Label> labelList =
+        labelStore.getAllObjects(requestContext).stream()
+            .map(ContextualConfigObject::getData)
+            .collect(Collectors.toUnmodifiableList());
     Optional<Label> match =
         labelList.stream().filter(label -> label.getKey().equals(key)).findAny();
     return match.isPresent();
diff --git a/notification-channel-config-service-impl/src/main/java/org/hypertrace/notification/config/service/NotificationChannelConfigServiceImpl.java b/notification-channel-config-service-impl/src/main/java/org/hypertrace/notification/config/service/NotificationChannelConfigServiceImpl.java
index 54c25dc3..a07fb548 100644
--- a/notification-channel-config-service-impl/src/main/java/org/hypertrace/notification/config/service/NotificationChannelConfigServiceImpl.java
+++ b/notification-channel-config-service-impl/src/main/java/org/hypertrace/notification/config/service/NotificationChannelConfigServiceImpl.java
@@ -5,7 +5,9 @@
 import io.grpc.stub.StreamObserver;
 import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
+import org.hypertrace.config.objectstore.ConfigObject;
 import org.hypertrace.config.service.change.event.api.ConfigChangeEventGenerator;
 import org.hypertrace.core.grpcutils.context.RequestContext;
 import org.hypertrace.notification.config.service.v1.CreateNotificationChannelRequest;
@@ -49,7 +51,7 @@ public void createNotificationChannel(
       responseObserver.onNext(
           CreateNotificationChannelResponse.newBuilder()
               .setNotificationChannel(
-                  notificationChannelStore.upsertObject(requestContext, builder.build()))
+                  notificationChannelStore.upsertObject(requestContext, builder.build()).getData())
               .build());
       responseObserver.onCompleted();
     } catch (Exception e) {
@@ -68,13 +70,15 @@ public void updateNotificationChannel(
       responseObserver.onNext(
           UpdateNotificationChannelResponse.newBuilder()
               .setNotificationChannel(
-                  notificationChannelStore.upsertObject(
-                      requestContext,
-                      NotificationChannel.newBuilder()
-                          .setId(request.getId())
-                          .setNotificationChannelMutableData(
-                              request.getNotificationChannelMutableData())
-                          .build()))
+                  notificationChannelStore
+                      .upsertObject(
+                          requestContext,
+                          NotificationChannel.newBuilder()
+                              .setId(request.getId())
+                              .setNotificationChannelMutableData(
+                                  request.getNotificationChannelMutableData())
+                              .build())
+                      .getData())
               .build());
       responseObserver.onCompleted();
     } catch (Exception e) {
@@ -91,7 +95,9 @@ public void getAllNotificationChannels(
       RequestContext requestContext = RequestContext.CURRENT.get();
       validator.validateGetAllNotificationChannelsRequest(requestContext, request);
       List<NotificationChannel> notificationChannels =
-          notificationChannelStore.getAllObjects(requestContext);
+          notificationChannelStore.getAllObjects(requestContext).stream()
+              .map(ConfigObject::getData)
+              .collect(Collectors.toUnmodifiableList());
       GetAllNotificationChannelsResponse getAllNotificationChannelsResponse =
           GetAllNotificationChannelsResponse.newBuilder()
               .addAllNotificationChannels(notificationChannels)
@@ -131,7 +137,7 @@ public void getNotificationChannel(
       validator.validateGetNotificationChannelRequest(requestContext, request);
       NotificationChannel notificationChannel =
           notificationChannelStore
-              .getObject(requestContext, request.getNotificationChannelId())
+              .getData(requestContext, request.getNotificationChannelId())
               .orElseThrow(Status.NOT_FOUND::asRuntimeException);
       responseObserver.onNext(
           GetNotificationChannelResponse.newBuilder()
diff --git a/notification-channel-config-service-impl/src/main/java/org/hypertrace/notification/config/service/NotificationChannelStore.java b/notification-channel-config-service-impl/src/main/java/org/hypertrace/notification/config/service/NotificationChannelStore.java
index d61abd9a..4cfaf314 100644
--- a/notification-channel-config-service-impl/src/main/java/org/hypertrace/notification/config/service/NotificationChannelStore.java
+++ b/notification-channel-config-service-impl/src/main/java/org/hypertrace/notification/config/service/NotificationChannelStore.java
@@ -32,7 +32,7 @@ public NotificationChannelStore(
   }
 
   @Override
-  protected Optional<NotificationChannel> buildObjectFromValue(Value value) {
+  protected Optional<NotificationChannel> buildDataFromValue(Value value) {
     NotificationChannel.Builder builder = NotificationChannel.newBuilder();
     try {
       ConfigProtoConverter.mergeFromValue(value, builder);
@@ -45,12 +45,12 @@ protected Optional<NotificationChannel> buildObjectFromValue(Value value) {
 
   @SneakyThrows
   @Override
-  protected Value buildValueFromObject(NotificationChannel object) {
+  protected Value buildValueFromData(NotificationChannel object) {
     return ConfigProtoConverter.convertToValue(object);
   }
 
   @Override
-  protected String getContextFromObject(NotificationChannel object) {
+  protected String getContextFromData(NotificationChannel object) {
     return object.getId();
   }
 }
diff --git a/notification-rule-config-service-impl/src/main/java/org/hypertrace/notification/config/service/NotificationRuleConfigServiceImpl.java b/notification-rule-config-service-impl/src/main/java/org/hypertrace/notification/config/service/NotificationRuleConfigServiceImpl.java
index ada9d59b..892b161d 100644
--- a/notification-rule-config-service-impl/src/main/java/org/hypertrace/notification/config/service/NotificationRuleConfigServiceImpl.java
+++ b/notification-rule-config-service-impl/src/main/java/org/hypertrace/notification/config/service/NotificationRuleConfigServiceImpl.java
@@ -4,7 +4,9 @@
 import io.grpc.Status;
 import io.grpc.stub.StreamObserver;
 import java.util.UUID;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
+import org.hypertrace.config.objectstore.ConfigObject;
 import org.hypertrace.config.service.change.event.api.ConfigChangeEventGenerator;
 import org.hypertrace.core.grpcutils.context.RequestContext;
 import org.hypertrace.notification.config.service.v1.CreateNotificationRuleRequest;
@@ -48,7 +50,7 @@ public void createNotificationRule(
       responseObserver.onNext(
           CreateNotificationRuleResponse.newBuilder()
               .setNotificationRule(
-                  notificationRuleStore.upsertObject(requestContext, builder.build()))
+                  notificationRuleStore.upsertObject(requestContext, builder.build()).getData())
               .build());
       responseObserver.onCompleted();
     } catch (Exception e) {
@@ -67,12 +69,15 @@ public void updateNotificationRule(
       responseObserver.onNext(
           UpdateNotificationRuleResponse.newBuilder()
               .setNotificationRule(
-                  notificationRuleStore.upsertObject(
-                      requestContext,
-                      NotificationRule.newBuilder()
-                          .setId(request.getId())
-                          .setNotificationRuleMutableData(request.getNotificationRuleMutableData())
-                          .build()))
+                  notificationRuleStore
+                      .upsertObject(
+                          requestContext,
+                          NotificationRule.newBuilder()
+                              .setId(request.getId())
+                              .setNotificationRuleMutableData(
+                                  request.getNotificationRuleMutableData())
+                              .build())
+                      .getData())
               .build());
       responseObserver.onCompleted();
     } catch (Exception e) {
@@ -90,7 +95,10 @@ public void getAllNotificationRules(
       validator.validateGetAllNotificationRulesRequest(requestContext, request);
       responseObserver.onNext(
           GetAllNotificationRulesResponse.newBuilder()
-              .addAllNotificationRules(notificationRuleStore.getAllObjects(requestContext))
+              .addAllNotificationRules(
+                  notificationRuleStore.getAllObjects(requestContext).stream()
+                      .map(ConfigObject::getData)
+                      .collect(Collectors.toUnmodifiableList()))
               .build());
       responseObserver.onCompleted();
     } catch (Exception e) {
@@ -126,7 +134,7 @@ public void getNotificationRule(
       validator.validateGetNotificationRuleRequest(requestContext, request);
       NotificationRule notificationRule =
           notificationRuleStore
-              .getObject(requestContext, request.getNotificationRuleId())
+              .getData(requestContext, request.getNotificationRuleId())
               .orElseThrow(Status.NOT_FOUND::asRuntimeException);
       responseObserver.onNext(
           GetNotificationRuleResponse.newBuilder().setNotificationRule(notificationRule).build());
diff --git a/notification-rule-config-service-impl/src/main/java/org/hypertrace/notification/config/service/NotificationRuleStore.java b/notification-rule-config-service-impl/src/main/java/org/hypertrace/notification/config/service/NotificationRuleStore.java
index 8320dd73..566eae12 100644
--- a/notification-rule-config-service-impl/src/main/java/org/hypertrace/notification/config/service/NotificationRuleStore.java
+++ b/notification-rule-config-service-impl/src/main/java/org/hypertrace/notification/config/service/NotificationRuleStore.java
@@ -31,7 +31,7 @@ public NotificationRuleStore(
   }
 
   @Override
-  protected Optional<NotificationRule> buildObjectFromValue(Value value) {
+  protected Optional<NotificationRule> buildDataFromValue(Value value) {
     NotificationRule.Builder builder = NotificationRule.newBuilder();
     try {
       ConfigProtoConverter.mergeFromValue(value, builder);
@@ -44,12 +44,12 @@ protected Optional<NotificationRule> buildObjectFromValue(Value value) {
 
   @SneakyThrows
   @Override
-  protected Value buildValueFromObject(NotificationRule object) {
+  protected Value buildValueFromData(NotificationRule object) {
     return ConfigProtoConverter.convertToValue(object);
   }
 
   @Override
-  protected String getContextFromObject(NotificationRule object) {
+  protected String getContextFromData(NotificationRule object) {
     return object.getId();
   }
 }
diff --git a/object-store/src/main/java/org/hypertrace/config/objectstore/ConfigObject.java b/object-store/src/main/java/org/hypertrace/config/objectstore/ConfigObject.java
new file mode 100644
index 00000000..38c4c1e5
--- /dev/null
+++ b/object-store/src/main/java/org/hypertrace/config/objectstore/ConfigObject.java
@@ -0,0 +1,11 @@
+package org.hypertrace.config.objectstore;
+
+import java.time.Instant;
+
+public interface ConfigObject<T> {
+  T getData();
+
+  Instant getCreationTimestamp();
+
+  Instant getLastUpdatedTimestamp();
+}
diff --git a/object-store/src/main/java/org/hypertrace/config/objectstore/ConfigObjectImpl.java b/object-store/src/main/java/org/hypertrace/config/objectstore/ConfigObjectImpl.java
new file mode 100644
index 00000000..11fdde88
--- /dev/null
+++ b/object-store/src/main/java/org/hypertrace/config/objectstore/ConfigObjectImpl.java
@@ -0,0 +1,48 @@
+package org.hypertrace.config.objectstore;
+
+import com.google.protobuf.Value;
+import java.time.Instant;
+import java.util.Optional;
+import java.util.function.Function;
+import org.hypertrace.config.service.v1.ContextSpecificConfig;
+import org.hypertrace.config.service.v1.UpsertConfigResponse;
+
+@lombok.Value
+class ConfigObjectImpl<T> implements ConfigObject<T> {
+  T data;
+  Instant creationTimestamp;
+  Instant lastUpdatedTimestamp;
+
+  static <T> Optional<ConfigObject<T>> tryBuild(
+      ContextSpecificConfig contextSpecificConfig, Function<Value, Optional<T>> dataBuilder) {
+    return tryBuild(
+        contextSpecificConfig.getConfig(),
+        contextSpecificConfig.getCreationTimestamp(),
+        contextSpecificConfig.getUpdateTimestamp(),
+        dataBuilder);
+  }
+
+  static <T> Optional<ConfigObject<T>> tryBuild(
+      UpsertConfigResponse upsertResponse, Function<Value, Optional<T>> dataBuilder) {
+    return tryBuild(
+        upsertResponse.getConfig(),
+        upsertResponse.getCreationTimestamp(),
+        upsertResponse.getUpdateTimestamp(),
+        dataBuilder);
+  }
+
+  private static <T> Optional<ConfigObject<T>> tryBuild(
+      Value config,
+      long creationTimestamp,
+      long updateTimestamp,
+      Function<Value, Optional<T>> dataBuilder) {
+    return dataBuilder
+        .apply(config)
+        .map(
+            data ->
+                new ConfigObjectImpl<>(
+                    data,
+                    Instant.ofEpochMilli(creationTimestamp),
+                    Instant.ofEpochMilli(updateTimestamp)));
+  }
+}
diff --git a/object-store/src/main/java/org/hypertrace/config/objectstore/ContextualConfigObject.java b/object-store/src/main/java/org/hypertrace/config/objectstore/ContextualConfigObject.java
new file mode 100644
index 00000000..dbdfa214
--- /dev/null
+++ b/object-store/src/main/java/org/hypertrace/config/objectstore/ContextualConfigObject.java
@@ -0,0 +1,5 @@
+package org.hypertrace.config.objectstore;
+
+public interface ContextualConfigObject<T> extends ConfigObject<T> {
+  String getContext();
+}
diff --git a/object-store/src/main/java/org/hypertrace/config/objectstore/ContextualConfigObjectImpl.java b/object-store/src/main/java/org/hypertrace/config/objectstore/ContextualConfigObjectImpl.java
new file mode 100644
index 00000000..847e6e93
--- /dev/null
+++ b/object-store/src/main/java/org/hypertrace/config/objectstore/ContextualConfigObjectImpl.java
@@ -0,0 +1,69 @@
+package org.hypertrace.config.objectstore;
+
+import com.google.protobuf.Value;
+import java.time.Instant;
+import java.util.Optional;
+import java.util.function.Function;
+import org.hypertrace.config.service.v1.ContextSpecificConfig;
+import org.hypertrace.config.service.v1.UpsertAllConfigsResponse.UpsertedConfig;
+import org.hypertrace.config.service.v1.UpsertConfigResponse;
+
+@lombok.Value
+class ContextualConfigObjectImpl<T> implements ContextualConfigObject<T> {
+  String context;
+  T data;
+  Instant creationTimestamp;
+  Instant lastUpdatedTimestamp;
+
+  static <T> Optional<ContextualConfigObject<T>> tryBuild(
+      ContextSpecificConfig contextSpecificConfig, Function<Value, Optional<T>> dataBuilder) {
+    return tryBuild(
+        contextSpecificConfig.getContext(),
+        contextSpecificConfig.getConfig(),
+        contextSpecificConfig.getCreationTimestamp(),
+        contextSpecificConfig.getUpdateTimestamp(),
+        dataBuilder);
+  }
+
+  static <T> Optional<ContextualConfigObject<T>> tryBuild(
+      UpsertedConfig upsertedConfig, Function<Value, Optional<T>> dataBuilder) {
+    return tryBuild(
+        upsertedConfig.getContext(),
+        upsertedConfig.getConfig(),
+        upsertedConfig.getCreationTimestamp(),
+        upsertedConfig.getUpdateTimestamp(),
+        dataBuilder);
+  }
+
+  static <T> Optional<ContextualConfigObject<T>> tryBuild(
+      UpsertConfigResponse upsertResponse,
+      Function<Value, Optional<T>> dataBuilder,
+      Function<T, String> contextBuilder) {
+    return dataBuilder
+        .apply(upsertResponse.getConfig())
+        .map(
+            data ->
+                new ContextualConfigObjectImpl<>(
+                    contextBuilder.apply(data),
+                    data,
+                    Instant.ofEpochMilli(upsertResponse.getCreationTimestamp()),
+                    Instant.ofEpochMilli(upsertResponse.getUpdateTimestamp())));
+  }
+
+  private static <T> Optional<ContextualConfigObject<T>> tryBuild(
+      String context,
+      Value config,
+      long creationTimestamp,
+      long updateTimestamp,
+      Function<Value, Optional<T>> dataBuilder) {
+    return dataBuilder
+        .apply(config)
+        .map(
+            data ->
+                new ContextualConfigObjectImpl<>(
+                    context,
+                    data,
+                    Instant.ofEpochMilli(creationTimestamp),
+                    Instant.ofEpochMilli(updateTimestamp)));
+  }
+}
diff --git a/object-store/src/main/java/org/hypertrace/config/objectstore/ContextuallyIdentifiedObjectStore.java b/object-store/src/main/java/org/hypertrace/config/objectstore/ContextuallyIdentifiedObjectStore.java
index 34326213..482513d6 100644
--- a/object-store/src/main/java/org/hypertrace/config/objectstore/ContextuallyIdentifiedObjectStore.java
+++ b/object-store/src/main/java/org/hypertrace/config/objectstore/ContextuallyIdentifiedObjectStore.java
@@ -2,6 +2,7 @@
 
 import com.google.protobuf.Value;
 import java.util.Optional;
+import java.util.function.Function;
 import org.hypertrace.config.service.change.event.api.ConfigChangeEventGenerator;
 import org.hypertrace.config.service.v1.ConfigServiceGrpc.ConfigServiceBlockingStub;
 import org.hypertrace.core.grpcutils.context.RequestContext;
@@ -33,9 +34,9 @@ protected ContextuallyIdentifiedObjectStore(
     this.configChangeEventGenerator = Optional.empty();
   }
 
-  protected abstract Optional<T> buildObjectFromValue(Value value);
+  protected abstract Optional<T> buildDataFromValue(Value value);
 
-  protected abstract Value buildValueFromObject(T object);
+  protected abstract Value buildValueFromData(T data);
 
   protected abstract String getConfigContextFromRequestContext(RequestContext requestContext);
 
@@ -45,18 +46,19 @@ private IdentifiedObjectStore<T> buildObjectStoreForContext(RequestContext conte
         .orElseGet(() -> new ContextAwareIdentifiedObjectStoreDelegate(context));
   }
 
-  public Optional<T> getObject(RequestContext context) {
+  public Optional<T> getData(RequestContext context) {
     return this.buildObjectStoreForContext(context)
-        .getObject(context, this.getConfigContextFromRequestContext(context));
+        .getData(context, this.getConfigContextFromRequestContext(context));
   }
 
-  public T upsertObject(RequestContext context, T object) {
-    return this.buildObjectStoreForContext(context).upsertObject(context, object);
+  public ConfigObject<T> upsertObject(RequestContext context, T data) {
+    return this.buildObjectStoreForContext(context).upsertObject(context, data);
   }
 
-  public Optional<T> deleteObject(RequestContext context) {
+  public Optional<ConfigObject<T>> deleteObject(RequestContext context) {
     return this.buildObjectStoreForContext(context)
-        .deleteObject(context, this.getConfigContextFromRequestContext(context));
+        .deleteObject(context, this.getConfigContextFromRequestContext(context))
+        .map(Function.identity());
   }
 
   private class ContextAwareIdentifiedObjectStoreDelegate extends IdentifiedObjectStore<T> {
@@ -75,17 +77,17 @@ private class ContextAwareIdentifiedObjectStoreDelegate extends IdentifiedObject
     }
 
     @Override
-    protected Optional<T> buildObjectFromValue(Value value) {
-      return ContextuallyIdentifiedObjectStore.this.buildObjectFromValue(value);
+    protected Optional<T> buildDataFromValue(Value value) {
+      return ContextuallyIdentifiedObjectStore.this.buildDataFromValue(value);
     }
 
     @Override
-    protected Value buildValueFromObject(T object) {
-      return ContextuallyIdentifiedObjectStore.this.buildValueFromObject(object);
+    protected Value buildValueFromData(T data) {
+      return ContextuallyIdentifiedObjectStore.this.buildValueFromData(data);
     }
 
     @Override
-    protected String getContextFromObject(T object) {
+    protected String getContextFromData(T data) {
       return ContextuallyIdentifiedObjectStore.this.getConfigContextFromRequestContext(
           requestContext);
     }
diff --git a/object-store/src/main/java/org/hypertrace/config/objectstore/DefaultObjectStore.java b/object-store/src/main/java/org/hypertrace/config/objectstore/DefaultObjectStore.java
index a4edcb1c..8c39ddae 100644
--- a/object-store/src/main/java/org/hypertrace/config/objectstore/DefaultObjectStore.java
+++ b/object-store/src/main/java/org/hypertrace/config/objectstore/DefaultObjectStore.java
@@ -5,6 +5,7 @@
 import java.util.Optional;
 import org.hypertrace.config.service.change.event.api.ConfigChangeEventGenerator;
 import org.hypertrace.config.service.v1.ConfigServiceGrpc.ConfigServiceBlockingStub;
+import org.hypertrace.config.service.v1.ContextSpecificConfig;
 import org.hypertrace.config.service.v1.DeleteConfigRequest;
 import org.hypertrace.config.service.v1.GetConfigRequest;
 import org.hypertrace.config.service.v1.UpsertConfigRequest;
@@ -44,11 +45,11 @@ protected DefaultObjectStore(
     this.configChangeEventGeneratorOptional = Optional.empty();
   }
 
-  protected abstract Optional<T> buildObjectFromValue(Value value);
+  protected abstract Optional<T> buildDataFromValue(Value value);
 
-  protected abstract Value buildValueFromObject(T object);
+  protected abstract Value buildValueFromData(T data);
 
-  public Optional<T> getObject(RequestContext context) {
+  public Optional<T> getData(RequestContext context) {
     try {
       Value value =
           context.call(
@@ -60,8 +61,8 @@ public Optional<T> getObject(RequestContext context) {
                               .setResourceNamespace(this.resourceNamespace)
                               .build())
                       .getConfig());
-      T object = this.buildObjectFromValue(value).orElseThrow(Status.INTERNAL::asRuntimeException);
-      return Optional.of(object);
+      T data = this.buildDataFromValue(value).orElseThrow(Status.INTERNAL::asRuntimeException);
+      return Optional.of(data);
     } catch (Exception exception) {
       if (Status.fromThrowable(exception).equals(Status.NOT_FOUND)) {
         return Optional.empty();
@@ -70,7 +71,7 @@ public Optional<T> getObject(RequestContext context) {
     }
   }
 
-  public T upsertObject(RequestContext context, T object) {
+  public ConfigObject<T> upsertObject(RequestContext context, T data) {
     UpsertConfigResponse response =
         context.call(
             () ->
@@ -78,11 +79,11 @@ public T upsertObject(RequestContext context, T object) {
                     UpsertConfigRequest.newBuilder()
                         .setResourceName(this.resourceName)
                         .setResourceNamespace(this.resourceNamespace)
-                        .setConfig(this.buildValueFromObject(object))
+                        .setConfig(this.buildValueFromData(data))
                         .build()));
 
-    T upsertedObject =
-        this.buildObjectFromValue(response.getConfig())
+    ConfigObject<T> upsertedObject =
+        ConfigObjectImpl.tryBuild(response, this::buildDataFromValue)
             .orElseThrow(Status.INTERNAL::asRuntimeException);
 
     configChangeEventGeneratorOptional.ifPresent(
@@ -90,20 +91,20 @@ public T upsertObject(RequestContext context, T object) {
           if (response.hasPrevConfig()) {
             configChangeEventGenerator.sendUpdateNotification(
                 context,
-                upsertedObject.getClass().getName(),
+                upsertedObject.getData().getClass().getName(),
                 response.getPrevConfig(),
                 response.getConfig());
           } else {
             configChangeEventGenerator.sendCreateNotification(
-                context, upsertedObject.getClass().getName(), response.getConfig());
+                context, upsertedObject.getData().getClass().getName(), response.getConfig());
           }
         });
     return upsertedObject;
   }
 
-  public Optional<T> deleteObject(RequestContext context) {
+  public Optional<ConfigObject<T>> deleteObject(RequestContext context) {
     try {
-      Value deletedValue =
+      ContextSpecificConfig deletedConfig =
           context
               .call(
                   () ->
@@ -112,14 +113,14 @@ public Optional<T> deleteObject(RequestContext context) {
                               .setResourceName(this.resourceName)
                               .setResourceNamespace(this.resourceNamespace)
                               .build()))
-              .getDeletedConfig()
-              .getConfig();
-      T object =
-          this.buildObjectFromValue(deletedValue).orElseThrow(Status.INTERNAL::asRuntimeException);
+              .getDeletedConfig();
+      ConfigObject<T> object =
+          ConfigObjectImpl.tryBuild(deletedConfig, this::buildDataFromValue)
+              .orElseThrow(Status.INTERNAL::asRuntimeException);
       configChangeEventGeneratorOptional.ifPresent(
           configChangeEventGenerator ->
               configChangeEventGenerator.sendDeleteNotification(
-                  context, object.getClass().getName(), deletedValue));
+                  context, object.getData().getClass().getName(), deletedConfig.getConfig()));
       return Optional.of(object);
     } catch (Exception exception) {
       if (Status.fromThrowable(exception).equals(Status.NOT_FOUND)) {
diff --git a/object-store/src/main/java/org/hypertrace/config/objectstore/IdentifiedObjectStore.java b/object-store/src/main/java/org/hypertrace/config/objectstore/IdentifiedObjectStore.java
index a546430c..65cc0044 100644
--- a/object-store/src/main/java/org/hypertrace/config/objectstore/IdentifiedObjectStore.java
+++ b/object-store/src/main/java/org/hypertrace/config/objectstore/IdentifiedObjectStore.java
@@ -51,17 +51,18 @@ protected IdentifiedObjectStore(
     this.configChangeEventGeneratorOptional = Optional.empty();
   }
 
-  protected abstract Optional<T> buildObjectFromValue(Value value);
+  protected abstract Optional<T> buildDataFromValue(Value value);
 
-  protected abstract Value buildValueFromObject(T object);
+  protected abstract Value buildValueFromData(T data);
 
-  protected abstract String getContextFromObject(T object);
+  protected abstract String getContextFromData(T data);
 
-  protected List<T> orderFetchedObjects(List<T> objects) {
+  protected List<ContextualConfigObject<T>> orderFetchedObjects(
+      List<ContextualConfigObject<T>> objects) {
     return objects;
   }
 
-  public List<T> getAllObjects(RequestContext context) {
+  public List<ContextualConfigObject<T>> getAllObjects(RequestContext context) {
     return context
         .call(
             () ->
@@ -72,15 +73,17 @@ public List<T> getAllObjects(RequestContext context) {
                         .build()))
         .getContextSpecificConfigsList()
         .stream()
-        .map(ContextSpecificConfig::getConfig)
-        .map(this::buildObjectFromValue)
+        .map(
+            contextSpecificConfig ->
+                ContextualConfigObjectImpl.tryBuild(
+                    contextSpecificConfig, this::buildDataFromValue))
         .flatMap(Optional::stream)
         .collect(
             Collectors.collectingAndThen(
                 Collectors.toUnmodifiableList(), this::orderFetchedObjects));
   }
 
-  public Optional<T> getObject(RequestContext context, String id) {
+  public Optional<T> getData(RequestContext context, String id) {
     try {
       Value value =
           context.call(
@@ -93,7 +96,7 @@ public Optional<T> getObject(RequestContext context, String id) {
                               .addContexts(id)
                               .build())
                       .getConfig());
-      T object = this.buildObjectFromValue(value).orElseThrow(Status.INTERNAL::asRuntimeException);
+      T object = this.buildDataFromValue(value).orElseThrow(Status.INTERNAL::asRuntimeException);
       return Optional.of(object);
     } catch (Exception exception) {
       if (Status.fromThrowable(exception).equals(Status.NOT_FOUND)) {
@@ -103,7 +106,7 @@ public Optional<T> getObject(RequestContext context, String id) {
     }
   }
 
-  public T upsertObject(RequestContext context, T object) {
+  public ContextualConfigObject<T> upsertObject(RequestContext context, T data) {
     UpsertConfigResponse response =
         context.call(
             () ->
@@ -111,17 +114,17 @@ public T upsertObject(RequestContext context, T object) {
                     UpsertConfigRequest.newBuilder()
                         .setResourceName(this.resourceName)
                         .setResourceNamespace(this.resourceNamespace)
-                        .setContext(this.getContextFromObject(object))
-                        .setConfig(this.buildValueFromObject(object))
+                        .setContext(this.getContextFromData(data))
+                        .setConfig(this.buildValueFromData(data))
                         .build()));
 
     return this.processUpsertResult(context, response)
         .orElseThrow(Status.INTERNAL::asRuntimeException);
   }
 
-  public Optional<T> deleteObject(RequestContext context, String id) {
+  public Optional<ContextualConfigObject<T>> deleteObject(RequestContext context, String id) {
     try {
-      Value deletedValue =
+      ContextSpecificConfig deletedConfig =
           context
               .call(
                   () ->
@@ -131,14 +134,14 @@ public Optional<T> deleteObject(RequestContext context, String id) {
                               .setResourceNamespace(this.resourceNamespace)
                               .setContext(id)
                               .build()))
-              .getDeletedConfig()
-              .getConfig();
-      T object =
-          this.buildObjectFromValue(deletedValue).orElseThrow(Status.INTERNAL::asRuntimeException);
+              .getDeletedConfig();
+      ContextualConfigObject<T> object =
+          ContextualConfigObjectImpl.tryBuild(deletedConfig, this::buildDataFromValue)
+              .orElseThrow(Status.INTERNAL::asRuntimeException);
       configChangeEventGeneratorOptional.ifPresent(
           configChangeEventGenerator ->
               configChangeEventGenerator.sendDeleteNotification(
-                  context, object.getClass().getName(), id, deletedValue));
+                  context, object.getData().getClass().getName(), id, deletedConfig.getConfig()));
       return Optional.of(object);
     } catch (Exception exception) {
       if (Status.fromThrowable(exception).equals(Status.NOT_FOUND)) {
@@ -148,16 +151,16 @@ public Optional<T> deleteObject(RequestContext context, String id) {
     }
   }
 
-  public List<T> upsertObjects(RequestContext context, List<T> objects) {
+  public List<ContextualConfigObject<T>> upsertObjects(RequestContext context, List<T> data) {
     List<ConfigToUpsert> configs =
-        objects.stream()
+        data.stream()
             .map(
-                object ->
+                singleData ->
                     ConfigToUpsert.newBuilder()
                         .setResourceName(this.resourceName)
                         .setResourceNamespace(this.resourceNamespace)
-                        .setContext(this.getContextFromObject(object))
-                        .setConfig(this.buildValueFromObject(object))
+                        .setContext(this.getContextFromData(singleData))
+                        .setConfig(this.buildValueFromData(singleData))
                         .build())
             .collect(Collectors.toUnmodifiableList());
 
@@ -173,51 +176,57 @@ public List<T> upsertObjects(RequestContext context, List<T> objects) {
         .collect(Collectors.toUnmodifiableList());
   }
 
-  private Optional<T> processUpsertResult(
+  private Optional<ContextualConfigObject<T>> processUpsertResult(
       RequestContext requestContext, UpsertConfigResponse response) {
-    if (response.hasPrevConfig()) {
-      return this.processUpdateResult(
-          requestContext, response.getConfig(), response.getPrevConfig());
-    }
-    return this.processCreateResult(requestContext, response.getConfig());
+    Optional<ContextualConfigObject<T>> optionalResult =
+        ContextualConfigObjectImpl.tryBuild(
+            response, this::buildDataFromValue, this::getContextFromData);
+    optionalResult.ifPresent(
+        result -> {
+          if (response.hasPrevConfig()) {
+            tryReportUpdate(requestContext, result, response.getPrevConfig());
+          } else {
+            tryReportCreation(requestContext, result);
+          }
+        });
+    return optionalResult;
   }
 
-  private Optional<T> processUpsertResult(
+  private Optional<ContextualConfigObject<T>> processUpsertResult(
       RequestContext requestContext, UpsertedConfig upsertedConfig) {
-    if (upsertedConfig.hasPrevConfig()) {
-      return this.processUpdateResult(
-          requestContext, upsertedConfig.getConfig(), upsertedConfig.getPrevConfig());
-    }
-    return this.processCreateResult(requestContext, upsertedConfig.getConfig());
+    Optional<ContextualConfigObject<T>> optionalResult =
+        ContextualConfigObjectImpl.tryBuild(upsertedConfig, this::buildDataFromValue);
+
+    optionalResult.ifPresent(
+        result -> {
+          if (upsertedConfig.hasPrevConfig()) {
+            tryReportUpdate(requestContext, result, upsertedConfig.getPrevConfig());
+          } else {
+            tryReportCreation(requestContext, result);
+          }
+        });
+    return optionalResult;
   }
 
-  private Optional<T> processUpdateResult(
-      RequestContext requestContext, Value updatedValue, Value previousValue) {
-    Optional<T> parsedResult = this.buildObjectFromValue(updatedValue);
-    parsedResult.ifPresent(
-        updatedObject ->
-            configChangeEventGeneratorOptional.ifPresent(
-                configChangeEventGenerator ->
-                    configChangeEventGenerator.sendUpdateNotification(
-                        requestContext,
-                        updatedObject.getClass().getName(),
-                        this.getContextFromObject(updatedObject),
-                        previousValue,
-                        updatedValue)));
-    return parsedResult;
+  private void tryReportCreation(RequestContext requestContext, ContextualConfigObject<T> result) {
+    configChangeEventGeneratorOptional.ifPresent(
+        configChangeEventGenerator ->
+            configChangeEventGenerator.sendCreateNotification(
+                requestContext,
+                result.getData().getClass().getName(),
+                result.getContext(),
+                this.buildValueFromData(result.getData())));
   }
 
-  private Optional<T> processCreateResult(RequestContext requestContext, Value newValue) {
-    Optional<T> parsedResult = this.buildObjectFromValue(newValue);
-    parsedResult.ifPresent(
-        newObject ->
-            configChangeEventGeneratorOptional.ifPresent(
-                configChangeEventGenerator ->
-                    configChangeEventGenerator.sendCreateNotification(
-                        requestContext,
-                        newObject.getClass().getName(),
-                        this.getContextFromObject(newObject),
-                        newValue)));
-    return parsedResult;
+  private void tryReportUpdate(
+      RequestContext requestContext, ContextualConfigObject<T> result, Value previousValue) {
+    configChangeEventGeneratorOptional.ifPresent(
+        configChangeEventGenerator ->
+            configChangeEventGenerator.sendUpdateNotification(
+                requestContext,
+                result.getData().getClass().getName(),
+                result.getContext(),
+                previousValue,
+                this.buildValueFromData(result.getData())));
   }
 }
diff --git a/object-store/src/test/java/ContextuallyIdentifiedObjectStoreTest.java b/object-store/src/test/java/org/hypertrace/config/objectstore/ContextuallyIdentifiedObjectStoreTest.java
similarity index 74%
rename from object-store/src/test/java/ContextuallyIdentifiedObjectStoreTest.java
rename to object-store/src/test/java/org/hypertrace/config/objectstore/ContextuallyIdentifiedObjectStoreTest.java
index cdca40fa..195f528e 100644
--- a/object-store/src/test/java/ContextuallyIdentifiedObjectStoreTest.java
+++ b/object-store/src/test/java/org/hypertrace/config/objectstore/ContextuallyIdentifiedObjectStoreTest.java
@@ -1,3 +1,5 @@
+package org.hypertrace.config.objectstore;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
@@ -8,8 +10,8 @@
 import com.google.protobuf.Value;
 import com.google.protobuf.util.Values;
 import io.grpc.Status;
+import java.time.Instant;
 import java.util.Optional;
-import org.hypertrace.config.objectstore.ContextuallyIdentifiedObjectStore;
 import org.hypertrace.config.service.v1.ConfigServiceGrpc.ConfigServiceBlockingStub;
 import org.hypertrace.config.service.v1.ContextSpecificConfig;
 import org.hypertrace.config.service.v1.DeleteConfigRequest;
@@ -29,6 +31,8 @@
 class ContextuallyIdentifiedObjectStoreTest {
   private static final String TEST_RESOURCE_NAMESPACE = "test-namespace";
   private static final String TEST_RESOURCE_NAME = "test-resource";
+  private static final Instant TEST_CREATE_TIMESTAMP = Instant.ofEpochMilli(20);
+  private static final Instant TEST_UPDATE_TIMESTAMP = Instant.ofEpochMilli(40);
 
   @Mock ConfigServiceBlockingStub mockStub;
 
@@ -46,7 +50,7 @@ void generatesConfigReadRequestForGet() {
         .thenReturn(GetConfigResponse.newBuilder().setConfig(Values.of("test")).build());
     assertEquals(
         Optional.of(new TestObject("test")),
-        this.store.getObject(RequestContext.forTenantId("my-tenant")));
+        this.store.getData(RequestContext.forTenantId("my-tenant")));
 
     verify(this.mockStub, times(1))
         .getConfig(
@@ -59,7 +63,7 @@ void generatesConfigReadRequestForGet() {
     when(this.mockStub.getConfig(any())).thenThrow(Status.NOT_FOUND.asRuntimeException());
 
     assertEquals(
-        Optional.empty(), this.store.getObject(RequestContext.forTenantId("my-other-tenant")));
+        Optional.empty(), this.store.getData(RequestContext.forTenantId("my-other-tenant")));
 
     verify(this.mockStub, times(1))
         .getConfig(
@@ -75,10 +79,20 @@ void generatesConfigDeleteRequest() {
     when(this.mockStub.deleteConfig(any()))
         .thenReturn(
             DeleteConfigResponse.newBuilder()
-                .setDeletedConfig(ContextSpecificConfig.newBuilder().setConfig(Values.of("test")))
+                .setDeletedConfig(
+                    ContextSpecificConfig.newBuilder()
+                        .setConfig(Values.of("test"))
+                        .setContext("delete-tenant")
+                        .setCreationTimestamp(TEST_CREATE_TIMESTAMP.toEpochMilli())
+                        .setUpdateTimestamp(TEST_UPDATE_TIMESTAMP.toEpochMilli()))
                 .build());
     assertEquals(
-        Optional.of(new TestObject("test")),
+        Optional.of(
+            new ContextualConfigObjectImpl<>(
+                "delete-tenant",
+                new TestObject("test"),
+                TEST_CREATE_TIMESTAMP,
+                TEST_UPDATE_TIMESTAMP)),
         this.store.deleteObject(RequestContext.forTenantId("delete-tenant")));
 
     verify(this.mockStub)
@@ -98,9 +112,18 @@ void generatesConfigDeleteRequest() {
   @Test
   void generatesConfigUpsertRequest() {
     when(this.mockStub.upsertConfig(any()))
-        .thenReturn(UpsertConfigResponse.newBuilder().setConfig(Values.of("updated")).build());
+        .thenReturn(
+            UpsertConfigResponse.newBuilder()
+                .setConfig(Values.of("updated"))
+                .setCreationTimestamp(TEST_CREATE_TIMESTAMP.toEpochMilli())
+                .setUpdateTimestamp(TEST_UPDATE_TIMESTAMP.toEpochMilli())
+                .build());
     assertEquals(
-        new TestObject("updated"),
+        new ContextualConfigObjectImpl<>(
+            "upsert-tenant",
+            new TestObject("updated"),
+            TEST_CREATE_TIMESTAMP,
+            TEST_UPDATE_TIMESTAMP),
         this.store.upsertObject(
             RequestContext.forTenantId("upsert-tenant"), new TestObject("updated")));
     verify(this.mockStub, times(1))
@@ -124,12 +147,12 @@ private TestObjectStore(ConfigServiceBlockingStub stub) {
     }
 
     @Override
-    protected Optional<TestObject> buildObjectFromValue(Value value) {
+    protected Optional<TestObject> buildDataFromValue(Value value) {
       return Optional.of(new TestObject(value.getStringValue()));
     }
 
     @Override
-    protected Value buildValueFromObject(TestObject object) {
+    protected Value buildValueFromData(TestObject object) {
       return Values.of(object.getName());
     }
 
diff --git a/object-store/src/test/java/DefaultObjectStoreTest.java b/object-store/src/test/java/org/hypertrace/config/objectstore/DefaultObjectStoreTest.java
similarity index 75%
rename from object-store/src/test/java/DefaultObjectStoreTest.java
rename to object-store/src/test/java/org/hypertrace/config/objectstore/DefaultObjectStoreTest.java
index c0321c28..f3c3e1cf 100644
--- a/object-store/src/test/java/DefaultObjectStoreTest.java
+++ b/object-store/src/test/java/org/hypertrace/config/objectstore/DefaultObjectStoreTest.java
@@ -1,3 +1,5 @@
+package org.hypertrace.config.objectstore;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
@@ -8,8 +10,8 @@
 import com.google.protobuf.Value;
 import com.google.protobuf.util.Values;
 import io.grpc.Status;
+import java.time.Instant;
 import java.util.Optional;
-import org.hypertrace.config.objectstore.DefaultObjectStore;
 import org.hypertrace.config.service.change.event.api.ConfigChangeEventGenerator;
 import org.hypertrace.config.service.v1.ConfigServiceGrpc.ConfigServiceBlockingStub;
 import org.hypertrace.config.service.v1.ContextSpecificConfig;
@@ -31,6 +33,8 @@
 class DefaultObjectStoreTest {
   private static final String TEST_RESOURCE_NAMESPACE = "test-namespace";
   private static final String TEST_RESOURCE_NAME = "test-resource";
+  private static final Instant TEST_CREATE_TIMESTAMP = Instant.ofEpochMilli(20);
+  private static final Instant TEST_UPDATE_TIMESTAMP = Instant.ofEpochMilli(40);
 
   @Mock ConfigServiceBlockingStub mockStub;
 
@@ -52,8 +56,7 @@ void generatesConfigReadRequestForGet() {
     when(this.mockStub.getConfig(any()))
         .thenReturn(GetConfigResponse.newBuilder().setConfig(Values.of("test")).build());
 
-    assertEquals(
-        Optional.of(new TestObject("test")), this.store.getObject(this.mockRequestContext));
+    assertEquals(Optional.of(new TestObject("test")), this.store.getData(this.mockRequestContext));
 
     verify(this.mockStub, times(1))
         .getConfig(
@@ -64,7 +67,7 @@ void generatesConfigReadRequestForGet() {
 
     when(this.mockStub.getConfig(any())).thenThrow(Status.NOT_FOUND.asRuntimeException());
 
-    assertEquals(Optional.empty(), this.store.getObject(this.mockRequestContext));
+    assertEquals(Optional.empty(), this.store.getData(this.mockRequestContext));
 
     verify(this.mockStub, times(2))
         .getConfig(
@@ -76,13 +79,20 @@ void generatesConfigReadRequestForGet() {
 
   @Test
   void generatesConfigDeleteRequest() {
-
     when(this.mockStub.deleteConfig(any()))
         .thenReturn(
             DeleteConfigResponse.newBuilder()
-                .setDeletedConfig(ContextSpecificConfig.newBuilder().setConfig(Values.of("test")))
+                .setDeletedConfig(
+                    ContextSpecificConfig.newBuilder()
+                        .setConfig(Values.of("test"))
+                        .setCreationTimestamp(TEST_CREATE_TIMESTAMP.toEpochMilli())
+                        .setUpdateTimestamp(TEST_UPDATE_TIMESTAMP.toEpochMilli()))
                 .build());
-    assertEquals(Optional.of(new TestObject("test")), this.store.deleteObject(mockRequestContext));
+    assertEquals(
+        Optional.of(
+            new ConfigObjectImpl<>(
+                new TestObject("test"), TEST_CREATE_TIMESTAMP, TEST_UPDATE_TIMESTAMP)),
+        this.store.deleteObject(mockRequestContext));
 
     verify(this.mockStub)
         .deleteConfig(
@@ -99,9 +109,15 @@ void generatesConfigDeleteRequest() {
   @Test
   void generatesConfigUpsertRequest() {
     when(this.mockStub.upsertConfig(any()))
-        .thenReturn(UpsertConfigResponse.newBuilder().setConfig(Values.of("updated")).build());
+        .thenReturn(
+            UpsertConfigResponse.newBuilder()
+                .setCreationTimestamp(TEST_CREATE_TIMESTAMP.toEpochMilli())
+                .setUpdateTimestamp(TEST_UPDATE_TIMESTAMP.toEpochMilli())
+                .setConfig(Values.of("updated"))
+                .build());
     assertEquals(
-        new TestObject("updated"),
+        new ConfigObjectImpl<>(
+            new TestObject("updated"), TEST_CREATE_TIMESTAMP, TEST_UPDATE_TIMESTAMP),
         this.store.upsertObject(this.mockRequestContext, new TestObject("updated")));
     verify(this.mockStub, times(1))
         .upsertConfig(
@@ -124,12 +140,12 @@ private TestObjectStore(
     }
 
     @Override
-    protected Optional<TestObject> buildObjectFromValue(Value value) {
+    protected Optional<TestObject> buildDataFromValue(Value value) {
       return Optional.of(new TestObject(value.getStringValue()));
     }
 
     @Override
-    protected Value buildValueFromObject(TestObject object) {
+    protected Value buildValueFromData(TestObject object) {
       return Values.of(object.getName());
     }
   }
diff --git a/object-store/src/test/java/IdentifiedObjectStoreTest.java b/object-store/src/test/java/org/hypertrace/config/objectstore/IdentifiedObjectStoreTest.java
similarity index 68%
rename from object-store/src/test/java/IdentifiedObjectStoreTest.java
rename to object-store/src/test/java/org/hypertrace/config/objectstore/IdentifiedObjectStoreTest.java
index 0264fece..0e144cfe 100644
--- a/object-store/src/test/java/IdentifiedObjectStoreTest.java
+++ b/object-store/src/test/java/org/hypertrace/config/objectstore/IdentifiedObjectStoreTest.java
@@ -1,3 +1,5 @@
+package org.hypertrace.config.objectstore;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
@@ -9,12 +11,12 @@
 import com.google.protobuf.Value;
 import com.google.protobuf.util.Values;
 import io.grpc.Status;
+import java.time.Instant;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import lombok.Builder;
-import org.hypertrace.config.objectstore.IdentifiedObjectStore;
 import org.hypertrace.config.service.change.event.api.ConfigChangeEventGenerator;
 import org.hypertrace.config.service.v1.ConfigServiceGrpc.ConfigServiceBlockingStub;
 import org.hypertrace.config.service.v1.ContextSpecificConfig;
@@ -42,6 +44,9 @@
 class IdentifiedObjectStoreTest {
   private static final String TEST_RESOURCE_NAMESPACE = "test-namespace";
   private static final String TEST_RESOURCE_NAME = "test-resource";
+  private static final Instant TEST_CREATE_TIMESTAMP_1 = Instant.ofEpochMilli(20);
+  private static final Instant TEST_CREATE_TIMESTAMP_2 = Instant.ofEpochMilli(30);
+  private static final Instant TEST_UPDATE_TIMESTAMP = Instant.ofEpochMilli(40);
 
   private static final TestObject OBJECT_1 = TestObject.builder().id("first-id").rank(1).build();
 
@@ -84,11 +89,25 @@ void generatesConfigReadRequestForGetAll() {
         .thenReturn(
             GetAllConfigsResponse.newBuilder()
                 .addContextSpecificConfigs(
-                    ContextSpecificConfig.newBuilder().setConfig(OBJECT_2_AS_VALUE))
+                    ContextSpecificConfig.newBuilder()
+                        .setConfig(OBJECT_2_AS_VALUE)
+                        .setContext(OBJECT_2.getId())
+                        .setCreationTimestamp(TEST_CREATE_TIMESTAMP_2.toEpochMilli())
+                        .setUpdateTimestamp(TEST_UPDATE_TIMESTAMP.toEpochMilli()))
                 .addContextSpecificConfigs(
-                    ContextSpecificConfig.newBuilder().setConfig(OBJECT_1_AS_VALUE))
+                    ContextSpecificConfig.newBuilder()
+                        .setConfig(OBJECT_1_AS_VALUE)
+                        .setContext(OBJECT_1.getId())
+                        .setCreationTimestamp(TEST_CREATE_TIMESTAMP_1.toEpochMilli())
+                        .setUpdateTimestamp(TEST_UPDATE_TIMESTAMP.toEpochMilli()))
                 .build());
-    assertEquals(List.of(OBJECT_1, OBJECT_2), this.store.getAllObjects(this.mockRequestContext));
+    assertEquals(
+        List.of(
+            new ContextualConfigObjectImpl<>(
+                OBJECT_1.getId(), OBJECT_1, TEST_CREATE_TIMESTAMP_1, TEST_UPDATE_TIMESTAMP),
+            new ContextualConfigObjectImpl<>(
+                OBJECT_2.getId(), OBJECT_2, TEST_CREATE_TIMESTAMP_2, TEST_UPDATE_TIMESTAMP)),
+        this.store.getAllObjects(this.mockRequestContext));
 
     verify(this.mockStub)
         .getAllConfigs(
@@ -103,7 +122,7 @@ void generatesConfigReadRequestForGet() {
     when(this.mockStub.getConfig(any()))
         .thenReturn(GetConfigResponse.newBuilder().setConfig(OBJECT_1_AS_VALUE).build());
 
-    assertEquals(Optional.of(OBJECT_1), this.store.getObject(this.mockRequestContext, "id"));
+    assertEquals(Optional.of(OBJECT_1), this.store.getData(this.mockRequestContext, "id"));
 
     verify(this.mockStub, times(1))
         .getConfig(
@@ -115,7 +134,7 @@ void generatesConfigReadRequestForGet() {
 
     when(this.mockStub.getConfig(any())).thenThrow(Status.NOT_FOUND.asRuntimeException());
 
-    assertEquals(Optional.empty(), this.store.getObject(this.mockRequestContext, "second-id"));
+    assertEquals(Optional.empty(), this.store.getData(this.mockRequestContext, "second-id"));
 
     verify(this.mockStub, times(1))
         .getConfig(
@@ -128,13 +147,21 @@ void generatesConfigReadRequestForGet() {
 
   @Test
   void generatesConfigDeleteRequest() {
-
     when(this.mockStub.deleteConfig(any()))
         .thenReturn(
             DeleteConfigResponse.newBuilder()
-                .setDeletedConfig(ContextSpecificConfig.newBuilder().setConfig(OBJECT_1_AS_VALUE))
+                .setDeletedConfig(
+                    ContextSpecificConfig.newBuilder()
+                        .setConfig(OBJECT_1_AS_VALUE)
+                        .setContext(OBJECT_1.getId())
+                        .setCreationTimestamp(TEST_CREATE_TIMESTAMP_1.toEpochMilli())
+                        .setUpdateTimestamp(TEST_UPDATE_TIMESTAMP.toEpochMilli()))
                 .build());
-    assertEquals(Optional.of(OBJECT_1), this.store.deleteObject(mockRequestContext, "some-id"));
+    assertEquals(
+        Optional.of(
+            new ContextualConfigObjectImpl<>(
+                OBJECT_1.getId(), OBJECT_1, TEST_CREATE_TIMESTAMP_1, TEST_UPDATE_TIMESTAMP)),
+        this.store.deleteObject(mockRequestContext, "some-id"));
 
     verify(this.mockStub)
         .deleteConfig(
@@ -152,8 +179,16 @@ void generatesConfigDeleteRequest() {
   @Test
   void generatesConfigUpsertRequest() {
     when(this.mockStub.upsertConfig(any()))
-        .thenReturn(UpsertConfigResponse.newBuilder().setConfig(OBJECT_1_AS_VALUE).build());
-    assertEquals(OBJECT_1, this.store.upsertObject(this.mockRequestContext, OBJECT_1));
+        .thenReturn(
+            UpsertConfigResponse.newBuilder()
+                .setConfig(OBJECT_1_AS_VALUE)
+                .setCreationTimestamp(TEST_CREATE_TIMESTAMP_1.toEpochMilli())
+                .setUpdateTimestamp(TEST_UPDATE_TIMESTAMP.toEpochMilli())
+                .build());
+    assertEquals(
+        new ContextualConfigObjectImpl<>(
+            OBJECT_1.getId(), OBJECT_1, TEST_CREATE_TIMESTAMP_1, TEST_UPDATE_TIMESTAMP),
+        this.store.upsertObject(this.mockRequestContext, OBJECT_1));
     verify(this.mockStub, times(1))
         .upsertConfig(
             UpsertConfigRequest.newBuilder()
@@ -173,13 +208,21 @@ void generatesUpsertRequestsForUpsertAll() {
                   invocation.<UpsertAllConfigsRequest>getArgument(0).getConfigsList().stream()
                       .map(
                           requestedUpsert ->
-                              UpsertedConfig.newBuilder().setConfig(requestedUpsert.getConfig()))
+                              UpsertedConfig.newBuilder()
+                                  .setConfig(requestedUpsert.getConfig())
+                                  .setContext(requestedUpsert.getContext())
+                                  .setCreationTimestamp(TEST_CREATE_TIMESTAMP_1.toEpochMilli())
+                                  .setUpdateTimestamp(TEST_UPDATE_TIMESTAMP.toEpochMilli()))
                       .map(UpsertedConfig.Builder::build)
                       .collect(Collectors.toUnmodifiableList());
               return UpsertAllConfigsResponse.newBuilder().addAllUpsertedConfigs(configs).build();
             });
     assertEquals(
-        List.of(OBJECT_1, OBJECT_2),
+        List.of(
+            new ContextualConfigObjectImpl<>(
+                OBJECT_1.getId(), OBJECT_1, TEST_CREATE_TIMESTAMP_1, TEST_UPDATE_TIMESTAMP),
+            new ContextualConfigObjectImpl<>(
+                OBJECT_2.getId(), OBJECT_2, TEST_CREATE_TIMESTAMP_1, TEST_UPDATE_TIMESTAMP)),
         this.store.upsertObjects(this.mockRequestContext, List.of(OBJECT_1, OBJECT_2)));
     verify(this.mockStub, times(1))
         .upsertAllConfigs(
@@ -213,7 +256,7 @@ private TestObjectStore(
     }
 
     @Override
-    protected Optional<TestObject> buildObjectFromValue(Value value) {
+    protected Optional<TestObject> buildDataFromValue(Value value) {
       return Optional.of(
           TestObject.builder()
               .rank((int) value.getStructValue().getFieldsOrThrow("rank").getNumberValue())
@@ -222,7 +265,7 @@ protected Optional<TestObject> buildObjectFromValue(Value value) {
     }
 
     @Override
-    protected Value buildValueFromObject(TestObject object) {
+    protected Value buildValueFromData(TestObject object) {
       return Value.newBuilder()
           .setStructValue(
               Struct.newBuilder()
@@ -232,14 +275,15 @@ protected Value buildValueFromObject(TestObject object) {
     }
 
     @Override
-    protected String getContextFromObject(TestObject object) {
+    protected String getContextFromData(TestObject object) {
       return object.getId();
     }
 
     @Override
-    protected List<TestObject> orderFetchedObjects(List<TestObject> objects) {
+    protected List<ContextualConfigObject<TestObject>> orderFetchedObjects(
+        List<ContextualConfigObject<TestObject>> objects) {
       return objects.stream()
-          .sorted(Comparator.comparing(TestObject::getRank))
+          .sorted(Comparator.comparing(object -> object.getData().getRank()))
           .collect(Collectors.toUnmodifiableList());
     }
   }