4.0: Add support for mulitple check modes