Added IsNumber and FileName