diff --git a/attachments/nano_attachment/nano_attachment_bucket.h b/attachments/nano_attachment/nano_attachment_bucket.h
index ac8685d..5a49d6b 100644
--- a/attachments/nano_attachment/nano_attachment_bucket.h
+++ b/attachments/nano_attachment/nano_attachment_bucket.h
@@ -5,6 +5,8 @@
 #include "nano_attachment_common.h"
 #include "nano_initializer.h"
 
+#define CP_ASYNC_CTX_BUCKETS 2048 ///< Hash table buckets for better distribution
+
 AttachmentVerdictResponse NanoAsyncFindResponse(NanoAttachment *attachment, SessionID session_id);
 
 NanoCommunicationResult NanoAsyncAddResponse(NanoAttachment *attachment, SessionID session_id, AttachmentVerdictResponse *response);
diff --git a/attachments/nano_attachment/nano_initializer.h b/attachments/nano_attachment/nano_initializer.h
index 6ae4d31..e5b5b44 100644
--- a/attachments/nano_attachment/nano_initializer.h
+++ b/attachments/nano_attachment/nano_initializer.h
@@ -22,6 +22,7 @@
 
 #include "nano_attachment_common.h"
 #include "shmem_ipc_2.h"
+#include "nano_attachment_bucket.h"
 
 #define LOGGING_DIRECTORY_PATH "/var/log/nano_attachment" ///< Default logging directory path.
 #define LOGGING_FILE_NAME "nano_attachment" ///< Default logging file name.