diff --git a/ontology/uco-gufo.ttl b/ontology/uco-gufo.ttl
index 931942e..c054115 100644
--- a/ontology/uco-gufo.ttl
+++ b/ontology/uco-gufo.ttl
@@ -40,8 +40,20 @@ drafting:Bearing
 	rdfs:seeAlso <https://github.com/ucoProject/UCO/issues/567> ;
 	.
 
+drafting:BuildUtility
+	a
+		gufo:Category ,
+		owl:Class
+		;
+	rdfs:subClassOf uco-observable:Software ;
+	rdfs:isDefinedBy <https://github.com/ucoProject/UCO/issues/596> ;
+	.
+
 drafting:Compiler
-	a owl:Class ;
+	a
+		gufo:SubKind ,
+		owl:Class
+		;
 	rdfs:subClassOf
 		gufo:FunctionalComplex ,
 		uco-observable:Software
@@ -96,15 +108,43 @@ drafting:GeneralFacetType
 		;
 	.
 
+drafting:LinuxProcess
+	a
+		gufo:SubKind ,
+		owl:Class
+		;
+	rdfs:subClassOf uco-observable:Process ;
+	.
+
+drafting:LinuxService
+	a
+		gufo:SubKind ,
+		owl:Class
+		;
+	rdfs:subClassOf
+		drafting:LinuxProcess ,
+		drafting:Service
+		;
+	rdfs:isDefinedBy <https://github.com/ucoProject/UCO/issues/596> ;
+	.
+
 drafting:LinuxTask
 	a
-		gufo:Kind ,
+		gufo:SubKind ,
 		owl:Class
 		;
 	rdfs:subClassOf drafting:Task ;
 	rdfs:isDefinedBy <https://github.com/ucoProject/UCO/issues/596> ;
 	.
 
+drafting:LinuxThread
+	a
+		gufo:SubKind ,
+		owl:Class
+		;
+	rdfs:subClassOf uco-observable:ProcessThread ;
+	.
+
 drafting:Package
 	a
 		gufo:Kind ,
@@ -152,7 +192,10 @@ drafting:Service
 	.
 
 drafting:ServicePack
-	a owl:Class ;
+	a
+		gufo:EndurantType ,
+		owl:Class
+		;
 	rdfs:subClassOf
 		gufo:FunctionalComplex ,
 		uco-observable:Software
@@ -182,10 +225,10 @@ drafting:SpecificFacetType
 
 drafting:Task
 	a
-		gufo:Category ,
+		gufo:Kind ,
 		owl:Class
 		;
-	rdfs:subClassOf uco-observable:Process ;
+	rdfs:subClassOf uco-observable:Software ;
 	rdfs:isDefinedBy <https://github.com/ucoProject/UCO/issues/596> ;
 	.
 
@@ -381,10 +424,18 @@ uco-observable:AlternateDataStream
 		;
 	.
 
+uco-observable:Application
+	a gufo:Category ;
+	.
+
 uco-observable:BluetoothAddressFacet
 	a drafting:SpecificFacetType ;
 	.
 
+uco-observable:Code
+	a gufo:Category ;
+	.
+
 uco-observable:Device
 	rdfs:subClassOf
 		drafting:Endurant ,
@@ -396,12 +447,24 @@ uco-observable:FileSystemObject
 	a gufo:Category ;
 	.
 
+uco-observable:Library
+	a gufo:SubKind ;
+	.
+
 uco-observable:MACAddressFacet
 	a drafting:GeneralFacetType ;
 	.
 
+uco-observable:OperatingSystem
+	a gufo:Kind ;
+	.
+
 uco-observable:Process
-	a gufo:Category ;
+	a gufo:Kind ;
+	.
+
+uco-observable:ProcessThread
+	a gufo:Kind ;
 	.
 
 uco-observable:Software
@@ -409,15 +472,20 @@ uco-observable:Software
 	.
 
 uco-observable:WindowsService
-	a gufo:Kind ;
+	a gufo:SubKind ;
 	rdfs:subClassOf drafting:Service ;
 	.
 
 uco-observable:WindowsTask
-	a gufo:Kind ;
+	a gufo:SubKind ;
 	rdfs:subClassOf drafting:Task ;
 	.
 
+uco-observable:WindowsThread
+	a gufo:SubKind ;
+	rdfs:subClassOf uco-observable:ProcessThread ;
+	.
+
 uco-types:Hash
 	rdfs:subClassOf gufo:AbstractIndividual ;
 	.
