Added match functionality