Added support for check_parameters