diff --git a/Yavsc/Helpers/EventHelpers.cs b/Yavsc/Helpers/EventHelpers.cs
index 2db3929f..5277706d 100644
--- a/Yavsc/Helpers/EventHelpers.cs
+++ b/Yavsc/Helpers/EventHelpers.cs
@@ -6,17 +6,20 @@ namespace Yavsc.Helpers
 {
     public static class EventHelpers
     {
-        public static YaEvent CreateEvent(this BookQuery query,
+        public static BookQueryEvent CreateEvent(this BookQuery query,
         IStringLocalizer SR)
         {
-            var yaev = new YaEvent
+            var yaev = new BookQueryEvent
             {
                 Title = query.Client.UserName + " "+ SR["is asking you for a date"]+".",
                 Comment = (query.Previsional != null) ?
                 SR["Deposit"] + string.Format(": {0:00}",
                     query.Previsional) : SR["No deposit."],
                 Description = SR["Address"] + ": " + query.Location.Address + "\n" +
-                SR["Date"] + ": " + query.EventDate.ToString("D")
+                SR["Date"] + ": " + query.EventDate.ToString("D"),
+                StartDate = query.EventDate,
+                Location = query.Location,
+                CommandId = query.Id
             };
             return yaev;
         }