Added support for zip codes