diff --git a/party.py b/party.py
index 2ff7dd4..7cdae96 100644
--- a/party.py
+++ b/party.py
@@ -7,9 +7,8 @@ from trytond.pyson import Eval, If, Bool
 __all__ = ['Address', 'CountryZip']
 
 
-class Address:
+class Address(metaclass=PoolMeta):
     __name__ = 'party.address'
-    __metaclass__ = PoolMeta
     country_zip = fields.Many2One('country.zip', 'Location',
         ondelete='RESTRICT', domain=[
             If(Bool(Eval('country')), ('country', '=', Eval('country', -1)),
@@ -74,9 +73,8 @@ class Address:
             self.city = None
 
 
-class CountryZip:
+class CountryZip(metaclass=PoolMeta):
     __name__ = 'country.zip'
-    __metaclass__ = PoolMeta
 
     def get_rec_name(self, name):
         res = []
diff --git a/setup.py b/setup.py
index 5d35a40..fecbb6e 100644
--- a/setup.py
+++ b/setup.py
@@ -5,10 +5,7 @@ from setuptools import setup
 import re
 import os
 import io
-try:
-    from configparser import ConfigParser
-except ImportError:
-    from ConfigParser import ConfigParser
+from configparser import ConfigParser
 
 MODULE = 'party_zip'
 PREFIX = 'nantic'