diff --git a/jlcaosdb/jlcaosdb.cxx b/jlcaosdb/jlcaosdb.cxx
index 5fed1c2614657d10379299b248f2ce4f8a04bd6a..88ed8136630dd783f576ad540a24a800bc8c95fb 100644
--- a/jlcaosdb/jlcaosdb.cxx
+++ b/jlcaosdb/jlcaosdb.cxx
@@ -23,20 +23,28 @@
 #include <string>
 
 #include <jlcxx/jlcxx.hpp>
+#include <jlcxx/array.hpp>
+#include <jlcxx/const_array.hpp>
+#include <jlcxx/functions.hpp>
+#include <jlcxx/module.hpp>
+#include <jlcxx/smart_pointers.hpp>
+#include <jlcxx/stl.hpp>
+#include <jlcxx/tuple.hpp>
+#include <jlcxx/type_conversion.hpp>
 
 #include "caosdb/authentication.h"
 #include "caosdb/connection.h"
 #include "caosdb/constants.h"
 #include "caosdb/exceptions.h"
 
-namespace jlcxx
-{
-  template<>
-  struct SuperType<caosdb::authentication::PlainPasswordAuthenticator>
-  {
-    typedef caosdb::authentication::Authenticator type;
-  };
-}
+// namespace jlcxx
+// {
+//   template<>
+//   struct SuperType<caosdb::authentication::PlainPasswordAuthenticator>
+//   {
+//     typedef caosdb::authentication::Authenticator type;
+//   };
+// }
 
 JLCXX_MODULE define_julia_module(jlcxx::Module& mod)
 {
@@ -57,8 +65,15 @@ JLCXX_MODULE define_julia_module(jlcxx::Module& mod)
 
   // authenticators
   mod.add_type<caosdb::authentication::Authenticator>("CaosDBAuthenticator");
-  mod.add_type<caosdb::authentication::PlainPasswordAuthenticator>("PlainPasswordAuthenticator",
-								   jlcxx::julia_base_type<caosdb::authentication::Authenticator>())
-    .constructor<const std::string&, const std::string&>()
-    .method("getCallCredentials", &caosdb::authentication::PlainPasswordAuthenticator::getCallCredentials);
+  // Currently not working, see https://github.com/JuliaInterop/CxxWrap.jl/issues/294
+  // mod.add_type<caosdb::authentication::PlainPasswordAuthenticator>("PlainPasswordAuthenticator",
+  // 								   jlcxx::julia_base_type<caosdb::authentication::Authenticator>())
+  //   .constructor<const std::string&, const std::string&>()
+  //   .method("getCallCredentials", &caosdb::authentication::PlainPasswordAuthenticator::getCallCredentials);
+
+  mod.add_type<caosdb::connection::CACertificateProvider>("CACertificateProvider");
+  // TODO Add children once the above issue is resolved
+  
+  mod.add_type<caosdb::connection::CaosDBConnectionConfig>("CaosDBConnectionConfig");
+  mod.add_type<caosdb::connection::InsecureCaosDBConnectionConfig>("InsecureCaosDBConnectionConfig");
 }