Adding a criteria handler