Added match lookup