diff --git a/src/Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs b/src/Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs
index 9409093e..5e9118f3 100644
--- a/src/Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs
+++ b/src/Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs
@@ -1,21 +1,22 @@
 using System;
 using Yavsc.Abstract.Identity;
+using Yavsc.Models.Relationship;
 
 namespace Yavsc.Models
 {
 
     public class RdvQueryProviderInfo
     {
+        /// <summary>
+        /// User querying
+        /// </summary>
+        /// <value></value>
         public ClientProviderInfo Client { get; set; }
-        public ILocation Location { get; set; }
-
+        public Location Location { get; set; }
         public long Id { get; set; }
-
         public DateTime? EventDate { get; set; }
         public decimal? Previsional { get; set; }
-
         public string Reason { get; set; }
-
         public string ActivityCode { get; set; }
         public string BillingCode { get; set; }
     }
diff --git a/src/Yavsc.Abstract/Relationship/Location.cs b/src/Yavsc.Abstract/Relationship/Location.cs
new file mode 100644
index 00000000..b7372926
--- /dev/null
+++ b/src/Yavsc.Abstract/Relationship/Location.cs
@@ -0,0 +1,16 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Yavsc.Attributes.Validation;
+
+namespace Yavsc.Models.Relationship
+{
+
+    public class Location : Position, ILocation {
+        [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public long Id { get; set; }
+        [YaRequired(),
+        Display(Name="Address"),
+        MaxLength(512)]
+        public string Address { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Yavsc.Server/Models/Relationship/Location.cs b/src/Yavsc.Abstract/Relationship/Position.cs
similarity index 62%
rename from src/Yavsc.Server/Models/Relationship/Location.cs
rename to src/Yavsc.Abstract/Relationship/Position.cs
index 0287368e..89ea7437 100644
--- a/src/Yavsc.Server/Models/Relationship/Location.cs
+++ b/src/Yavsc.Abstract/Relationship/Position.cs
@@ -1,10 +1,8 @@
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 using Yavsc.Attributes.Validation;
 
 namespace Yavsc.Models.Relationship
 {
-
     /// <summary>
     /// Position.
     /// </summary>
@@ -27,13 +25,4 @@ namespace Yavsc.Models.Relationship
 		public double Latitude { get; set; }
 
 	}
-
-    public class Location : Position, ILocation {
-        [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public long Id { get; set; }
-        [YaRequired(),
-        Display(Name="Address"),
-        MaxLength(512)]
-        public string Address { get; set; }
-    }
 }
\ No newline at end of file
diff --git a/version.txt b/version.txt
index 9a4eccc2..77fa9bb2 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.0.6-rc08
+1.0.6-rc09