diff --git a/include/libdap-chain-python.h b/include/libdap-chain-python.h
index aea379053f2371d8060985fe76e5cc9081158913..9874ea04b8b394dc8ec7dc8d21a88484170f9436 100644
--- a/include/libdap-chain-python.h
+++ b/include/libdap-chain-python.h
@@ -1,3 +1,6 @@
+#ifndef _LIBDAP_CHAIN_PYTHON_
+#define _LIBDAP_CHAIN_PYTHON_
+
 #define PY_SSIZE_T_CLEAN
 
 //#define DAP_APP_NAME NODE_NETNAME "-node"
@@ -98,4 +101,4 @@ static PyTypeObject dapChainObject_dapChainType = {
 }
 #endif
 
-
+#endif //_LIBDAP_CHAIN_PYTHON_
diff --git a/include/libdap_chain_atom_iter_python.h b/include/libdap_chain_atom_iter_python.h
index 0f09dd345b26de1c2a188d6d3615061acaa34407..9e9b22a77f09ebbdfb27afa7ce06d2f5b8ef7b64 100644
--- a/include/libdap_chain_atom_iter_python.h
+++ b/include/libdap_chain_atom_iter_python.h
@@ -1,3 +1,5 @@
+#ifndef _LIBDAP_CHAIN_ATOM_ITER_PYTHON_
+#define _LIBDAP_CHAIN_ATOM_ITER_PYTHON_
 #include "Python.h"
 #include "dap_chain.h"
 
@@ -60,3 +62,5 @@ static PyTypeObject dapChainAtomPtr_dapChainAtomPtrType = {
 #ifdef __cplusplus
 }
 #endif
+
+#endif //_LIBDAP_CHAIN_ATOM_ITER_PYTHON_
diff --git a/include/libdap_chain_type_python.h b/include/libdap_chain_type_python.h
index 029b9f916912825794a3f797671be99a165e5545..289866c69fd21263df6ef408127a417d3ebcd298 100644
--- a/include/libdap_chain_type_python.h
+++ b/include/libdap_chain_type_python.h
@@ -1,8 +1,11 @@
+#ifndef _LIBDAP_CHAIN_TYPE_PYTHON_
+#define _LIBDAP_CHAIN_TYPE_PYTHON_
 #include "Python.h"
 #include "dap_chain.h"
 
 typedef struct PyChainType{
     PyObject_HEAD
+    dap_chain_type_t chain_type;
 } PyChainTypeObject;
 
 PyObject* CHAIN_TYPE_FIRST_PY();
@@ -62,3 +65,5 @@ static PyTypeObject dapChainTypeObject_dapChainTypeType = {
     PyType_GenericNew,         /* tp_new */
 
 };
+
+#endif //_LIBDAP_CHAIN_TYPE_PYTHON_
diff --git a/include/wrapping_dap_chain_common.h b/include/wrapping_dap_chain_common.h
index 1783327d3f3da74e446163982ba864fa59813d83..ff76943b5638194fa2d1a16eba7c821a5fe55068 100644
--- a/include/wrapping_dap_chain_common.h
+++ b/include/wrapping_dap_chain_common.h
@@ -1,3 +1,6 @@
+#ifndef _WRAPPING_DAP_CHAIN_COMMON_
+#define _WRAPPING_DAP_CHAIN_COMMON_
+
 #include "Python.h"
 #include "dap_chain_common.h"
 #include "wrapping_dap_chain_common_objects.h"
@@ -74,3 +77,5 @@ static PyTypeObject ChainCommonObject_ChainCommonType = {
 #ifdef __cplusplus
 }
 #endif
+
+#endif //_WRAPPING_DAP_CHAIN_COMMON_
diff --git a/include/wrapping_dap_chain_datum_token.h b/include/wrapping_dap_chain_datum_token.h
index 82f667748f3a7bde9a7eb6c7faa35f97e357f1f0..e1ec5055f35d612b0d349bb660d1a4e2e5b85dfa 100644
--- a/include/wrapping_dap_chain_datum_token.h
+++ b/include/wrapping_dap_chain_datum_token.h
@@ -1,3 +1,6 @@
+#ifndef _WRAPPING_DAP_CHAIN_DATUM_TOKEN_
+#define _WRAPPING_DAP_CHAIN_DATUM_TOKEN_
+
 #include "Python.h"
 #include "dap_chain_datum_token.h"
 
