diff --git a/src/DiagrammaticEquations.jl b/src/DiagrammaticEquations.jl
index be9cace..9729e31 100644
--- a/src/DiagrammaticEquations.jl
+++ b/src/DiagrammaticEquations.jl
@@ -2,6 +2,8 @@
 """
 module DiagrammaticEquations
 
+using Catlab
+
 export
 DerivOp, append_dot, normalize_unicode, infer_states, infer_types!,
 # Deca
@@ -12,6 +14,7 @@ recursive_delete_parents, spacename, varname, unicode!, vec_to_dec!,
 Collage, collate,
 ## composition
 oapply, unique_by, unique_by!, OpenSummationDecapodeOb, OpenSummationDecapode, Open, default_composition_diagram,
+apex, @relation, # Re-exported from Catlab
 ## acset
 SchDecapode, SchNamedDecapode, AbstractDecapode, AbstractNamedDecapode, NamedDecapode, SummationDecapode,
 contract_operators!, contract_operators, add_constant!, add_parameter, fill_names!, dot_rename!, is_expanded, expand_operators, infer_state_names, infer_terminal_names, recognize_types,
@@ -25,12 +28,12 @@ unique_lits!,
 Plus, AppCirc1, Var, Tan, App1, App2,
 ## visualization
 to_graphviz_property_graph, typename, draw_composition,
+to_graphviz, # Re-exported from Catlab
 ## rewrite
 average_rewrite,
 ## openoperators
 transfer_parents!, transfer_children!, replace_op1!, replace_op2!, replace_all_op1s!, replace_all_op2s!
 
-using Catlab
 using Catlab.Theories
 import Catlab.Theories: otimes, oplus, compose, ⊗, ⊕, ⋅, associate, associate_unit, Ob, Hom, dom, codom
 using Catlab.Programs
diff --git a/test/composition.jl b/test/composition.jl
index f0c5c02..408cf37 100644
--- a/test/composition.jl
+++ b/test/composition.jl
@@ -2,15 +2,12 @@ using Test
 using DiagrammaticEquations
 using DiagrammaticEquations.Deca
 using Catlab
-using Catlab.WiringDiagrams
-using Catlab.Programs
-using Catlab.CategoricalAlgebra
 
 # import DiagrammaticEquations: OpenSummationDecapode, Open, oapply, oapply_rename
 
 # @testset "Composition" begin
 # Simplest possible decapode relation.
-Trivial = @decapode begin 
+Trivial = @decapode begin
   H::Form0{X}
 end
 
diff --git a/test/language.jl b/test/language.jl
index 3e3ab4e..c0c8680 100644
--- a/test/language.jl
+++ b/test/language.jl
@@ -1,11 +1,5 @@
 using Test
 using Catlab
-using Catlab.Theories
-using Catlab.CategoricalAlgebra
-using Catlab.WiringDiagrams
-using Catlab.WiringDiagrams.DirectedWiringDiagrams
-using Catlab.Graphics
-using Catlab.Programs
 using LinearAlgebra
 using MLStyle
 using Base.Iterators