Added validation on numeric fields