diff --git a/zwackl/zwacklddns.schema b/zwackl/zwacklddns.schema
index 9bedebb..4316a46 100644
--- a/zwackl/zwacklddns.schema
+++ b/zwackl/zwacklddns.schema
@@ -4,130 +4,139 @@
 #
 # Attributes: 1.3.6.1.4.1.99999.1.1
 
-attributetype ( 1.3.6.1.4.1.99999.1.1.1 
-	NAME 'ddnsFQDN'
-	DESC 'Fully Qualified Domain Name'
-	EQUALITY caseExactIA5Match
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
-	SINGLE-VALUE)
+attributetype ( 1.3.6.1.4.1.99999.1.1.1
+  NAME 'ddnsFQDN'
+  DESC 'Fully Qualified Domain Name'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
+  SINGLE-VALUE)
 
-attributetype ( 1.3.6.1.4.1.99999.1.1.2 
-	NAME 'ddnsIPaddr'
-	DESC 'IPv4 Address'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
-	SINGLE-VALUE)
+attributetype ( 1.3.6.1.4.1.99999.1.1.2
+  NAME 'ddnsIPaddr'
+  DESC 'IPv4 Address'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
+  SINGLE-VALUE)
 
-attributetype ( 1.3.6.1.4.1.99999.1.1.4 
-	NAME 'ddnsZone'
-	DESC 'DDNS-Zone'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
-	SINGLE-VALUE)
+attributetype ( 1.3.6.1.4.1.99999.1.1.4
+  NAME 'ddnsZone'
+  DESC 'DDNS-Zone'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
+  SINGLE-VALUE)
 
-attributetype ( 1.3.6.1.4.1.99999.1.1.5 
-	NAME 'ddnsV6Broker'
-	DESC 'IPv6 Broker Name'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
-	SINGLE-VALUE)
+attributetype ( 1.3.6.1.4.1.99999.1.1.5
+  NAME 'ddnsV6Broker'
+  DESC 'IPv6 Broker Name'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
+  SINGLE-VALUE)
 
-attributetype ( 1.3.6.1.4.1.99999.1.1.6 
-	NAME 'ddnsV6BrokerURL'
-	DESC 'IPv6 Broker URL'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
-	SINGLE-VALUE)
+attributetype ( 1.3.6.1.4.1.99999.1.1.6
+  NAME 'ddnsV6BrokerURL'
+  DESC 'IPv6 Broker URL'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
+  SINGLE-VALUE)
 
-attributetype ( 1.3.6.1.4.1.99999.1.1.7 
-	NAME 'ddnsV6BrokerUser'
-	DESC 'IPv6 Broker User-ID'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
-	SINGLE-VALUE)
+attributetype ( 1.3.6.1.4.1.99999.1.1.7
+  NAME 'ddnsV6BrokerUser'
+  DESC 'IPv6 Broker User-ID'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
+  SINGLE-VALUE)
 
-attributetype ( 1.3.6.1.4.1.99999.1.1.8 
-	NAME 'ddnsV6BrokerPass'
-	DESC 'IPv6 Broker Password'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
-	SINGLE-VALUE)
+attributetype ( 1.3.6.1.4.1.99999.1.1.8
+  NAME 'ddnsV6BrokerPass'
+  DESC 'IPv6 Broker Password'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
+  SINGLE-VALUE)
 
-attributetype ( 1.3.6.1.4.1.99999.1.1.9 
-	NAME 'ddnsV6BrokertunnelID'
-	DESC 'IPv6 Broker Tunnel ID'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
-	SINGLE-VALUE)
+attributetype ( 1.3.6.1.4.1.99999.1.1.9
+  NAME 'ddnsV6BrokertunnelID'
+  DESC 'IPv6 Broker Tunnel ID'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
+  SINGLE-VALUE)
 
