diff --git a/.gitignore b/.gitignore
index a94278b..4ec3da8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,8 @@
 *.swp
 *~
 *.pyc
+/tasks.sqlite
+/tasks.sqlite-wal
+/srvinstallation
+/tasks.sqlite-shm
+.idea
\ No newline at end of file
diff --git a/libtisbackup/backup_samba4.py b/libtisbackup/backup_samba4.py
new file mode 100644
index 0000000..de7f9be
--- /dev/null
+++ b/libtisbackup/backup_samba4.py
@@ -0,0 +1,165 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+# -----------------------------------------------------------------------
+#    This file is part of TISBackup
+#
+#    TISBackup is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    TISBackup is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with TISBackup.  If not, see <http://www.gnu.org/licenses/>.
+#
+# -----------------------------------------------------------------------
+
+
+
+import sys
+try:
+    sys.stderr = open('/dev/null')       # Silence silly warnings from paramiko
+    import paramiko
+except ImportError,e:
+    print "Error : can not load paramiko library %s" % e
+    raise
+
+sys.stderr = sys.__stderr__
+
+from common import *
+
+class backup_samba4(backup_generic):
+    """Backup a samba4 databases as gzipped tdbs file through ssh"""
+    type = 'samba4'
+    required_params = backup_generic.required_params + ['private_key']
+    optional_params = backup_generic.optional_params + ['root_dir_samba']
+
+    root_dir_samba = "/usr/local/samba/"
+    def do_backup(self,stats):
+        self.dest_dir = os.path.join(self.backup_dir,self.backup_start_date)
+
+
+        if not os.path.isdir(self.dest_dir):
+            if not self.dry_run:
+                os.makedirs(self.dest_dir)
+            else:
+                print 'mkdir "%s"' % self.dest_dir
+        else:
+            raise Exception('backup destination directory already exists : %s' % self.dest_dir)
+
+        self.logger.debug('[%s] Connecting to %s with user root and key %s',self.backup_name,self.server_name,self.private_key)
+        try:
+            mykey = paramiko.RSAKey.from_private_key_file(self.private_key)
+        except paramiko.SSHException:
+            mykey = paramiko.DSSKey.from_private_key_file(self.private_key)
+
+        self.ssh = paramiko.SSHClient()
+        self.ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+        self.ssh.connect(self.server_name,username='root',pkey = mykey, port=self.ssh_port)
+
+        stats['log']= "Successfully backuping processed to the following databases :"
+        stats['status']='List'
+        dir_ldbs = os.path.join(self.root_dir_samba+'/private/sam.ldb.d/')
+        cmd = 'ls %s/*.ldb 2> /dev/null' % dir_ldbs
+        self.logger.debug('[%s] List databases: %s',self.backup_name,cmd)
+        (error_code,output) = ssh_exec(cmd,ssh=self.ssh)
+        self.logger.debug("[%s] Output of %s :\n%s",self.backup_name,cmd,output)
+        if error_code:
+            raise Exception('Aborting, Not null exit code (%i) for "%s"' % (error_code,cmd))
+        databases = output.split('\n')
+        for database in databases:
+            if database != "":
+                self.db_name = database.rstrip()
+                self.do_mysqldump(stats)
+
+
+    def do_mysqldump(self,stats):
+        t = datetime.datetime.now()
+        backup_start_date =  t.strftime('%Y%m%d-%Hh%Mm%S')
+
+        # dump db
+        stats['status']='Dumping'
+        cmd = 'tdbbackup -s .tisbackup ' + self.db_name
+        self.logger.debug('[%s] Dump DB : %s',self.backup_name,cmd)
+        if not self.dry_run:
+            (error_code,output) = ssh_exec(cmd,ssh=self.ssh)
+            print output
+            self.logger.debug("[%s] Output of %s :\n%s",self.backup_name,cmd,output)
+            if error_code:
+                raise Exception('Aborting, Not null exit code (%i) for "%s"' % (error_code,cmd))
+
+        # zip the file
+        stats['status']='Zipping'
+        cmd = 'gzip "%s.tisbackup"' % self.db_name
+        self.logger.debug('[%s] Compress backup : %s',self.backup_name,cmd)
+        if not self.dry_run:
+            (error_code,output) = ssh_exec(cmd,ssh=self.ssh)
+            self.logger.debug("[%s] Output of %s :\n%s",self.backup_name,cmd,output)
+            if error_code:
+                raise Exception('Aborting, Not null exit code (%i) for "%s"' % (error_code,cmd))
+
+        # get the file
+        stats['status']='SFTP'
+        filepath = self.db_name + '.tisbackup.gz'
+        localpath = os.path.join(self.dest_dir , os.path.basename(self.db_name) + '.tisbackup.gz')
+        self.logger.debug('[%s] Get gz backup with sftp on %s from %s to %s',self.backup_name,self.server_name,filepath,localpath)
+        if not self.dry_run:
+            transport =  self.ssh.get_transport()
+            sftp = paramiko.SFTPClient.from_transport(transport)
+            sftp.get(filepath, localpath)
+            sftp.close()
+
+        if not self.dry_run:
+            stats['total_files_count']=1 + stats.get('total_files_count', 0)
+            stats['written_files_count']=1 + stats.get('written_files_count', 0)
+            stats['total_bytes']=os.stat(localpath).st_size + stats.get('total_bytes', 0)
+            stats['written_bytes']=os.stat(localpath).st_size  +  stats.get('written_bytes', 0)  
+        stats['log'] = '%s "%s"' % (stats['log'] ,self.db_name)
+        stats['backup_location'] = self.dest_dir 
+
+        stats['status']='RMTemp'
+        cmd = 'rm -f  "%s"' % filepath
+        self.logger.debug('[%s] Remove temp gzip : %s',self.backup_name,cmd)
+        if not self.dry_run:
+            (error_code,output) = ssh_exec(cmd,ssh=self.ssh)
+            self.logger.debug("[%s] Output of %s :\n%s",self.backup_name,cmd,output)
+            if error_code:
+                raise Exception('Aborting, Not null exit code (%i) for "%s"' % (error_code,cmd))
+        stats['status']='OK'
+
+    def register_existingbackups(self):
+        """scan backup dir and insert stats in database"""
+
+        registered = [b['backup_location'] for b in self.dbstat.query('select distinct backup_location from stats where backup_name=?',(self.backup_name,))]
+
+        filelist = os.listdir(self.backup_dir)
+        filelist.sort()
+        p = re.compile('^\d{8,8}-\d{2,2}h\d{2,2}m\d{2,2}$') 
+        for item in filelist:
+            if p.match(item):
+                dir_name = os.path.join(self.backup_dir,item)
+                if not dir_name in registered:
+                    start = datetime.datetime.strptime(item,'%Y%m%d-%Hh%Mm%S').isoformat()
+                    if fileisodate(dir_name)>start:
+                        stop = fileisodate(dir_name)
+                    else:
+                        stop = start
+                    self.logger.info('Registering %s started on %s',dir_name,start)
+                    self.logger.debug('  Disk usage %s','du -sb "%s"' % dir_name)
+                    if not self.dry_run:
+                        size_bytes = int(os.popen('du -sb "%s"' % dir_name).read().split('\t')[0])
+                    else:
+                        size_bytes = 0
+                    self.logger.debug('  Size in bytes : %i',size_bytes)
+                    if not self.dry_run:
+                        self.dbstat.add(self.backup_name,self.server_name,'',\
+                                        backup_start=start,backup_end = stop,status='OK',total_bytes=size_bytes,backup_location=dir_name)
+                else:
+                    self.logger.info('Skipping %s, already registered',dir_name)
+
+
+register_driver(backup_samba4)
\ No newline at end of file
diff --git a/tisbackup.py b/tisbackup.py
index e369670..6828312 100755
--- a/tisbackup.py
+++ b/tisbackup.py
@@ -17,32 +17,10 @@
 #    along with TISBackup.  If not, see <http://www.gnu.org/licenses/>.
 #
 # -----------------------------------------------------------------------
