Add support for $check_names