Improve FileValidator