diff --git a/lam/lib/modules/freeRadius.inc b/lam/lib/modules/freeRadius.inc
index ef0a4c19..fc787cc8 100644
--- a/lam/lib/modules/freeRadius.inc
+++ b/lam/lib/modules/freeRadius.inc
@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2011 - 2012  Roland Gruber
+  Copyright (C) 2011 - 2013  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
@@ -613,24 +613,14 @@ class freeRadius extends baseModule {
 	*/
 	function get_pdfEntries() {
 		$return = array();
-		if (isset($this->attributes['radiusFramedIPAddress'][0])) {
-			$return[get_class($this) . '_radiusFramedIPAddress'][0] = '<block><key>' . _('IP address') . '</key><value>' . $this->attributes['radiusFramedIPAddress'][0] . '</value></block>';
-		}
-		if (isset($this->attributes['radiusFramedIPNetmask'][0])) {
-			$return[get_class($this) . '_radiusFramedIPNetmask'][0] = '<block><key>' . _('Net mask') . '</key><value>' . $this->attributes['radiusFramedIPNetmask'][0] . '</value></block>';
-		}
-		if (isset($this->attributes['radiusRealm'][0])) {
-			$return[get_class($this) . '_radiusRealm'][0] = '<block><key>' . _('Realm') . '</key><value>' . $this->attributes['radiusRealm'][0] . '</value></block>';
-		}
-		if (isset($this->attributes['radiusGroupName'][0])) {
-			$return[get_class($this) . '_radiusGroupName'][0] = '<block><key>' . _('Group names') . '</key><value>' . implode(', ', $this->attributes['radiusGroupName']) . '</value></block>';
-		}
+		$this->addSimplePDFField($return, 'radiusFramedIPAddress', _('IP address'));
+		$this->addSimplePDFField($return, 'radiusFramedIPNetmask', _('Net mask'));
+		$this->addSimplePDFField($return, 'radiusRealm', _('Realm'));
+		$this->addSimplePDFField($return, 'radiusGroupName', _('Group names'));
+		$this->addSimplePDFField($return, 'radiusIdleTimeout', _('Idle timeout'));
 		if (isset($this->attributes['radiusExpiration'][0])) {
 			$return[get_class($this) . '_radiusExpiration'][0] = '<block><key>' . _('Expiration date') . '</key><value>' . $this->formatExpirationDate($this->attributes['radiusExpiration'][0]) . '</value></block>';
 		}
-		if (isset($this->attributes['radiusIdleTimeout'][0])) {
-			$return[get_class($this) . '_radiusIdleTimeout'][0] = '<block><key>' . _('Idle timeout') . '</key><value>' . $this->attributes['radiusIdleTimeout'][0] . '</value></block>';
-		}
 		return $return;
 	}
 
diff --git a/lam/lib/modules/hostObject.inc b/lam/lib/modules/hostObject.inc
index 6ba392b5..4d6a1dfe 100644
--- a/lam/lib/modules/hostObject.inc
+++ b/lam/lib/modules/hostObject.inc
@@ -252,9 +252,7 @@ class hostObject extends baseModule {
 	*/
 	function get_pdfEntries() {
 		$return = array();
-		if (isset($this->attributes['host'][0])) {
-			$return['hostObject_hosts'][0] = '<block><key>' . _('Host list') . '</key><value>' . implode(', ', $this->attributes['host']) . '</value></block>';
-		}
+		$this->addSimplePDFField($return, 'hosts', _('Host list'), 'host');
 		return $return;
 	}
 
diff --git a/lam/lib/modules/ieee802device.inc b/lam/lib/modules/ieee802device.inc
index f3758ae7..1978a97d 100644
--- a/lam/lib/modules/ieee802device.inc
+++ b/lam/lib/modules/ieee802device.inc
@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2004 - 2012  Roland Gruber
+  Copyright (C) 2004 - 2013  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
@@ -202,9 +202,7 @@ class ieee802Device extends baseModule {
 	*/
 	function get_pdfEntries() {
 		$return = array();
-		if (sizeof($this->attributes['macAddress']) > 0) {
-			$return['ieee802Device_macAddress'][0] = '<block><key>' . _('MAC addresses') . '</key><value>' . implode(', ', $this->attributes['macAddress']) . '</value></block>';
-		}
+		$this->addSimplePDFField($return, 'macAddress', _('MAC addresses'));
 		return $return;
 	}