Added support for postal codes