Added numeric checking to validation