Change DefaultValueHandling to Include