Modified validation rules to allow non required/empty cases