Added preliminary support for improved checking routines