diff --git a/MapboxMobileEvents.xcodeproj/xcshareddata/xcschemes/MapboxMobileMetrics.xcscheme b/MapboxMobileEvents.xcodeproj/xcshareddata/xcschemes/MapboxMobileMetrics.xcscheme
index 7916d695..0abef6c3 100644
--- a/MapboxMobileEvents.xcodeproj/xcshareddata/xcschemes/MapboxMobileMetrics.xcscheme
+++ b/MapboxMobileEvents.xcodeproj/xcshareddata/xcschemes/MapboxMobileMetrics.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/MapboxMobileEvents/MMEEvent.h b/MapboxMobileEvents/MMEEvent.h
index 829dce3c..b3640ebf 100644
--- a/MapboxMobileEvents/MMEEvent.h
+++ b/MapboxMobileEvents/MMEEvent.h
@@ -21,5 +21,6 @@
 + (instancetype)debugEventWithAttributes:(NSDictionary *)attributes;
 + (instancetype)searchEventWithName:(NSString *)name attributes:(NSDictionary *)attributes;
 + (instancetype)carplayEventWithName:(NSString *)name attributes:(NSDictionary *)attributes;
++ (instancetype)eventWithDateString:(NSString *)dateString name:(NSString *)name attributes:(NSDictionary *)attributes;
 
 @end
diff --git a/MapboxMobileEvents/MMEEvent.m b/MapboxMobileEvents/MMEEvent.m
index 493823eb..8188c915 100644
--- a/MapboxMobileEvents/MMEEvent.m
+++ b/MapboxMobileEvents/MMEEvent.m
@@ -160,6 +160,17 @@ + (instancetype)carplayEventWithName:(NSString *)name attributes:(NSDictionary *
     return carplayEvent;
 }
 
++ (instancetype)eventWithDateString:(NSString *)dateString name:(NSString *)name attributes:(NSDictionary *)attributes {
+    MMEEvent *event = [[MMEEvent alloc] init];
+    event.name = name;
+    NSMutableDictionary *commonAttributes = [NSMutableDictionary dictionary];
+    commonAttributes[MMEEventKeyEvent] = event.name;
+    commonAttributes[MMEEventKeyCreated] = dateString;
+    [commonAttributes addEntriesFromDictionary:attributes];
+    event.attributes = commonAttributes;
+    return event;
+}
+
 + (NSInteger)contentSizeScale {
     NSInteger result = -9999;
     
diff --git a/MapboxMobileEvents/MMEEventsManager.m b/MapboxMobileEvents/MMEEventsManager.m
index 4c79ae6f..b7a3f121 100644
--- a/MapboxMobileEvents/MMEEventsManager.m
+++ b/MapboxMobileEvents/MMEEventsManager.m
@@ -388,8 +388,10 @@ - (void)createAndPushEventBasedOnName:(NSString *)name attributes:(NSDictionary
                                              MMEEventKeyLocalDebugDescription: [NSString stringWithFormat:@"Pushing event: %@", event]}];
         [self pushEvent:event];
     } else {
+        event = [MMEEvent eventWithDateString:[self.dateWrapper formattedDateStringForDate:[self.dateWrapper date]] name:name attributes:attributes];
         [self pushDebugEventWithAttributes:@{MMEDebugEventType: MMEDebugEventTypePush,
-                                             MMEEventKeyLocalDebugDescription: [NSString stringWithFormat:@"Unknown event: %@", event]}];
+                                             MMEEventKeyLocalDebugDescription: [NSString stringWithFormat:@"Pushing generic event: %@", event]}];
+        [self pushEvent:event];
     }
 }
 
diff --git a/MapboxMobileEventsTests/MMEEventsManagerTests.mm b/MapboxMobileEventsTests/MMEEventsManagerTests.mm
index 0f281fee..4781b510 100644
--- a/MapboxMobileEventsTests/MMEEventsManagerTests.mm
+++ b/MapboxMobileEventsTests/MMEEventsManagerTests.mm
@@ -896,13 +896,13 @@ @interface MMEEventsManager (Tests) <MMELocationManagerDelegate>
                 });
             });
             
-            context(@"when an unknown event is pushed", ^{
+            context(@"when a generic event is pushed", ^{
                 beforeEach(^{
-                    [eventsManager enqueueEventWithName:@"invalid" attributes:attributes];
+                    [eventsManager enqueueEventWithName:@"generic" attributes:attributes];
                 });
                 
-                it(@"does not queue the event", ^{
-                    eventsManager.eventQueue.count should equal(0);
+                it(@"does queue the event", ^{
+                    eventsManager.eventQueue.count should equal(1);
                 });
             });
         });