Added more validations to the numeric fields