diff --git a/xml/dtd/common.xsd b/xml/dtd/common.xsd
index ce7bb90..cd6ce65 100644
--- a/xml/dtd/common.xsd
+++ b/xml/dtd/common.xsd
@@ -119,9 +119,7 @@
         <xs:element ref="full_name"/>
         <xs:element ref="short_name"/>
         <xs:element ref="waiver_rep"/>
-        <xs:element ref="address"/>
-        <xs:element ref="city"/>
-        <xs:element ref="country"/>
+        <xs:group ref="address-group"/>
         <xs:element minOccurs="0" ref="coc"/>
       </xs:sequence>
       <xs:attribute name="id" type="xs:ID"/>