diff --git a/ContentDirectory.py b/ContentDirectory.py
index 3773ddf..835402d 100644
--- a/ContentDirectory.py
+++ b/ContentDirectory.py
@@ -64,13 +64,13 @@ class ContentDirectoryControl(UPnPPublisher, dict):
 		assert isinstance(self[item], Container)
 		return self.children[item][:]
 
-	def __init__(self, title, *args):
+	def __init__(self, title, *args, **kwargs):
 		super(ContentDirectoryControl, self).__init__(*args)
 		fakeparent = '-1'
 		self.nextID = 0
 		self.children = { fakeparent: []}
 		self[fakeparent] = Container(None, None, '-1', 'fake')
-		root = self.addContainer(fakeparent, title)
+		root = self.addContainer(fakeparent, title, **kwargs)
 		assert root == '0'
 		del self[fakeparent]
 		del self.children[fakeparent]
@@ -227,8 +227,8 @@ class ContentDirectoryControl(UPnPPublisher, dict):
 		    (`ContainerID`, `ObjectID`))
 
 class ContentDirectoryServer(resource.Resource):
-	def __init__(self, title):
+	def __init__(self, title, *args, **kwargs):
 		resource.Resource.__init__(self)
 		self.putChild('scpd.xml', static.File('content-directory-scpd.xml'))
-		self.control = ContentDirectoryControl(title)
+		self.control = ContentDirectoryControl(title, *args, **kwargs)
 		self.putChild('control', self.control)
diff --git a/pymediaserv b/pymediaserv
index 380c3ed..97a02cc 100755
--- a/pymediaserv
+++ b/pymediaserv
@@ -65,7 +65,7 @@ class RootDevice(static.Data):
 		static.Data.__init__(self, d, 'text/xml')
 
 root = WebServer()
-cds = ContentDirectoryServer('My Media Server')
+cds = ContentDirectoryServer('My Media Server', klass = FSDirectory, path = 'media', urlbase = urlbase)  # This sets up the root to be the media dir so we don't have to enumerate the directory
 root.putChild('ContentDirectory', cds)
 cds = cds.control
 root.putChild('ConnectionManager', ConnectionManagerServer())
@@ -88,8 +88,6 @@ medianode.contentTypes.update( {
 })
 root.putChild('media', medianode)
 
-cds.addContainer('0', 'media', klass = FSDirectory, path = 'media', urlbase = urlbase)
-
 site = server.Site(root)
 reactor.listenTCP(listenPort, site)