diff --git a/MongoImporter.py b/MongoImporter.py
index 362aa49..c41a3d7 100644
--- a/MongoImporter.py
+++ b/MongoImporter.py
@@ -17,14 +17,15 @@ DEBUG = True
 DEBUG_TO_STDOUT = True
 
 DATABASE_CONFIG = {
-    'period':60,
-    'host':'localhost',
+    'period':1,
+    'host':'172.16.2.17',
     'user':'smarthome',
     'password':'smarthome123',
-    'db':'smarthome'
+    'db':'testhome'
 }
 QUEUE_CONFIG = {
-    'file':'/tmp/mqttDispatcherQueue'
+    'file':'/tmp/mqttDispatcherQueue',
+    'maxsize':1000
 }
 
 Logger.openlog(LOG_FILE)
@@ -97,4 +98,4 @@ for item in coll.find():
     except KeyError:
         raise Exception("KeyError in item %s" % (item))
         
-Logger.log("Done")
\ No newline at end of file
+Logger.log("Done")
diff --git a/MqttDispatcher.py b/MqttDispatcher.py
index dec86bd..8064994 100644
--- a/MqttDispatcher.py
+++ b/MqttDispatcher.py
@@ -51,7 +51,8 @@ DATABASE_CONFIG = {
 #}
 
 QUEUE_CONFIG = {
-    'file':'/tmp/mqttDispatcherQueue'
+    'file':'/tmp/mqttDispatcherQueue',
+    'maxsize':0
 }
 
 if BACKGROUND:
diff --git a/PersistentQueue.py b/PersistentQueue.py
index 1b5ab9d..03cd5b0 100644
--- a/PersistentQueue.py
+++ b/PersistentQueue.py
@@ -4,11 +4,11 @@ from persistqueue import Queue
 class PersistentQueue(object):
     def __init__(self, config):
         super(PersistentQueue, self).__init__()
-        self.queue = Queue(config['file'])
+        self.queue = Queue(config['file'], config['maxsize'])
 
     def execute(self, data):
         Logger.log("PersistentQueue %s" % (str(data)))
-        self.queue.put_nowait(data)
+        self.queue.put(data)
 
     def empty(self):
         return not self.queue.qsize()