diff --git a/tests/Makefile b/tests/Makefile
index acb2734..52b61fb 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -105,7 +105,7 @@ monolithic.ttl: \
 	    > _$@
 	source $(top_srcdir)/venv/bin/activate \
 	  && pyshacl \
-	    --shacl $(uco_srcdir)/ontology/owl/owl.ttl \
+	    --shacl _$@ \
 	    _$@
 	# The monolithic build reviews itself, due to shapes pertaining to meta-classes.
 	source $(top_srcdir)/venv/bin/activate \
diff --git a/tests/exemplars.ttl b/tests/exemplars.ttl
index f9413e8..71b0066 100644
--- a/tests/exemplars.ttl
+++ b/tests/exemplars.ttl
@@ -63,6 +63,10 @@ kb:AnalyticResult-34fb92db-d576-45a7-9d62-dae04510968f
 	a uco-analysis:AnalyticResult ;
 	.
 
+kb:Application-b1ccc498-d1ae-4101-a383-47fa1a1dcc54
+	a uco-observable:Application ;
+	.
+
 kb:Bearing-74c2bb20-1e4f-40ac-807e-bc2c528e39da
 	a drafting:Bearing ;
 	gufo:inheresIn kb:Vehicle-c7e910e8-4bed-473e-ad74-3df3eb63cbcc ;
@@ -80,11 +84,19 @@ kb:BluetoothAddressFacet-717b8cce-e9c2-4d59-81e4-1747d7e2d8ee
 	a uco-observable:BluetoothAddressFacet ;
 	.
 
+kb:BuildUtility-ecc20d36-1575-4d6b-adde-d22f3dd40cca
+	a drafting:BuildUtility ;
+	.
+
 kb:Camera-1c9a2999-b34c-459b-b983-113c7b9e71df
 	a uco-observable:Device ;
 	rdfs:comment "A digital, non-phone camera."@en ;
 	.
 
+kb:Code-8a651185-47ff-4aea-94e9-b7995f1b24f8
+	a uco-observable:Code ;
+	.
+
 kb:Compiler-7ae00fea-f392-4da5-9b07-ea0ee12e27ed
 	a drafting:Compiler ;
 	.
@@ -157,6 +169,14 @@ kb:Interval-336d4db4-727e-4694-8bf0-5902c6ae504f
 	time:inside kb:Instant-2918592a-9d87-4b30-acbc-521a19f97fcd ;
 	.
 
+kb:Library:bc578b6e-db2d-4b5f-8108-137fe081573f
+	a uco-observable:Library ;
+	.
+
+kb:LinuxService-971020ef-07cd-4005-977c-b31c56789aca
+	a drafting:LinuxService ;
+	.
+
 kb:LinuxTask-45f8dd65-afee-4f48-8d4c-886b5d53cfa3
 	a drafting:LinuxTask ;
 	.
@@ -169,6 +189,10 @@ kb:MACAddressFacet-3b25d05e-a3b0-4828-8b6d-1e08f4d4264f
 	a uco-observable:MACAddressFacet ;
 	.
 
+kb:OperatingSystem-78388f2c-305a-4f9c-8fd5-2ba98d987b11
+	a uco-observable:OperatingSystem ;
+	.
+
 kb:Organization-3b542161-47e1-40cd-a1b1-e1b9d07af81f
 	a uco-identity:Organization ;
 	.
@@ -189,6 +213,10 @@ kb:Person-ee7130a7-0fec-48df-8312-4da1a214bd59
 	a uco-identity:Person ;
 	.
 
+kb:ProcessThread-f400eeb2-b83f-4a52-9d1a-dcc9cae0da2e
+	a uco-observable:ProcessThread ;
+	.
+
 kb:Quality-4b765c1f-362c-4562-a50f-7bb781fe4737
 	a drafting:Quality ;
 	gufo:hasReifiedQualityValue kb:Hash-4c3d0623-d365-4c69-a1a1-01523c6502fa ;
@@ -248,3 +276,7 @@ kb:WindowsTask-1148ebc4-750b-43f8-a17d-6ba239f62ae7
 	a uco-observable:WindowsTask ;
 	.
 
+kb:WindowsThread-aa892ff7-ffd9-4269-89ab-79470813ab88
+	a uco-observable:WindowsThread ;
+	.
+