Added validation for field values