diff --git a/build b/build
index 1758dddc..3e932fe8 100644
--- a/build
+++ b/build
@@ -1 +1 @@
-32
\ No newline at end of file
+34
\ No newline at end of file
diff --git a/src/framework/ALBserver.cpp b/src/framework/ALBserver.cpp
index 4b6af759..773fad88 100644
--- a/src/framework/ALBserver.cpp
+++ b/src/framework/ALBserver.cpp
@@ -10,17 +10,11 @@
 
 namespace OpenWifi {
 
-	ALBRequestHandler::ALBRequestHandler(Poco::Logger & L, uint64_t id)
-		: Logger_(L), id_(id)
-	{
-	}
-
 	void ALBRequestHandler::handleRequest([[maybe_unused]] Poco::Net::HTTPServerRequest& Request, Poco::Net::HTTPServerResponse& Response) {
 		Utils::SetThreadName("alb-request");
 		try {
 			if((id_ % 100) == 0) {
-				poco_debug(Logger_,fmt::format("ALB-REQUEST({}): ALB Request {}.",
-												Request.clientAddress().toString(), id_));
+				Logger_.debug(fmt::format("ALB-REQUEST({}): ALB Request {}.", Request.clientAddress().toString(), id_));
 			}
 			Response.setChunkedTransferEncoding(true);
 			Response.setContentType("text/html");
diff --git a/src/framework/ALBserver.h b/src/framework/ALBserver.h
index 37cea161..cef9341d 100644
--- a/src/framework/ALBserver.h
+++ b/src/framework/ALBserver.h
@@ -14,11 +14,12 @@
 
 namespace OpenWifi {
 
-	class ALBRequestHandler: public Poco::Net::HTTPRequestHandler
-	/// Return a HTML document with the current date and time.
-	{
+	class ALBRequestHandler: public Poco::Net::HTTPRequestHandler {
 	  public:
-		explicit ALBRequestHandler(Poco::Logger & L, uint64_t id);
+		explicit ALBRequestHandler(Poco::Logger & L, uint64_t id)
+                : Logger_(L), id_(id) {
+        }
+
 		void handleRequest([[maybe_unused]] Poco::Net::HTTPServerRequest& Request, Poco::Net::HTTPServerResponse& Response) override;
 
 	  private:
@@ -47,7 +48,6 @@ namespace OpenWifi {
 		}
 
 		int Start() override;
-
 		void Stop() override;
 
 	  private:
diff --git a/src/framework/KafkaTopics.h b/src/framework/KafkaTopics.h
index 0fee3417..c2b7392a 100644
--- a/src/framework/KafkaTopics.h
+++ b/src/framework/KafkaTopics.h
@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include <string>
 namespace OpenWifi::KafkaTopics {
 	static const std::string HEALTHCHECK{"healthcheck"};
 	static const std::string STATE{"state"};
diff --git a/src/framework/MicroService.cpp b/src/framework/MicroService.cpp
index 288b143b..fc70becc 100644
--- a/src/framework/MicroService.cpp
+++ b/src/framework/MicroService.cpp
@@ -22,10 +22,7 @@
 #include "framework/AuthClient.h"
 #include "framework/ALBserver.h"
 #include "framework/KafkaManager.h"
-#include "framework/RESTAPI_RateLimiter.h"
-#include "framework/WebSocketLogger.h"
 #include "framework/RESTAPI_GenericServerAccounting.h"
-#include "framework/RESTAPI_Handler.h"
 #include "framework/RESTAPI_ExtServer.h"
 #include "framework/RESTAPI_IntServer.h"
 
diff --git a/src/framework/MicroServiceFuncs.cpp b/src/framework/MicroServiceFuncs.cpp
index 33b9f552..196ddfc7 100644
--- a/src/framework/MicroServiceFuncs.cpp
+++ b/src/framework/MicroServiceFuncs.cpp
@@ -103,6 +103,10 @@ namespace OpenWifi {
         return MicroService::instance().Random(Start, End);
     }
 
+    std::uint64_t MicroServiceRandom(std::uint64_t Range) {
+        return MicroService::instance().Random(Range);
+    }
+
     std::string MicroServiceSign(Poco::JWT::Token &T, const std::string &Algo) {
         return MicroService::instance().Sign(T, Algo);
     }
diff --git a/src/framework/MicroServiceFuncs.h b/src/framework/MicroServiceFuncs.h
index e0f9551e..afcf5012 100644
--- a/src/framework/MicroServiceFuncs.h
+++ b/src/framework/MicroServiceFuncs.h
@@ -49,6 +49,7 @@ namespace OpenWifi {
 									   const std::string &DefaultValue);
     std::string MicroServiceWWWAssetsDir();
     std::uint64_t MicroServiceRandom(std::uint64_t Start,std::uint64_t End);
+    std::uint64_t MicroServiceRandom(std::uint64_t Range);
     std::string MicroServiceSign(Poco::JWT::Token &T, const std::string &Algo);
     std::string MicroServiceGetPublicAPIEndPoint();
 }