Validator improvement for checker