@@ -102,3 +105,5 @@ static PyTypeObject DapChainDatumTokenEmission_DapChainDatumTokenEmissionObjectT
 };
 
 /* ------------------------------------------- */
+
+#endif //_WRAPPING_DAP_CHAIN_DATUM_TOKEN_
diff --git a/include/wrapping_dap_chain_ledger.h b/include/wrapping_dap_chain_ledger.h
index f020aea901cb99d486f41f8bf076f36bb96fc354..a8c87a17c178bc23d87167bb093dbfccf8948cbc 100644
--- a/include/wrapping_dap_chain_ledger.h
+++ b/include/wrapping_dap_chain_ledger.h
@@ -1,3 +1,6 @@
+#ifndef _WRAPPING_DAP_CHAIN_LEDGER_
+#define _WRAPPING_DAP_CHAIN_LEDGER_
+
 #include "Python.h"
 #include "dap_chain_ledger.h"
 #include "wrapping_dap_chain_common_objects.h"
@@ -122,3 +125,5 @@ static size_t *ListIntToSizeT(PyObject *list);
 #ifdef __cplusplus
 }
 #endif
+
+#endif //_WRAPPING_DAP_CHAIN_LEDGER_
diff --git a/src/libdap_chain_type_python.c b/src/libdap_chain_type_python.c
index 7ba65602d0f11cee60556e805b723e319cfe758d..2ce46a8ecd38485dbe4c82820c771641d0ff382a 100644
--- a/src/libdap_chain_type_python.c
+++ b/src/libdap_chain_type_python.c
@@ -1,17 +1,27 @@
 #include "libdap_chain_type_python.h"
 
 PyObject* CHAIN_TYPE_FIRST_PY(){
-    return PyLong_FromLong(CHAIN_TYPE_FIRST);
+    PyObject *dap_chain_obj = _PyObject_New(&dapChainTypeObject_dapChainTypeType);
+    ((PyChainTypeObject*)dap_chain_obj)->chain_type = CHAIN_TYPE_FIRST;
+    return Py_BuildValue("O", &dap_chain_obj);
 }
 PyObject* CHAIN_TYPE_TOKEN_PY(){
-    return PyLong_FromLong(CHAIN_TYPE_TOKEN);
+    PyObject *dap_chain_obj = _PyObject_New(&dapChainTypeObject_dapChainTypeType);
+    ((PyChainTypeObject*)dap_chain_obj)->chain_type = CHAIN_TYPE_TOKEN;
+    return Py_BuildValue("O", &dap_chain_obj);
 }
 PyObject* CHAIN_TYPE_EMISSION_PY(){
-    return PyLong_FromLong(CHAIN_TYPE_EMISSION);
+    PyObject *dap_chain_obj = _PyObject_New(&dapChainTypeObject_dapChainTypeType);
+    ((PyChainTypeObject*)dap_chain_obj)->chain_type = CHAIN_TYPE_EMISSION;
+    return Py_BuildValue("O", &dap_chain_obj);
 }
 PyObject* CHAIN_TYPE_TX_PY(){
-    return PyLong_FromLong(CHAIN_TYPE_TX);
+    PyObject *dap_chain_obj = _PyObject_New(&dapChainTypeObject_dapChainTypeType);
+    ((PyChainTypeObject*)dap_chain_obj)->chain_type = CHAIN_TYPE_TX;
+    return Py_BuildValue("O", &dap_chain_obj);
 }
 PyObject* CHAIN_TYPE_LAST_PY(){
-    return PyLong_FromLong(CHAIN_TYPE_LAST);
+    PyObject *dap_chain_obj = _PyObject_New(&dapChainTypeObject_dapChainTypeType);
+    ((PyChainTypeObject*)dap_chain_obj)->chain_type = CHAIN_TYPE_LAST;
+    return Py_BuildValue("O", &dap_chain_obj);
 }