Move the criteria to a factory so that we can customize it