diff --git a/container/src/root/macro/common/crypto.hh b/container/src/root/macro/common/crypto.hh
index aab68da..03252b8 100644
--- a/container/src/root/macro/common/crypto.hh
+++ b/container/src/root/macro/common/crypto.hh
@@ -46,39 +46,63 @@ namespace common
 //! \since docker-finance 1.0.0
 namespace crypto::botan
 {
+//! \brief ROOT's Botan Hash class
+//! \ingroup cpp_macro
+using Hash = ::docker_finance::crypto::botan::Hash;
+
 //! \brief ROOT's Botan Hash instance
 //! \ingroup cpp_macro
-auto g_Hash = std::make_unique<::docker_finance::crypto::botan::Hash>();
+auto g_Hash = std::make_unique<Hash>();
+
+//! \brief ROOT's Botan Random class
+//! \ingroup cpp_macro
+using Random = ::docker_finance::crypto::botan::Random;
 
 //! \brief ROOT's Botan Random instance
 //! \ingroup cpp_macro
-auto g_Random = std::make_unique<::docker_finance::crypto::botan::Random>();
+auto g_Random = std::make_unique<Random>();
 }  // namespace crypto::botan
 
 //! \namespace docker_finance::macro::common::crypto::cryptopp
 //! \since docker-finance 1.0.0
 namespace crypto::cryptopp
 {
+//! \brief ROOT's Crypto++ Hash class
+//! \ingroup cpp_macro
+using Hash = ::docker_finance::crypto::cryptopp::Hash;
+
 //! \brief ROOT's Crypto++ Hash instance
 //! \ingroup cpp_macro
-auto g_Hash = std::make_unique<::docker_finance::crypto::cryptopp::Hash>();
+auto g_Hash = std::make_unique<Hash>();
+
+//! \brief ROOT's Crypto++ Random class
+//! \ingroup cpp_macro
+using Random = ::docker_finance::crypto::cryptopp::Random;
 
 //! \brief ROOT's Crypto++ Random instance
 //! \ingroup cpp_macro
-auto g_Random = std::make_unique<::docker_finance::crypto::cryptopp::Random>();
+auto g_Random = std::make_unique<Random>();
 }  // namespace crypto::cryptopp
 
 //! \namespace docker_finance::macro::common::crypto::libsodium
 //! \since docker-finance 1.0.0
 namespace crypto::libsodium
 {
+//! \brief ROOT's libsodium Hash class
+//! \ingroup cpp_macro
+using Hash = ::docker_finance::crypto::libsodium::Hash;
+
 //! \brief ROOT's libsodium Hash instance
 //! \ingroup cpp_macro
-auto g_Hash = std::make_unique<::docker_finance::crypto::libsodium::Hash>();
+auto g_Hash = std::make_unique<Hash>();
+
+//! \brief ROOT's libsodium Random class
+//! \ingroup cpp_macro
+using Random = ::docker_finance::crypto::libsodium::Random;
 
 //! \brief ROOT's libsodium Random instance
 //! \ingroup cpp_macro
-auto g_Random = std::make_unique<::docker_finance::crypto::libsodium::Random>();
+auto g_Random = std::make_unique<Random>();
 }  // namespace crypto::libsodium
 
 }  // namespace common