diff --git a/lib/archiving/ArchiveRestorationRequest.inc b/lib/archiving/ArchiveRestorationRequest.inc
index 4a14360..49a2aa0 100644
--- a/lib/archiving/ArchiveRestorationRequest.inc
+++ b/lib/archiving/ArchiveRestorationRequest.inc
@@ -196,16 +196,6 @@ class ArchiveRestorationRequest extends KTEntity {
      * @return Array array of ArchiveRestorationRequest objects, false otherwise
      */
     function getList($sWhereClause = null) {
-        global $default;
-        $aArchiveRestorationRequestArray = array();
-        $sql = $default->db;
-        $result = $sql->query("SELECT * FROM $default->archive_restoration_table " . (isset($sWhereClause) ? " WHERE " . $sWhereClause : ""));/*wc*/
-        if ($result) {
-            while ($sql->next_record()) {
-                $aArchiveRestorationRequestArray[] = & ArchiveRestorationRequest::get($sql->f("id"));
-            }
-            return $aArchiveRestorationRequestArray;
-        }
-        return false;
+        return KTEntityUtil::getList(ArchiveRestorationRequest::_table(), 'ArchiveRestorationRequest', $sWhereClause);
     }    
 }
diff --git a/lib/archiving/ArchivingSettings.inc b/lib/archiving/ArchivingSettings.inc
index ec4f778..dbb4cfd 100644
--- a/lib/archiving/ArchivingSettings.inc
+++ b/lib/archiving/ArchivingSettings.inc
@@ -188,18 +188,7 @@ class ArchivingSettings extends KTEntity {
      * @return Array array of ArchivingSettings objects, false otherwise
      */
     function getList($sWhereClause = null) {
-        global $default;
-        $aArchivingSettings = array();
-        $sql = $default->db;
-        $result = $sql->query("SELECT * FROM $default->archiving_settings_table " . (isset($sWhereClause) ? " WHERE " . $sWhereClause : ""));/*wc*/
-        if ($result) {
-            while ($sql->next_record()) {
-                $oArchivingSettings = & ArchivingSettings::get($sql->f("id"));
-                $aArchivingSettings[] = $oArchivingSettings;
-            }
-            return $aArchivingSettings;
-        }
-        return false;
+        return KTEntityUtil::getList(ArchivingSettings::_table(), 'ArchivingSettings', $sWhereClause);
     }    
 }
 ?>
diff --git a/lib/archiving/ArchivingType.inc b/lib/archiving/ArchivingType.inc
index f96991e..85cf770 100644
--- a/lib/archiving/ArchivingType.inc
+++ b/lib/archiving/ArchivingType.inc
@@ -110,18 +110,6 @@ class ArchivingType extends KTEntity {
      * @return Array array of ArchivingType objects, false otherwise
      */
     function getList($sWhereClause = null) {
-        global $default;
-        $aArchivingTypeArray = array();
-        $sql = $default->db;
-        $result = $sql->query("SELECT * FROM $default->archiving_type_lookup_table " . (isset($sWhereClause) ? " WHERE " . $sWhereClause : ""));/*wc*/
-        if ($result) {
-            $iCount = 0;
-            while ($sql->next_record()) {
-                $oArchivingType = & ArchivingType::get($sql->f("id"));
-                $aArchivingTypeArray[$iCount++] = $oArchivingType;
-            }
-            return $aArchivingTypeArray;
-        }
-        return false;
+        return KTEntityUtil::getList(ArchivingType::_table(), 'ArchivingType', $sWhereClause);
     }    
 }
diff --git a/lib/archiving/DocumentArchiving.inc b/lib/archiving/DocumentArchiving.inc
index 4d67791..88ab4b2 100644
--- a/lib/archiving/DocumentArchiving.inc
+++ b/lib/archiving/DocumentArchiving.inc
@@ -153,18 +153,6 @@ class DocumentArchiving extends KTEntity {
      * @return Array array of DocumentArchiving objects, false otherwise
      */
     function getList($sWhereClause = null) {
-        global $default;
-        $aDocumentArchivingArray = array();
-        $sql = $default->db;
-        $result = $sql->query("SELECT * FROM $default->document_archiving_table " . (isset($sWhereClause) ? " WHERE " . $sWhereClause : ""));/*wc*/
-        if ($result) {
-            $iCount = 0;
-            while ($sql->next_record()) {
-                $oDocumentArchiving = & DocumentArchiving::get($sql->f("id"));
-                $aDocumentArchivingArray[$iCount++] = $oDocumentArchiving;
-            }
-            return $aDocumentArchivingArray;
-        }
-        return false;
+        return KTEntityUtil::getList(DocumentArchiving::_table(), 'DocumentArchiving', $sWhereClause);
     }    
 }
