Adding checks for valid numeric fields