Move validator to special class.