diff --git a/lib/archiving/TimePeriod.inc b/lib/archiving/TimePeriod.inc
index f69a02e..9a6a538 100644
--- a/lib/archiving/TimePeriod.inc
+++ b/lib/archiving/TimePeriod.inc
@@ -132,18 +132,6 @@ class TimePeriod extends KTEntity {
      * @return Array array of TimePeriod objects, false otherwise
      */
     function getList($sWhereClause = null) {
-        global $default;
-        $aTimePeriodArray = array();
-        $sql = $default->db;
-        $result = $sql->query("SELECT * FROM $default->time_period_table " . (isset($sWhereClause) ? " WHERE " . $sWhereClause : ""));/*wc*/
-        if ($result) {
-            $iCount = 0;
-            while ($sql->next_record()) {
-                $oTimePeriod = & TimePeriod::get($sql->f("id"));
-                $aTimePeriodArray[$iCount++] = $oTimePeriod;
-            }
-            return $aTimePeriodArray;
-        }
-        return false;
+        return KTEntityUtil::getList(TimePeriod::_table(), 'TimePeriod', $sWhereClause);
     }    
 }
diff --git a/lib/archiving/TimeUnit.inc b/lib/archiving/TimeUnit.inc
index e059fcd..0526610 100644
--- a/lib/archiving/TimeUnit.inc
+++ b/lib/archiving/TimeUnit.inc
@@ -109,18 +109,6 @@ class TimeUnit extends KTEntity {
      * @return Array array of TimeUnit objects, false otherwise
      */
     function getList($sWhereClause = null) {
-        global $default;
-        $aTimeUnitArray = array();
-        $sql = $default->db;
-        $result = $sql->query("SELECT * FROM $default->time_unit_lookup_table " . (isset($sWhereClause) ? " WHERE " . $sWhereClause : ""));/*wc*/
-        if ($result) {
-            $iCount = 0;
-            while ($sql->next_record()) {
-                $oTimeUnit = & TimeUnit::get($sql->f("id"));
-                $aTimeUnitArray[$iCount++] = $oTimeUnit;
-            }
-            return $aTimeUnitArray;
-        }
-        return false;
+        return KTEntityUtil::getList(TimeUnit::_table(), 'TimeUnit', $sWhereClause);
     }    
 }
