diff --git a/lam/lib/baseModule.inc b/lam/lib/baseModule.inc
index 78a9ae4d..89659ca7 100644
--- a/lam/lib/baseModule.inc
+++ b/lam/lib/baseModule.inc
@@ -1,9 +1,11 @@
 <?php
+use \LAM\PDF\PDFLabelValue;
+use \LAM\PDF\PDFTable;
 /*
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2003 - 2016  Roland Gruber
+  Copyright (C) 2003 - 2017  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/lam/lib/lists.inc b/lam/lib/lists.inc
index 0e174adb..f114960b 100644
--- a/lam/lib/lists.inc
+++ b/lam/lib/lists.inc
@@ -5,7 +5,7 @@ use LAM\TYPES\ConfiguredType;
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2003 - 2016  Roland Gruber
+  Copyright (C) 2003 - 2017  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -609,7 +609,7 @@ class lamList {
 			if ($option == 'DN') {
 				$_SESSION["accountPDF"] = new accountContainer($this->type, "accountPDF");
 				$_SESSION["accountPDF"]->load_account(base64_decode($_POST['clickedAccount']));
-				$filename = createModulePDF(array($_SESSION["accountPDF"]),$pdfStruct);
+				$filename = \LAM\PDF\createModulePDF(array($_SESSION["accountPDF"]),$pdfStruct);
 				unset($_SESSION["accountPDF"]);
 			}
 			// create for all selected accounts
@@ -624,7 +624,7 @@ class lamList {
 					$list[$i] = $_SESSION["accountPDF-$i"];
 				}
 				if (sizeof($list) > 0) {
-					$filename = createModulePDF($list,$pdfStruct);
+					$filename = \LAM\PDF\createModulePDF($list,$pdfStruct);
 					for ($i = 0; $i < sizeof($accounts); $i++) {
 						unset($_SESSION["accountPDF-$i"]);
 					}
@@ -640,7 +640,7 @@ class lamList {
 					$list[$i] = $_SESSION["accountPDF-$i"];
 				}
 				if (sizeof($list) > 0) {
-					$filename = createModulePDF($list,$pdfStruct);
+					$filename = \LAM\PDF\createModulePDF($list,$pdfStruct);
 					for ($i = 0; $i < $entriesCount; $i++) {
 						// clean session
 						unset($_SESSION["accountPDF-$i"]);
@@ -648,7 +648,7 @@ class lamList {
 				}
 			}
 			elseif ($option == 'SESSION') {
-				$filename = createModulePDF(array($_SESSION[$_POST['PDFSessionID']]),$pdfStruct);
+				$filename = \LAM\PDF\createModulePDF(array($_SESSION[$_POST['PDFSessionID']]),$pdfStruct);
 				unset($_SESSION[$_POST['PDFSessionID']]);
 			}
 			if ($filename != '') {
diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc
index f73e8de9..f46b05af 100644
--- a/lam/lib/modules.inc
+++ b/lam/lib/modules.inc
@@ -2018,8 +2018,7 @@ class accountContainer {
 		if (isset($this->finalDN)) {
 			$dn = $this->finalDN;
 		}
-		$return = array_merge($return,array('main_dn' => array(new PDFLabelValue(_('DN'), $dn))));
-		//$return = array_merge($return,array('main_dn' => array('<block><key>' . _('DN') . '</key><value>' . $dn . '</value></block>')));
+		$return = array_merge($return,array('main_dn' => array(new \LAM\PDF\PDFLabelValue(_('DN'), $dn))));
 		return $return;
 	}
 
diff --git a/lam/lib/modules/asteriskExtension.inc b/lam/lib/modules/asteriskExtension.inc
index a54e14cc..51c9b4a4 100644
--- a/lam/lib/modules/asteriskExtension.inc
+++ b/lam/lib/modules/asteriskExtension.inc
@@ -1,11 +1,13 @@
 <?php
-
+use \LAM\PDF\PDFTable;
+use \LAM\PDF\PDFTableCell;
+use \LAM\PDF\PDFTableRow;
 /*
   $Id$
 
   This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
   Copyright (C) 2009 - 2012  Pavel Pozdniak
-                2009 - 2015  Roland Gruber
+                2009 - 2017  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/lam/lib/modules/fixed_ip.inc b/lam/lib/modules/fixed_ip.inc
index 56685f35..216fce4d 100644
--- a/lam/lib/modules/fixed_ip.inc
+++ b/lam/lib/modules/fixed_ip.inc
@@ -1,10 +1,13 @@
 <?php
+use \LAM\PDF\PDFTable;
+use \LAM\PDF\PDFTableCell;
+use \LAM\PDF\PDFTableRow;
 /*
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2008         Thomas Manninger
-                2008 - 2015  Roland Gruber
+                2008 - 2017  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/lam/lib/modules/kolabUser.inc b/lam/lib/modules/kolabUser.inc
index e5b73255..6187c448 100644
--- a/lam/lib/modules/kolabUser.inc
+++ b/lam/lib/modules/kolabUser.inc
@@ -1,9 +1,12 @@
 <?php
+use \LAM\PDF\PDFTable;
+use \LAM\PDF\PDFTableCell;
+use \LAM\PDF\PDFTableRow;
 /*
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2004 - 2015  Roland Gruber
+  Copyright (C) 2004 - 2017  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/lam/lib/modules/ldapPublicKey.inc b/lam/lib/modules/ldapPublicKey.inc
index 89413758..93201e57 100644
--- a/lam/lib/modules/ldapPublicKey.inc
+++ b/lam/lib/modules/ldapPublicKey.inc
@@ -1,9 +1,12 @@
 <?php
+use \LAM\PDF\PDFTable;
+use \LAM\PDF\PDFTableCell;
+use \LAM\PDF\PDFTableRow;
 /*
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2005 - 2015  Roland Gruber
+  Copyright (C) 2005 - 2017  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/lam/lib/modules/nisNetGroupHost.inc b/lam/lib/modules/nisNetGroupHost.inc
index b158f2ae..278461d1 100644
--- a/lam/lib/modules/nisNetGroupHost.inc
+++ b/lam/lib/modules/nisNetGroupHost.inc
@@ -1,9 +1,12 @@
 <?php
+use \LAM\PDF\PDFTable;
+use \LAM\PDF\PDFTableCell;
+use \LAM\PDF\PDFTableRow;
 /*
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2016  Roland Gruber
+  Copyright (C) 2016 - 2017  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/lam/lib/modules/nisNetGroupUser.inc b/lam/lib/modules/nisNetGroupUser.inc
index a4b6d2ef..9b5ac576 100644
--- a/lam/lib/modules/nisNetGroupUser.inc
+++ b/lam/lib/modules/nisNetGroupUser.inc
@@ -1,9 +1,12 @@
 <?php
+use \LAM\PDF\PDFTable;
+use \LAM\PDF\PDFTableCell;
+use \LAM\PDF\PDFTableRow;
 /*
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2015 - 2016  Roland Gruber
+  Copyright (C) 2015 - 2017  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/lam/lib/modules/nisnetgroup.inc b/lam/lib/modules/nisnetgroup.inc
index f14ef973..a9722fae 100644
--- a/lam/lib/modules/nisnetgroup.inc
+++ b/lam/lib/modules/nisnetgroup.inc
@@ -1,9 +1,12 @@
 <?php
+use \LAM\PDF\PDFTable;
+use \LAM\PDF\PDFTableCell;
+use \LAM\PDF\PDFTableRow;
 /*
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2009 - 2015  Roland Gruber
+  Copyright (C) 2009 - 2017  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/lam/lib/modules/puppetClient.inc b/lam/lib/modules/puppetClient.inc
index c8c4a661..f7e9540d 100644
--- a/lam/lib/modules/puppetClient.inc
+++ b/lam/lib/modules/puppetClient.inc
@@ -1,9 +1,12 @@
 <?php
+use \LAM\PDF\PDFTable;
+use \LAM\PDF\PDFTableCell;
+use \LAM\PDF\PDFTableRow;
 /*
 $Id$
 
   This code is not yet part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2012 - 2016  Roland Gruber
+  Copyright (C) 2012 - 2017  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/lam/lib/modules/pykotaUser.inc b/lam/lib/modules/pykotaUser.inc
index 939a5acc..65f12060 100644
--- a/lam/lib/modules/pykotaUser.inc
+++ b/lam/lib/modules/pykotaUser.inc
@@ -1,9 +1,12 @@
 <?php
+use \LAM\PDF\PDFTable;
+use \LAM\PDF\PDFTableCell;
+use \LAM\PDF\PDFTableRow;
 /*
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2013 - 2015  Roland Gruber
+  Copyright (C) 2013 - 2017  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/lam/lib/modules/quota.inc b/lam/lib/modules/quota.inc
index d7145fde..e4ab6242 100644
--- a/lam/lib/modules/quota.inc
+++ b/lam/lib/modules/quota.inc
@@ -1,10 +1,13 @@
 <?php
+use \LAM\PDF\PDFTable;
+use \LAM\PDF\PDFTableCell;
+use \LAM\PDF\PDFTableRow;
 /*
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2003 - 2006  Tilo Lutz
-                2007 - 2015  Roland Gruber
+                2007 - 2017  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/lam/lib/modules/range.inc b/lam/lib/modules/range.inc
index 959b7453..a0a8ea3f 100644
--- a/lam/lib/modules/range.inc
+++ b/lam/lib/modules/range.inc
@@ -1,10 +1,13 @@
 <?php
+use \LAM\PDF\PDFTable;
+use \LAM\PDF\PDFTableCell;
+use \LAM\PDF\PDFTableRow;
 /*
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2008         Thomas Manninger
-                2008 - 2015  Roland Gruber
+                2008 - 2017  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/lam/lib/modules/systemQuotas.inc b/lam/lib/modules/systemQuotas.inc
index e9379644..eb33c57f 100644
--- a/lam/lib/modules/systemQuotas.inc
+++ b/lam/lib/modules/systemQuotas.inc
@@ -1,9 +1,12 @@
 <?php
+use \LAM\PDF\PDFTable;
+use \LAM\PDF\PDFTableCell;
+use \LAM\PDF\PDFTableRow;
 /*
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2011 - 2015  Roland Gruber
+  Copyright (C) 2011 - 2017  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/lam/lib/modules/windowsGroup.inc b/lam/lib/modules/windowsGroup.inc
index 0552dc41..34861e96 100644
--- a/lam/lib/modules/windowsGroup.inc
+++ b/lam/lib/modules/windowsGroup.inc
@@ -1,9 +1,12 @@
 <?php
+use \LAM\PDF\PDFTable;
+use \LAM\PDF\PDFTableCell;
+use \LAM\PDF\PDFTableRow;
 /*
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2013 - 2016  Roland Gruber
+  Copyright (C) 2013 - 2017  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/lam/lib/pdf.inc b/lam/lib/pdf.inc
index d9cb217d..881e939c 100644
--- a/lam/lib/pdf.inc
+++ b/lam/lib/pdf.inc
@@ -1,10 +1,11 @@
 <?php
+namespace LAM\PDF;
 /*
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2003 - 2004  Michael Duergner
-                2003 - 2015  Roland Gruber
+                2003 - 2017  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -92,7 +93,7 @@ function createModulePDF($accounts, $pdf_structure="default", $returnAsString =
 	$fontName = "BitstreamVeraSans-Roman";
 
 	// Create a new PDF file acording to the account type
-	$pdf = new lamPDF($load['page_definitions'],$fontName);
+	$pdf = new \lamPDF($load['page_definitions'],$fontName);
 
 	// Loop over each account and add a new page in the PDF file for it
 	foreach($accounts as $account) {
@@ -148,6 +149,9 @@ function createModulePDF($accounts, $pdf_structure="default", $returnAsString =
 							if ($valueEntry instanceof PDFLabelValue) {
 								printLabelValue($pdf, $valueEntry, $fontName);
 							}
+							else if ($valueEntry instanceof PDFTable) {
+								printTable($pdf, $valueEntry, $fontName);
+							}
 							// Substitue XML syntax with valid FPDF methods
 							/**$methods = processLine($line,true,$fontName);
 							// Call every method
@@ -203,6 +207,16 @@ function printLabelValue(&$pdf, $valueEntry, $fontName) {
 	$pdf->MultiCell(0, 5, $valueEntry->getValue(), 0, 'L', 0);
 }
 
+/**
+ * Prints a PDFTable entry.
+ *
+ * @param lamPDF $pdf PDF
+ * @param PDFTable $valueEntry entry
+ * @param string $fontName font name
+ */
+function printTable(&$pdf, $valueEntry, $fontName) {
+}
+
 /**
  * Creates the XML code for an PDF entry.
  *
diff --git a/lam/lib/upload.inc b/lam/lib/upload.inc
index 119d8d5e..5d400325 100644
--- a/lam/lib/upload.inc
+++ b/lam/lib/upload.inc
@@ -294,7 +294,7 @@ class Uploader {
 				break;
 			}
 			// create and save PDF
-			$pdfContent = createModulePDF(array($_SESSION['mass_pdfAccount']), $pdfStructure, true);
+			$pdfContent = \LAM\PDF\createModulePDF(array($_SESSION['mass_pdfAccount']), $pdfStructure, true);
 			$fileName = $dn . '.pdf';
 			$pdfZip->addFromString($fileName, $pdfContent);
 			$_SESSION['mass_pdf']['counter'] ++;