#7: Added support for masking additional properties.