Added zone matching support to client.