diff --git a/Demo/Classes/NewItemViewController.h b/Demo/Classes/NewItemViewController.h
index bc5595e..fb53ce1 100644
--- a/Demo/Classes/NewItemViewController.h
+++ b/Demo/Classes/NewItemViewController.h
@@ -28,4 +28,5 @@
 
 @property(nonatomic,retain)IBOutlet	UITextView *textView;
 @property(assign) id delegate;
+
 @end
diff --git a/Demo/Classes/NewItemViewController.m b/Demo/Classes/NewItemViewController.m
index af20457..a007caa 100644
--- a/Demo/Classes/NewItemViewController.m
+++ b/Demo/Classes/NewItemViewController.m
@@ -80,7 +80,7 @@ -(void)done
     NSString *guid = (NSString*)CFUUIDCreateString(nil, uuid);
     CFRelease(uuid);
 	NSString *docId = [NSString stringWithFormat:@"%f-%@", CFAbsoluteTimeGetCurrent(), guid];
-	DatabaseManager *sharedManager = [DatabaseManager sharedManager];
+	DatabaseManager *sharedManager = [DatabaseManager sharedManager:[delegate getCouchbaseURL]];
 	CURLOperation *op = [sharedManager.database operationToCreateDocument:inDocument 
 															   identifier:docId
 														   successHandler:inSuccessHandler 
diff --git a/Demo/Classes/RootViewController.h b/Demo/Classes/RootViewController.h
index 8ca328b..da2b2bb 100644
--- a/Demo/Classes/RootViewController.h
+++ b/Demo/Classes/RootViewController.h
@@ -32,5 +32,6 @@
 
 -(void)loadItemsIntoView;
 -(void)couchbaseDidStart:(NSURL *)serverURL;
+-(NSURL *)getCouchbaseURL;
 
 @end
diff --git a/Demo/Classes/RootViewController.m b/Demo/Classes/RootViewController.m
index 87a84f1..fc179f5 100644
--- a/Demo/Classes/RootViewController.m
+++ b/Demo/Classes/RootViewController.m
@@ -33,6 +33,9 @@ @implementation RootViewController
 #pragma mark -
 #pragma mark View lifecycle
 
+-(NSURL *)getCouchbaseURL {
+	return self.couchbaseURL;
+}
 
 -(void)couchbaseDidStart:(NSURL *)serverURL {
 	self.couchbaseURL = serverURL;