Added support for default checks