diff --git a/ebin/gmserialization.app b/ebin/gmserialization.app
index c1861e8..38e4b5a 100644
--- a/ebin/gmserialization.app
+++ b/ebin/gmserialization.app
@@ -1,11 +1,24 @@
 {application,gmserialization,
-             [{description,"Serialization of data for the Gajumaru"},
+             [{description,"Serialization helpers for the Gajumaru."},
               {vsn,"0.1.2"},
               {registered,[]},
               {applications,[kernel,stdlib,crypto,base58]},
               {env,[]},
-              {modules,[gmser_api_encoder,gmser_chain_objects,
+              {modules,[base58,timing,enacl_eqc,enacl_ext_eqc,enacl,enacl_ext,
+                        enacl_nif,enacl_SUITE,pc,pc_compilation,pc_port_env,
+                        pc_port_specs,pc_prv_clean,pc_prv_compile,pc_util,
+                        base58,timing,enacl_eqc,enacl_ext_eqc,enacl,enacl_ext,
+                        enacl_nif,enacl_SUITE,gmser_api_encoder,
+                        gmser_chain_objects,gmser_contract_code,
+                        gmser_delegation,gmser_id,gmser_rlp,gmserialization,
+                        gmser_api_encoder_tests,gmser_chain_objects_tests,
+                        gmser_contract_code_tests,gmser_delegation_tests,
+                        gmser_rlp_tests,pc,pc_compilation,pc_port_env,
+                        pc_port_specs,pc_prv_clean,pc_prv_compile,pc_util,
+                        gmser_api_encoder,gmser_chain_objects,
                         gmser_contract_code,gmser_delegation,gmser_id,
-                        gmser_rlp,gmserialization]},
+                        gmser_rlp,gmserialization,gmser_api_encoder_tests,
+                        gmser_chain_objects_tests,gmser_contract_code_tests,
+                        gmser_delegation_tests,gmser_rlp_tests]},
               {licenses,[]},
               {links,[]}]}.
diff --git a/rebar.config b/rebar.config
index 21e8e38..3dda79e 100644
--- a/rebar.config
+++ b/rebar.config
@@ -4,7 +4,4 @@
    {git,
     "https://git.qpq.swiss/QPQ-AG/erl-base58.git",
     {ref, "e6aa62eeae3d4388311401f06e4b939bf4e94b9c"}}},
-  {enacl,
-   {git,
-    "https://git.qpq.swiss/QPQ-AG/enacl.git", 
-    {ref, "4eb7ec70084ba7c87b1af8797c4c4e90c84f95a2"}}}]}.
+  {eblake2, "1.0.0"}]}.
diff --git a/rebar.lock b/rebar.lock
index cdf3d34..7f466c4 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -2,7 +2,5 @@
   {git,"https://git.qpq.swiss/QPQ-AG/erl-base58.git",
        {ref,"e6aa62eeae3d4388311401f06e4b939bf4e94b9c"}},
   0},
- {<<"enacl">>,
-  {git,"https://git.qpq.swiss/QPQ-AG/enacl.git",
-       {ref,"4eb7ec70084ba7c87b1af8797c4c4e90c84f95a2"}},
-  0}].
+ {<<"eblake2">>,
+  {pkg,<<"eblake2">>,<<"1.0.0">>},0}].