Adjusted CheckerFactory