     
     // #pragma mark - CRUD Relationship
     
-    func updateRelationship(aRelationship: SORelationship) {
+    func updateRelationship(aRelationship: Relationship) {
         self.relationshipStore.updateObject(aRelationship)
     }
     
-    func deleteProperty(aRelationship: SORelationship) {
+    func deleteProperty(aRelationship: Relationship) {
         self.relationshipStore.deleteObject(aRelationship)
         
         aRelationship.context = nil;

    // #pragma mark - CRUD Property
    
    
    func updateProperty(aProperty: SOProperty) {
        self.propertyStore.updateObject(aProperty)
    }

    func deleteProperty(aProperty: SOProperty) {
        self.propertyStore.deleteObject(aProperty)
        
        aProperty.context = nil;

        self.nodeStore.cache.name = "nodeStore"  // TODO: automate
        
        var relationshipStoreURL = self.url.URLByAppendingPathComponent(cRelationshipStoreFileName)
        self.relationshipStore = ObjectStore<Relationship>(url:relationshipStoreURL)
        //self.relationshipStore.setupStore(SORelationship())
        self.nodeStore.cache.name = "relationshipStore"
        
        var propertyStoreURL = self.url.URLByAppendingPathComponent(cPropertyStoreFileName)
        self.propertyStore = ObjectStore<Property>(url: propertyStoreURL)
        //self.propertyStore.setupStore(SOProperty())
        self.propertyStore.cache.name = "propertyStore"
        
        var stringStoreURL = self.url.URLByAppendingPathComponent(cStringStoreFileName)