-import os
-import datetime
-import subprocess
-from iniparse import ConfigParser
 from optparse import OptionParser
 
-import re
-import sys
-import getopt
-import os.path
-import logging
-from libtisbackup.common import *
-from libtisbackup.backup_mysql import backup_mysql 
-from libtisbackup.backup_rsync import backup_rsync
-from libtisbackup.backup_rsync import backup_rsync_ssh
-from libtisbackup.backup_oracle import backup_oracle
-from libtisbackup.backup_rsync_btrfs import backup_rsync_btrfs
-from libtisbackup.backup_rsync_btrfs import backup_rsync__btrfs_ssh
-from libtisbackup.backup_pgsql import backup_pgsql
-from libtisbackup.backup_xva import backup_xva
-from libtisbackup.backup_vmdk import backup_vmdk
-from libtisbackup.backup_switch import backup_switch
 from libtisbackup.backup_null import backup_null
-from libtisbackup.backup_xcp_metadata import backup_xcp_metadata
-from libtisbackup.copy_vm_xcp import copy_vm_xcp
-from libtisbackup.backup_sqlserver import backup_sqlserver
+from libtisbackup.common import *
 
 usage="""\
 %prog -c configfile action
@@ -64,7 +42,7 @@ version="VERSION"
 parser=OptionParser(usage=usage,version="%prog " + version)
 parser.add_option("-c","--config", dest="config", default='/etc/tis/tisbackup-config.ini', help="Config file full path (default: %default)")
 parser.add_option("-d","--dry-run",    dest="dry_run",    default=False, action='store_true', help="Dry run (default: %default)")
-parser.add_option("-v","--verbose",    dest="verbose",  default=False, action='store_true', help="More information (default: %default)")
+parser.add_option("-v","--verbose",    dest="verbose", default=False, action='store_true', help="More information (default: %default)")
 parser.add_option("-s","--sections", dest="sections", default='', help="Comma separated list of sections (backups) to process (default: All)")
 parser.add_option("-l","--loglevel", dest="loglevel", default='info', type='choice',  choices=['debug','warning','info','error','critical'], metavar='LOGLEVEL',help="Loglevel (default: %default)")
 parser.add_option("-n","--len", dest="statscount", default=30, type='int', help="Number of lines to list for dumpstat (default: %default)")