diff --git a/tsv/latest/XObjectImage.tsv b/tsv/latest/XObjectImage.tsv
index e7ea0317..8f095126 100644
--- a/tsv/latest/XObjectImage.tsv
+++ b/tsv/latest/XObjectImage.tsv
@@ -5,9 +5,9 @@ Width	integer	1.0		TRUE	FALSE	FALSE
 Height	integer	1.0		TRUE	FALSE	FALSE					
 ColorSpace	array;name	1.0		fn:IsRequired(fn:Not(fn:Contains(@Filter,JPXDecode) || (@ImageMask==true)))	FALSE	FALSE		[];[DeviceCMYK,DeviceRGB,DeviceGray]	[fn:Not(fn:IsPresent(@ImageMask==true))];[fn:Not(fn:IsPresent(@ImageMask==true))]	[fn:SinceVersion(1.1,CalGrayColorSpace),fn:SinceVersion(1.1,CalRGBColorSpace),fn:SinceVersion(1.1,LabColorSpace),fn:SinceVersion(1.3,ICCBasedColorSpace),IndexedColorSpace,fn:SinceVersion(1.2,SeparationColorSpace),fn:SinceVersion(1.3,DeviceNColorSpace),fn:SinceVersion(1.2,PatternColorSpace)];[]	
 BitsPerComponent	integer	1.0		fn:IsRequired(fn:Not(fn:Contains(@Filter,JPXDecode) || (@ImageMask==true)))	FALSE	FALSE		[fn:RequiredValue((@Filter==CCITTFaxDecode) || (@Filter==JBIG2Decode) || (@ImageMask==true),1),2,4,fn:RequiredValue((@Filter==RunLengthDecode) || (@Filter==DCTDecode),8),fn:SinceVersion(1.5,16)]			
-Intent	name	1.1		FALSE	FALSE	FALSE					
-ImageMask	boolean	1.0		FALSE	FALSE	FALSE	false				
-Mask	array;stream	1.3		FALSE	[FALSE];[TRUE]	FALSE			[fn:Not(fn:IsPresent(ImageMask))];[fn:Not(fn:IsPresent(ImageMask))]	[ArrayOfIntegersGeneral];[XObjectImageMask]	
+Intent	name	1.1		FALSE	FALSE	FALSE			[fn:Ignore(@ImageMask==true)]		
+ImageMask	boolean	1.0		FALSE	FALSE	FALSE	false		[fn:Eval(((@ImageMask==true) && (@BitsPerComponent==1) && fn:Not(fn:IsPresent(ColorSpace)) && fn:Not(fn:IsPresent(Mask))) || (@ImageMask==false))]		
+Mask	array;stream	1.3		FALSE	[FALSE];[TRUE]	FALSE			[fn:Not(fn:IsPresent(@ImageMask==true))];[fn:Not(fn:IsPresent(@ImageMask==true))]	[ArrayOfIntegersGeneral];[XObjectImageMask]	
 Decode	array	1.0		FALSE	FALSE	FALSE			[fn:Ignore(fn:Contains(@Filter,JPXDecode) && fn:Not(fn:IsPresent(ColorSpace)) && (@ImageMask==false))]	[ArrayOfNumbersGeneral]	
 Interpolate	boolean	1.0		FALSE	FALSE	FALSE	false				
 Alternates	array	1.3		FALSE	FALSE	FALSE				[ArrayOfImageAlternates]	
diff --git a/tsv/latest/XObjectImageMask.tsv b/tsv/latest/XObjectImageMask.tsv
index a8e3247e..934512e4 100644
--- a/tsv/latest/XObjectImageMask.tsv
+++ b/tsv/latest/XObjectImageMask.tsv
@@ -4,8 +4,8 @@ Subtype	name	1.3		TRUE	FALSE	FALSE		[Image]
 Width	integer	1.3		TRUE	FALSE	FALSE					
 Height	integer	1.3		TRUE	FALSE	FALSE					
 BitsPerComponent	integer	1.3		FALSE	FALSE	FALSE		[1]			
-Intent	name	1.3		FALSE	FALSE	FALSE			[fn:Ignore()]		
-ImageMask	boolean	1.3		TRUE	FALSE	FALSE	true				
+Intent	name	1.3		FALSE	FALSE	FALSE			[fn:Ignore(@ImageMask==true)]		
+ImageMask	boolean	1.3		TRUE	FALSE	FALSE	true		[fn:Eval(((@ImageMask==true) && (@BitsPerComponent==1) && fn:Not(fn:IsPresent(ColorSpace)) && fn:Not(fn:IsPresent(Mask))) || (@ImageMask==false))]		
 Decode	array	1.3		FALSE	FALSE	FALSE	[0 1]	[[0 1],[1 0]]		[ArrayOfNumbersGeneral]	
 Interpolate	boolean	1.3		FALSE	FALSE	FALSE	false				
 Alternates	array	1.3		FALSE	FALSE	FALSE				[ArrayOfImageAlternates]	
diff --git a/tsv/latest/XObjectImageSoftMask.tsv b/tsv/latest/XObjectImageSoftMask.tsv
index b65370d7..bb0806d2 100644
--- a/tsv/latest/XObjectImageSoftMask.tsv
+++ b/tsv/latest/XObjectImageSoftMask.tsv
@@ -4,8 +4,8 @@ Subtype	name	1.4		TRUE	FALSE	FALSE		[Image]
 Width	integer	1.4		TRUE	FALSE	FALSE			[fn:Eval(fn:IsPresent(Matte,(@Width==parent::@Width)))]		
 Height	integer	1.4		TRUE	FALSE	FALSE			[fn:Eval(fn:IsPresent(Matte,(@Height==parent::@Height)))]		
 ColorSpace	name	1.4		TRUE	FALSE	FALSE		[DeviceGray]			
-BitsPerComponent	integer	1.4		TRUE	FALSE	FALSE		[fn:RequiredValue((fn:Contains(@Filter,CCITTFaxDecode) || fn:Contains(@Filter,JBIG2Decode)),1),2,4,fn:RequiredValue((fn:Contains(@Filter,RunLengthDecode) || fn:Contains(@Filter,DCTDecode)),8),fn:SinceVersion(1.5,16)]			
-Intent	name	1.4		FALSE	FALSE	FALSE					
+BitsPerComponent	integer	1.4		fn:IsRequired(fn:Not(fn:Contains(@Filter,JPXDecode) || (@ImageMask==true)))	FALSE	FALSE		[fn:RequiredValue((fn:Contains(@Filter,CCITTFaxDecode) || fn:Contains(@Filter,JBIG2Decode)),1),2,4,fn:RequiredValue((fn:Contains(@Filter,RunLengthDecode) || fn:Contains(@Filter,DCTDecode)),8),fn:SinceVersion(1.5,16)]			
+Intent	name	1.4		FALSE	FALSE	FALSE			[fn:Ignore(@ImageMask==true)]		
 ImageMask	boolean	1.4		FALSE	FALSE	FALSE	false		[fn:Eval(@ImageMask==false)]		Table 143
 Name	name	1.4	2.0	FALSE	FALSE	FALSE					
 Decode	array	1.4		FALSE	FALSE	FALSE	[0 1]			[ArrayOfNumbersGeneral]