-attributetype ( 1.3.6.1.4.1.99999.1.1.10 
-	NAME 'ddnsV6BrokerEnabled'
-	DESC 'IPv6 Broker on-off flag'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
-	SINGLE-VALUE)
+attributetype ( 1.3.6.1.4.1.99999.1.1.10
+  NAME 'ddnsV6BrokerEnabled'
+  DESC 'IPv6 Broker on-off flag'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
+  SINGLE-VALUE)
 
 attributetype ( 1.3.6.1.4.1.99999.1.1.11
-	NAME 'ddnsUID'
-	DESC 'Reference to a users DN'
-	SUP distinguishedName )
+  NAME 'ddnsUID'
+  DESC 'Reference to a users DN'
+  SUP distinguishedName )
 
 attributetype ( 1.3.6.1.4.1.99999.1.1.12
-	NAME 'ddnsRelatedFQDN'
-	DESC 'Related Fully Qualified Domain Name'
-	EQUALITY caseExactIA5Match
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256})
+  NAME 'ddnsRelatedFQDN'
+  DESC 'Related Fully Qualified Domain Name'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256})
 
 attributetype ( 1.3.6.1.4.1.99999.1.1.13
-	NAME 'ddnsTXTdata'
-	DESC 'TXT-Record value'
-	EQUALITY caseIgnoreIA5Match
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
-        SINGLE-VALUE)
+  NAME 'ddnsTXTdata'
+  DESC 'TXT-Record value'
+  EQUALITY caseIgnoreIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
+    SINGLE-VALUE)
 
 attributetype ( 1.3.6.1.4.1.99999.1.1.14
-	NAME 'allowedSrcIP'
-	DESC 'allowed source IP address'
-	EQUALITY caseIgnoreIA5Match
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256})
+  NAME 'allowedSrcIP'
+  DESC 'allowed source IP address'
+  EQUALITY caseIgnoreIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256})
 
 attributetype ( 1.3.6.1.4.1.99999.1.1.15
-        NAME 'ddns01Key'                  
-        DESC 'allowed DDNS01 key'  
-        EQUALITY caseIgnoreIA5Match              
-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256})
+  NAME 'ddns01Key'
+  DESC 'allowed DDNS01 key'
+  EQUALITY caseIgnoreIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256})
+
+attributetype ( 1.3.6.1.4.1.99999.1.1.16
+  NAME 'dyndnsServerAddr'
+  DESC 'IP address of dyndns Server'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
+  SINGLE-VALUE)
 
 #
 # Objects: 1.3.6.1.4.1.99999.1.2
 #
 objectclass ( 1.3.6.1.4.1.99999.1.2.1
-	NAME 'ZwacklDDNS'
-	DESC 'Zwackl Dynamic DNS Service'
-	SUP top
-	STRUCTURAL
-	MUST ( ddnsFQDN $ ddnsIPaddr )
-  MAY		( ddnsRelatedFQDN $ ddnsUID $ ddnsV6Broker $ ddnsV6BrokerURL $ ddnsV6BrokerUser $ ddnsV6BrokerPass $ ddnsV6BrokerTunnelID $ ddnsV6BrokerEnabled ))
+  NAME 'ZwacklDDNS'
+  DESC 'Zwackl Dynamic DNS Service'
+  SUP top
+  STRUCTURAL
+  MUST  ( ddnsFQDN $ ddnsIPaddr )
+  MAY   ( ddnsRelatedFQDN $ ddnsUID $ ddnsV6Broker $ ddnsV6BrokerURL $ ddnsV6BrokerUser $ ddnsV6BrokerPass $ ddnsV6BrokerTunnelID $ ddnsV6BrokerEnabled ))
 
 objectclass ( 1.3.6.1.4.1.99999.1.2.2
-	NAME 'ZwacklDDNSZone'
-	DESC 'Zwackl Dynamic DNS Zone'
-	SUP top
-	STRUCTURAL
-	MUST ddnsZone )
+  NAME 'ZwacklDDNSZone'
+  DESC 'Zwackl Dynamic DNS Zone'
+  SUP top
+  STRUCTURAL
+  MUST  ( ddnsZone )
+  MAY   ( dyndnsServerAddr ))
 
 objectclass ( 1.3.6.1.4.1.99999.1.2.3
-	NAME 'ZwacklDDNS-01'
-	DESC 'Zwackl Dynamic DNS-01 Service'
-	SUP top
-	STRUCTURAL
-        MUST ( ddnsFQDN )     
-        MAY  ( ddns01Key $ allowedSrcIP ))
+  NAME 'ZwacklDDNS-01'
+  DESC 'Zwackl Dynamic DNS-01 Service'
+  SUP top
+  STRUCTURAL
+  MUST  ( ddnsFQDN )
+  MAY   ( ddns01Key $ allowedSrcIP ))