Added check for all numeric data