Added match for criteria