adding support for consistency checking