diff --git a/lib/dashboard/DashboardNews.inc b/lib/dashboard/DashboardNews.inc
index a709227..eaf8443 100644
--- a/lib/dashboard/DashboardNews.inc
+++ b/lib/dashboard/DashboardNews.inc
@@ -343,19 +343,7 @@ class DashboardNews extends KTEntity {
      * @return Array array of DashboardNews objects, false otherwise
      */
     function getList($sWhereClause = null) {
-        global $default;
-        $aDashboardNewsArray = array();
-        $sql = $default->db;
-        $result = $sql->query("SELECT * FROM " . $default->news_table  . (isset($sWhereClause) ? " WHERE " . $sWhereClause : "") . " ORDER BY rank ASC");/*wc*/
-        if ($result) {
-            $iCount = 0;
-            while ($sql->next_record()) {
-                $oDashboardNews = & DashboardNews::get($sql->f("id"));
-                $aDashboardNewsArray[$iCount++] = $oDashboardNews;
-            }
-            return $aDashboardNewsArray;
-        }
-        return false;
+        return KTEntityUtil::getList(DashboardNews::_table(), 'DashboardNews', $sWhereClause);
     }
     
     /**
diff --git a/lib/discussions/DiscussionComment.inc b/lib/discussions/DiscussionComment.inc
index 66224ae..4f59d5f 100644
--- a/lib/discussions/DiscussionComment.inc
+++ b/lib/discussions/DiscussionComment.inc
@@ -177,17 +177,7 @@ class DiscussionComment extends KTEntity {
      * @return Array array of DiscussionComments objects, false otherwise
      */
     function getList($sWhereClause = null) {
-        global $default;
-        $aDiscussionComments = array();
-        $sql = $default->db;
-        $result = $sql->query("SELECT * FROM " . $default->discussion_comments_table  . (isset($sWhereClause) ? " WHERE " . $sWhereClause : ""));/*wc*/
-        if ($result) {
-            while ($sql->next_record()) {
-                $aDiscussionComments[] = & DiscussionComment::get($sql->f("id"));
-            }
-            return $aDiscussionComments;
-        }
-        return false;
+        return KTEntityUtil::getList(DiscussionComment::_table(), 'DiscussionComment', $sWhereClause);
     }
 
     function _fieldValues () {
diff --git a/lib/discussions/DiscussionThread.inc b/lib/discussions/DiscussionThread.inc
index 50964d1..b2d53f6 100644
--- a/lib/discussions/DiscussionThread.inc
+++ b/lib/discussions/DiscussionThread.inc
@@ -179,17 +179,7 @@ class DiscussionThread extends KTEntity{
      * @return Array array of DiscussionThreads objects, false otherwise
      */
     function getList($sWhereClause = null) {
-        global $default;
-        $aDiscussionThreads = array();
-        $sql = $default->db;
-        $result = $sql->query("SELECT * FROM " . $default->discussion_threads_table  . (isset($sWhereClause) ? " WHERE " . $sWhereClause : ""));/*wc*/
-        if ($result) {
-            while ($sql->next_record()) {
-                $aDiscussionThreads[] = & DiscussionThread::get($sql->f("id"));
-            }
-            return $aDiscussionThreads;
-        }
-        return false;
+        return KTEntityUtil::getList(DiscussionThread::_table(), 'DiscussionThread', $sWhereClause);
     }
 	     
     function getThreadIDforDoc($iDocumentID){
diff --git a/lib/documentmanagement/DependantDocumentTemplate.inc b/lib/documentmanagement/DependantDocumentTemplate.inc
index 29791e9..c8104f6 100644
--- a/lib/documentmanagement/DependantDocumentTemplate.inc
+++ b/lib/documentmanagement/DependantDocumentTemplate.inc
@@ -173,21 +173,7 @@ class DependantDocumentTemplate extends KTEntity {
     * @return Array array of DependantDocumentTemplates objects, false otherwise and set $_SESSION["errorMessage"]
     */
     function getList($sWhereClause = null) {
-        global $default;
-        $aDependantDocumentTemplateArray = array();
-        $sql = $default->db;
-        // TODO: join on sys_deleted
-        $result = $sql->query("SELECT * FROM " . $default->dependant_document_template_table  . (isset($sWhereClause) ? " WHERE " . $sWhereClause : ""));/*wc*/
-        if ($result) {
-            $iCount = 0;
-            while ($sql->next_record()) {
-                $oDependantDocumentTemplate = & DependantDocumentTemplate::get($sql->f("id"));
-                $aDependantDocumentTemplateArray[$iCount] = $oDependantDocumentTemplate;
-                $iCount++;
-            }
-            return $aDependantDocumentTemplateArray;
-        }
-        return false;
+        return KTEntityUtil::getList(DependantDocumentTemplate::_table(), 'DependantDocumentTemplate', $sWhereClause);
     }
 }
 
diff --git a/lib/documentmanagement/Document.inc b/lib/documentmanagement/Document.inc
index 95a70e5..834e9c0 100644
--- a/lib/documentmanagement/Document.inc
+++ b/lib/documentmanagement/Document.inc
@@ -558,22 +558,7 @@ class Document extends KTEntity {
     * @return Array array of Documents objects, false otherwise.
     */
     function getList($sWhereClause = null) {
-        global $default, $lang_err_database;
-        $aDocumentArray;
-        settype($aDocumentArray, "array");
-        $sql = $default->db;
-        $result = $sql->query("SELECT * FROM " . $default->documents_table  . /*wc*/
-                              (isset($sWhereClause) ? " WHERE " . $sWhereClause : ""));
-        if ($result) {
-            $iCount = 0;
-            while ($sql->next_record()) {
-                $oDocument = & Document::get($sql->f("id"));
-                $aDocumentArray[$iCount] = $oDocument;
-                $iCount++;
-            }
-            return $aDocumentArray;
-        }
-        return false;
+        return KTEntityUtil::getList(Document::_table(), 'Document', $sWhereClause);
     }
 
     /**
diff --git a/lib/documentmanagement/DocumentField.inc b/lib/documentmanagement/DocumentField.inc
index 6f94f9a..9a10e5d 100644
--- a/lib/documentmanagement/DocumentField.inc
+++ b/lib/documentmanagement/DocumentField.inc
@@ -195,18 +195,7 @@ class DocumentField extends KTEntity {
 	 * @return Array array of DocumentField objects, false otherwise
 	*/
 	function getList($sWhereClause = null) {
-		global $default;
-		$aDocumentFieldArray = array();
-		$sql = $default->db;
-		$sQuery = "SELECT id FROM " . $default->document_fields_table  . (isset($sWhereClause) ? " WHERE $sWhereClause" : "");/*wc*/
-		$result = $sql->query($sQuery);
-		if ($result) {			
-			while ($sql->next_record()) {
-				$aDocumentFieldArray[] = & DocumentField::get($sql->f("id"));
-			}
-			return $aDocumentFieldArray;
-		}
-		return false;
+            return KTEntityUtil::getList(DocumentField::_table(), 'DocumentField', $sWhereClause);
 	}	
 
 	/**
diff --git a/lib/documentmanagement/DocumentTransaction.inc b/lib/documentmanagement/DocumentTransaction.inc
index 7778b56..19cfb6d 100644
--- a/lib/documentmanagement/DocumentTransaction.inc
+++ b/lib/documentmanagement/DocumentTransaction.inc
@@ -185,20 +185,7 @@ class DocumentTransaction {
      * @return Array array of DocumentTransaction objects, false otherwise and set $_SESSION["errorMessage"]
      */
     function getList($sWhereClause = null) {
-        global $default, $lang_err_database;
-        $aDocumentTransactionArray = array();
-        $sql = $default->db;
-        $sQuery = "SELECT * FROM $default->document_transactions_table " . (isset($sWhereClause) ? " WHERE " . $sWhereClause : "");/*wc*/
-        $result = $sql->query($sQuery);
-        if ($result) {
-            while ($sql->next_record()) {
-            	$oDocumentTransaction = & DocumentTransaction::get($sql->f("id"));
-                $aDocumentTransactionArray[] = $oDocumentTransaction;
-            }
-            return $aDocumentTransactionArray;
-        }
-        $_SESSION["errorMessage"] = $lang_err_database;
-        return false;
+        return KTEntityUtil::getList(DocumentTransaction::_table(), 'DocumentTransaction', $sWhereClause);
     }
 }
 ?>
diff --git a/lib/documentmanagement/DocumentType.inc b/lib/documentmanagement/DocumentType.inc
index 1466944..9b32797 100644
--- a/lib/documentmanagement/DocumentType.inc
+++ b/lib/documentmanagement/DocumentType.inc
@@ -175,17 +175,7 @@ class DocumentType extends KTEntity {
 	 * @return Array array of DocumentType objects, false otherwise
 	*/
 	function getList($sWhereClause = null) {
-		global $default, $lang_err_database;
-		$aDocumentTypeArray = array();
-		$sql = $default->db;
-		$result = $sql->query("SELECT * FROM " . $default->document_types_table  . (isset($sWhereClause) ? " WHERE $sWhereClause" : ""));/*wc*/
-		if ($result) {			
-			while ($sql->next_record()) {
-				$aDocumentTypeArray[] = & DocumentType::get($sql->f("id"));
-			}
-			return $aDocumentTypeArray;
-		}
-		return false;
+            return KTEntityUtil::getList(DocumentType::_table(), 'DocumentType', $sWhereClause);
 	}
 }
 
diff --git a/lib/foldermanagement/Folder.inc b/lib/foldermanagement/Folder.inc
index efbad1c..52e78c6 100644
--- a/lib/foldermanagement/Folder.inc
+++ b/lib/foldermanagement/Folder.inc
@@ -412,22 +412,7 @@ class Folder extends KTEntity {
     * @return Array array of Documents objects, false otherwise and set $_SESSION["errorMessage"]
     */
     function getList($sWhereClause = null) {
-        global $default, $lang_err_database;
-        $aFolderArray;
-        settype($aFolderArray, "array");
-        $sql = $default->db;
-        $result = $sql->query("SELECT * FROM " . $default->folders_table  . (isset($sWhereClause) ? " WHERE " . $sWhereClause : ""));/*wc*/
-        if ($result) {
-            $iCount = 0;
-            while ($sql->next_record()) {
-                $oFolder = & Folder::get($sql->f("id"));
-                $aFolderArray[$iCount] = $oFolder;
-                $iCount++;
-            }
-            return $aFolderArray;
-        }
-        $_SESSION["errorMessage"] = $lang_err_database;
-        return false;
+        return KTEntityUtil::getList(Folder::_table(), 'Folder', $sWhereClause);
     }
 
 	/**
diff --git a/lib/foldermanagement/FolderCollaboration.inc b/lib/foldermanagement/FolderCollaboration.inc
index e13070a..b2afcfa 100644
--- a/lib/foldermanagement/FolderCollaboration.inc
+++ b/lib/foldermanagement/FolderCollaboration.inc
@@ -163,22 +163,7 @@ class FolderCollaboration extends KTEntity {
 	* @return Array array of FolderCollaboration objects, false otherwise and set $_SESSION["errorMessage"]
 	*/
 	function getList($sWhereClause = null) {
-		global $default, $lang_err_database;
-		$aFolderCollaborationArray;
-		settype($aFolderCollaborationArray, "array");
-		$sql = $default->db;
-		$result = $sql->query("SELECT * FROM " . $default->groups_folders_approval_table  . (isset($sWhereClause) ? " " . $sWhereClause : ""));/*wc*/
-		if ($result) {			
-			$iCount = 0;
-			while ($sql->next_record()) {
-				$oFolderCollaboration = & FolderCollaboration::get($sql->f("id"));
-				$aFolderCollaborationArray[$iCount] = $oFolderCollaboration;
-				$iCount++;
-			}
-			return $aFolderCollaborationArray;
-		}
-		$_SESSION["errorMessage"] = $lang_err_database;
-		return false;
+            return KTEntityUtil::getList(FolderCollaboration::_table(), 'FolderCollaboration', $sWhereClause);
 	}
 	
 	/**
diff --git a/lib/foldermanagement/FolderDocTypeLink.inc b/lib/foldermanagement/FolderDocTypeLink.inc
index 100acf0..733495b 100644
--- a/lib/foldermanagement/FolderDocTypeLink.inc
+++ b/lib/foldermanagement/FolderDocTypeLink.inc
@@ -98,23 +98,7 @@ class FolderDocTypeLink extends KTEntity {
     * @return Array array of Documents objects, false otherwise and set $_SESSION["errorMessage"]
     */
     function getList($sWhereClause = null) {
-        global $default, $lang_err_database;
-        $aFolderDocTypeLinkArray;
-        settype($aFolderDocTypeLinkArray, "array");
-        $sql = $default->db;
-        // TODO: join on sys_deleted
-        $result = $sql->query("SELECT * FROM " . $default->folder_doctypes_table  . (isset($sWhereClause) ? " WHERE " . $sWhereClause : ""));/*wc*/
-        if ($result) {
-            $iCount = 0;
-            while ($sql->next_record()) {
-                $oFolderDocTypeLink = & FolderDocTypeLink::get($sql->f("id"));
-                $aFolderDocTypeLinkArray[$iCount] = $oFolderDocTypeLink;
-                $iCount++;
-            }
-            return $aFolderDocTypeLinkArray;
-        }
-        $_SESSION["errorMessage"] = $lang_err_database;
-        return false;
+        return KTEntityUtil::getList(FolderDocTypeLink::_table(), 'FolderDocTypeLink', $sWhereClause);
     }
 	
 }
diff --git a/lib/foldermanagement/FolderUserRole.inc b/lib/foldermanagement/FolderUserRole.inc
index 59cbc89..3e19743 100644
--- a/lib/foldermanagement/FolderUserRole.inc
+++ b/lib/foldermanagement/FolderUserRole.inc
@@ -161,22 +161,7 @@ class FolderUserRole extends KTEntity {
 	* @return Array array of FolderUserRole objects, false otherwise and set $_SESSION["errorMessage"]
 	*/
 	function getList($sWhereClause = null) {
-		global $default, $lang_err_database;
-		$aFolderUserRoleArray;
-		settype($aFolderUserRoleArray, "array");
-		$sql = $default->db;
-		$result = $sql->query("SELECT * FROM " . $default->folders_user_roles_table  . (isset($sWhereClause) ? " WHERE " . $sWhereClause : ""));/*wc*/
-		if ($result) {			
-			$iCount = 0;
-			while ($sql->next_record()) {
-				$oFolderUserRole = & FolderUserRole::get($sql->f("id"));
-				$aFolderUserRoleArray[$iCount] = $oFolderUserRole;
-				$iCount++;
-			}
-			return $aFolderUserRoleArray;
-		}
-		$_SESSION["errorMessage"] = $lang_err_database;
-		return false;
+            return KTEntityUtil::getList(FolderUserRole::_table(), 'FolderUserRole', $sWhereClause);
 	}
 	
 	function & getFromFolderCollaboration($iFolderCollaborationID, $iDocumentID) {
diff --git a/lib/groups/Group.inc b/lib/groups/Group.inc
index aaf1781..d4d5103 100644
--- a/lib/groups/Group.inc
+++ b/lib/groups/Group.inc
@@ -174,22 +174,7 @@ class Group extends KTEntity {
 	* @return Array array of Group objects, false otherwise and set $_SESSION["errorMessage"]
 	*/
 	function getList($sWhereClause = null) {
-		global $default, $lang_err_database;
-		$aGroupArray;
-		settype($aGroupArray, "array");
-		$sql = $default->db;
-		$result = $sql->query("SELECT * FROM " . $default->groups_table  . (isset($sWhereClause) ? " " . $sWhereClause : ""));/*wc*/
-		if ($result) {			
-			$iCount = 0;
-			while ($sql->next_record()) {
-				$oGroup = & Group::get($sql->f("id"));
-				$aGroupArray[$iCount] = $oGroup;
-				$iCount++;
-			}
-			return $aGroupArray;
-		}
-		$_SESSION["errorMessage"] = $lang_err_database;
-		return false;
+            return KTEntityUtil::getList(Group::_table(), 'Group', $sWhereClause);
 	}
 	
 	/**
diff --git a/lib/groups/GroupFolderApprovalLink.inc b/lib/groups/GroupFolderApprovalLink.inc
index a8e6083..100f0ed 100644
--- a/lib/groups/GroupFolderApprovalLink.inc
+++ b/lib/groups/GroupFolderApprovalLink.inc
@@ -186,22 +186,7 @@ class GroupFolderApprovalLink extends KTEntity {
 	* @return Array array of GroupFolderApprovalLink objects, false otherwise and set $_SESSION["errorMessage"]
 	*/
 	function getList($sWhereClause = null) {
-		global $default, $lang_err_database;
-		$aGroupFolderApprovalLinkArray;
-		settype($aGroupFolderApprovalLinkArray, "array");
-		$sql = $default->db;
-		$result = $sql->query("SELECT * FROM " . $default->groups_folders_approval_table  . (isset($sWhereClause) ? " " . $sWhereClause : ""));/*wc*/
-		if ($result) {			
-			$iCount = 0;
-			while ($sql->next_record()) {
-				$oGroupFolderApprovalLink = & GroupFolderApprovalLink::get($sql->f("id"));
-				$aGroupFolderApprovalLinkArray[$iCount] = $oGroupFolderApprovalLink;
-				$iCount++;
-			}
-			return $aGroupFolderApprovalLinkArray;
-		}
-		$_SESSION["errorMessage"] = $lang_err_database;
-		return false;
+            return KTEntityUtil::getList(GroupFolderApprovalLink::_table(), 'GroupFolderApprovalLink', $sWhereClause);
 	}
 	
 }
diff --git a/lib/groups/GroupFolderLink.inc b/lib/groups/GroupFolderLink.inc
index d36bf0b..22b98cb 100644
--- a/lib/groups/GroupFolderLink.inc
+++ b/lib/groups/GroupFolderLink.inc
@@ -147,18 +147,7 @@ class GroupFolderLink extends KTEntity {
 	* @return Array array of FolderCollaboration objects, false otherwise and set $_SESSION["errorMessage"]
 	*/
 	function getList($sWhereClause = null) {
-		global $default, $lang_err_database;
-		$oGroupFolderLinkArray = array();
-		$sql = $default->db;
-		$result = $sql->query("SELECT * FROM " . $default->groups_folders_table  . (isset($sWhereClause) ? " " . $sWhereClause : ""));/*wc*/
-		if ($result) {			
-			while ($sql->next_record()) {
-				$oGroupFolderLinkArray[] = & GroupFolderLink::get($sql->f("id"));
-			}
-			return $oGroupFolderLinkArray;
-		}
-		$_SESSION["errorMessage"] = $lang_err_database;
-		return false;
+            return KTEntityUtil::getList(GroupFolderLink::_table(), 'GroupFolderLink', $sWhereClause);
 	}
 }
 ?>
diff --git a/lib/groups/GroupUnitLink.inc b/lib/groups/GroupUnitLink.inc
index 3514b22..8cc12ec 100644
--- a/lib/groups/GroupUnitLink.inc
+++ b/lib/groups/GroupUnitLink.inc
@@ -162,22 +162,7 @@ class GroupUnitLink extends KTEntity {
 	* @return Array array of GroupUnitLink objects, false otherwise and set $_SESSION["errorMessage"]
 	*/
 	function getList($sWhereClause = null) {
-		global $default, $lang_err_database;
-		$aGroupUnitLink;
-		settype($aGroupUnitLink, "array");
-		$sql = $default->db;
-		$result = $sql->query("SELECT * FROM " . $default->groups_units_table  . (isset($sWhereClause) ? " WHERE " . $sWhereClause : ""));/*wc*/
-		if ($result) {			
-			$iCount = 0;
-			while ($sql->next_record()) {
-				$oGroupUnitLink = & GroupUnitLink::get($sql->f("id"));
-				$aGroupUnitLink[$iCount] = $oGroupUnitLink;
-				$iCount++;
-			}
-			return $aGroupUnitLink;
-		}
-		$_SESSION["errorMessage"] = $lang_err_database;
-		return false;
+            return KTEntityUtil::getList(GroupUnitLink::_table(), 'GroupUnitLink', $sWhereClause);
 	}
 	
 	
diff --git a/lib/groups/GroupUserLink.inc b/lib/groups/GroupUserLink.inc
index a989e25..0200176 100644
--- a/lib/groups/GroupUserLink.inc
+++ b/lib/groups/GroupUserLink.inc
@@ -160,22 +160,7 @@ class GroupUserLink extends KTEntity {
 	* @return Array array of GroupUserLink objects, false otherwise and set $_SESSION["errorMessage"]
 	*/
 	function getList($sWhereClause = null) {
-		global $default, $lang_err_database;
-		$aGroupUserLink;
-		settype($aGroupUserLink, "array");
-		$sql = $default->db;
-		$result = $sql->query("SELECT * FROM " . $default->users_groups_table  . (isset($sWhereClause) ? " " . $sWhereClause : ""));/*wc*/
-		if ($result) {			
-			$iCount = 0;
-			while ($sql->next_record()) {
-				$oGroupUserLink = & GroupUserLink::get($sql->f("id"));
-				$aGroupUserLink[$iCount] = $oGroupUserLink;
-				$iCount++;
-			}
-			return $aGroupUserLink;
-		}
-		$_SESSION["errorMessage"] = $lang_err_database;
-		return false;
+            return KTEntityUtil::getList(GroupUserLink::_table(), 'GroupUserLink', $sWhereClause);
 	}
 	
 	/**
diff --git a/lib/links/Link.inc b/lib/links/Link.inc
index b23056a..7c5a33e 100644
--- a/lib/links/Link.inc
+++ b/lib/links/Link.inc
@@ -150,22 +150,7 @@ class Link extends KTEntity {
 	* @return Array array of Link objects, false otherwise and set $_SESSION["errorMessage"]
 	*/
 	function getList($sWhereClause = null) {
-		global $default, $lang_err_database;
-		$aLinkArray;
-		settype($aLinkArray, "array");
-		$sql = $default->db;
-		$result = $sql->query("SELECT * FROM " . $default->quicklinks_table  . (isset($sWhereClause) ? " " . $sWhereClause : ""));/*wc*/
-		if ($result) {			
-			$iCount = 0;
-			while ($sql->next_record()) {
-				$oLink = & Link::get($sql->f("id"));
-				$aLinkArray[$iCount] = $oLink;
-				$iCount++;
-			}
-			return $aLinkArray;
-		}
-		$_SESSION["errorMessage"] = $lang_err_database;
-		return false;
+            return KTEntityUtil::getList(Link::_table(), 'Link', $sWhereClause);
 	}
 	
 	
diff --git a/lib/orgmanagement/Organisation.inc b/lib/orgmanagement/Organisation.inc
index 0429b60..91b3908 100644
--- a/lib/orgmanagement/Organisation.inc
+++ b/lib/orgmanagement/Organisation.inc
@@ -144,22 +144,7 @@ class Organisation extends KTEntity {
     * @return Array array of org objects, false otherwise and set $_SESSION["errorMessage"]
     */
     function getList($sWhereClause = null) {
-        global $default, $lang_err_database;
-        $aOrgArray;
-        settype($aUnitArray, "array");
-        $sql = $default->db;
-        $result = $sql->query("SELECT * FROM " . $default->organisations_table . (isset($sWhereClause) ? " " . $sWhereClause : ""));/*wc*/
-        if ($result) {
-            $iCount = 0;
-            while ($sql->next_record()) {
-                $oOrg = & Organisation::get($sql->f("id"));
-                $aOrgArray[$iCount] = $oOrg;
-                $iCount++;
-            }
-            return $aOrgArray;
-        }
-        $_SESSION["errorMessage"] = $lang_err_database;
-        return false;
+        return KTEntityUtil::getList(Organisation::_table(), 'Organisation', $sWhereClause);
     }
 }
 /**
diff --git a/lib/roles/Role.inc b/lib/roles/Role.inc
index 103c82c..ec82d1a 100644
--- a/lib/roles/Role.inc
+++ b/lib/roles/Role.inc
@@ -165,22 +165,7 @@ class Role extends KTEntity {
 	* @return Array array of WebDocument objects, false otherwise and set $_SESSION["errorMessage"]
 	*/
 	function getList($sWhereClause = null) {
-		global $default, $lang_err_database;
-		$aRoleArray;
-		settype($aRoleArray, "array");
-		$sql = $default->db;
-		$result = $sql->query("SELECT * FROM " . $default->roles_table  . (isset($sWhereClause) ? " " . $sWhereClause : ""));/*wc*/
-		if ($result) {			
-			$iCount = 0;
-			while ($sql->next_record()) {
-				$oRole = & Role::get($sql->f("id"));
-				$aRoleArray[$iCount] = $oRole;
-				$iCount++;
-			}
-			return $aRoleArray;
-		}
-		$_SESSION["errorMessage"] = $lang_err_database;
-		return false;
+            return KTEntityUtil::getList(Role::_table(), 'Role', $sWhereClause);
 	}
 }
 
diff --git a/lib/roles/RoleFolderLink.inc b/lib/roles/RoleFolderLink.inc
index 9b84d14..2420e93 100644
--- a/lib/roles/RoleFolderLink.inc
+++ b/lib/roles/RoleFolderLink.inc
@@ -218,22 +218,7 @@ class RoleFolderLink extends KTEntity {
 	* @return Array array of RolesFoldersLink objects, false otherwise and set $_SESSION["errorMessage"]
 	*/
 	function getList($sWhereClause = null) {
-		global $default, $lang_err_database;
-		$aRolesFoldersLinkArray;
-		settype($aRolesFoldersLinkArray, "array");
-		$sql = $default->db;
-		$result = $sql->query("SELECT * FROM " . $default->folders_user_roles_table  . (isset($sWhereClause) ? " " . $sWhereClause : ""));/*wc*/
-		if ($result) {			
-			$iCount = 0;
-			while ($sql->next_record()) {
-				$oRolesFoldersLink = & RoleFolderLink::get($sql->f("id"));
-				$aRolesFoldersLinkArray[$iCount] = $oRolesFoldersLink;
-				$iCount++;
-			}
-			return $aRolesFoldersLinkArray;
-		}
-		$_SESSION["errorMessage"] = $lang_err_database;
-		return false;
+            return KTEntityUtil::getList(RoleFolderLink::_table(), 'RoleFolderLink', $sWhereClause);
 	}
 	
 }
diff --git a/lib/unitmanagement/Unit.inc b/lib/unitmanagement/Unit.inc
index cd8ac8b..5930842 100644
--- a/lib/unitmanagement/Unit.inc
+++ b/lib/unitmanagement/Unit.inc
@@ -258,22 +258,7 @@ class Unit extends KTEntity {
     * @return Array array of Unit objects, false otherwise and set $_SESSION["errorMessage"]
     */
     function getList($sWhereClause = null) {
-        global $default, $lang_err_database;
-        $aUnitArray;
-        settype($aUnitArray, "array");
-        $sql = $default->db;
-        $result = $sql->query("SELECT * FROM " . $default->units_table  . (isset($sWhereClause) ? " " . $sWhereClause : ""));/*wc*/
-        if ($result) {
-            $iCount = 0;
-            while ($sql->next_record()) {
-                $oUnit = & Unit::get($sql->f("id"));
-                $aUnitArray[$iCount] = $oUnit;
-                $iCount++;
-            }
-            return $aUnitArray;
-        }
-        $_SESSION["errorMessage"] = $lang_err_database;
-        return false;
+        return KTEntityUtil::getList(Unit::_table(), 'Unit', $sWhereClause);
     }
 
 }
diff --git a/lib/unitmanagement/UnitOrganisationLink.inc b/lib/unitmanagement/UnitOrganisationLink.inc
index 434cce0..7d47863 100644
--- a/lib/unitmanagement/UnitOrganisationLink.inc
+++ b/lib/unitmanagement/UnitOrganisationLink.inc
@@ -161,22 +161,7 @@ class UnitOrganisationLink extends KTEntity {
 	* @return Array array of UnitOrganisationLink objects, false otherwise and set $_SESSION["errorMessage"]
 	*/
 	function getList($sWhereClause = null) {
-		global $default, $lang_err_database;
-		$aUnitOrganisationLink;
-		settype($aUnitOrganisationLink, "array");
-		$sql = $default->db;
-		$result = $sql->query("SELECT * FROM "  . $default->units_organisations_table  . (isset($sWhereClause) ? " " . $sWhereClause : ""));/*wc*/
-		if ($result) {			
-			$iCount = 0;
-			while ($sql->next_record()) {
-				$oUnitOrganisationLink = & UnitOrganisationLink::get($sql->f("id"));
-				$aUnitOrganisationLink[$iCount] = $oUnitOrganisationLink;
-				$iCount++;
-			}
-			return $aUnitOrganisationLink;
-		}
-		$_SESSION["errorMessage"] = $lang_err_database;
-		return false;
+            return KTEntityUtil::getList(UnitOrganisationLink::_table(), 'UnitOrganisationLink', $sWhereClause);
 	}
 	
 	/**
diff --git a/lib/users/User.inc b/lib/users/User.inc
index 907ebf1..c0e2aec 100644
--- a/lib/users/User.inc
+++ b/lib/users/User.inc
@@ -376,23 +376,7 @@ class User extends KTEntity {
     * @return Array array of User objects, false otherwise and set $_SESSION["errorMessage"]
     */
     function getList($sWhereClause = null) {
-        global $default, $lang_err_database;
-        $aUserArray;
-        settype($aUserArray, "array");
-        $sql = $default->db;
-        $result = $sql->query("SELECT * FROM " . $default->users_table  . (isset($sWhereClause) ? " " . $sWhereClause : ""));/*wc*/
-        if ($result) {
-            $iCount = 0;
-            while ($sql->next_record()) {
-                $oUser = & User::get($sql->f("id"));
-                $oUser->iQuotaCurrent = $sql->f("quota_current");
-                $aUserArray[$iCount] = $oUser;
-                $iCount++;
-            }
-            return $aUserArray;
-        }
-        $_SESSION["errorMessage"] = $lang_err_database;
-        return false;
+        return KTEntityUtil::getList(User::_table(), 'User', $sWhereClause);
     }
 
     /**
diff --git a/lib/web/WebDocument.inc b/lib/web/WebDocument.inc
index 7b7f55b..468ee06 100644
--- a/lib/web/WebDocument.inc
+++ b/lib/web/WebDocument.inc
@@ -148,22 +148,7 @@ class WebDocument extends KTEntity {
 	* @return Array array of WebDocument objects, false otherwise and set $_SESSION["errorMessage"]
 	*/
 	function getList($sWhereClause = null) {
-		global $default, $lang_err_database;
-		$aWebDocumentArray = array();
-		$sql = $default->db;
-        $sQuery = "SELECT * FROM " . $default->web_documents_table;/*wc*/
-        if (isset($sWhereClause)) {
-            $sQuery .= " WHERE " . $sWhereClause;
-        }
-		$result = $sql->query($sQuery);
-		if ($result) {			
-			while ($sql->next_record()) {
-				$aWebDocumentArray[]= & WebDocument::get($sql->f("id"));
-			}
-			return $aWebDocumentArray;
-		}
-		$_SESSION["errorMessage"] = $lang_err_database;
-		return false;
+            return KTEntityUtil::getList(WebDocument::_table(), 'WebDocument', $sWhereClause);
 	}
 	
 }
diff --git a/lib/web/WebSite.inc b/lib/web/WebSite.inc
index 8d4efad..1548da1 100644
--- a/lib/web/WebSite.inc
+++ b/lib/web/WebSite.inc
@@ -167,23 +167,8 @@ class WebSite extends KTEntity {
     *
     * @return Array array of WebSite objects, false otherwise and set $_SESSION["errorMessage"]
     */
-    function getList() {
-        global $default, $lang_err_database;
-        $aWebSiteArray;
-        settype($aWebSiteArray, "array");
-        $sql = $default->db;
-        $result = $sql->query("SELECT * FROM " . $default->web_sites_table);/*ok*/
-        if ($result) {
-            $iCount = 0;
-            while ($sql->next_record()) {
-                $oWebSite = & WebSite::get($sql->f("id"));
-                $aWebSiteArray[$iCount] = $oWebSite;
-                $iCount++;
-            }
-            return $aWebSiteArray;
-        }
-        $_SESSION["errorMessage"] = $lang_err_database;
-        return false;
+    function getList($sWhereClause = null) {
+        return KTEntityUtil::getList(WebSite::_table(), 'WebSite', $sWhereClause);
     }
     
     /**