diff --git a/src/OpenRoamin_GlobalReach.cpp b/src/OpenRoamin_GlobalReach.cpp
index 4d78cce..2797b4c 100644
--- a/src/OpenRoamin_GlobalReach.cpp
+++ b/src/OpenRoamin_GlobalReach.cpp
@@ -10,7 +10,7 @@
 #include <Poco/TemporaryFile.h>
 #include <Poco/JSON/Object.h>
 #include <Poco/JSON/Parser.h>
-
+#include <framework/RESTAPI_Handler.h>
 #include <framework/MicroServiceFuncs.h>
 #include <StorageService.h>
 
@@ -74,6 +74,7 @@ namespace OpenWifi {
             if (Response.getStatus() == Poco::Net::HTTPResponse::HTTP_OK) {
                 Poco::JSON::Parser P;
                 auto Result = P.parse(is).extract<Poco::JSON::Object::Ptr>();
+                RESTAPI::
                 NewCertificate.csr = Result->get("csr").toString();
                 NewCertificate.certificate = Result->get("certificate").toString();
                 NewCertificate.name = Result->get("name").toString();
@@ -121,12 +122,10 @@ namespace OpenWifi {
             if (Response.getStatus() == Poco::Net::HTTPResponse::HTTP_OK) {
                 Poco::JSON::Parser P;
                 auto Result = P.parse(is).extract<Poco::JSON::Object::Ptr>();
-                NewCertificate.csr = Result->get("csr").toString();
-                NewCertificate.certificate = Result->get("certificate").toString();
-                NewCertificate.name = Result->get("name").toString();
-                NewCertificate.certificateChain = Result->get("certificate_chain").toString();
-                NewCertificate.certificateId = Result->get("certificate_id").toString();
-                NewCertificate.expiresAt = Result->get("expires_at");
+                RESTAPIHandler::AssignIfPresent(Result,"certificate",NewCertificate.certificate);
+                RESTAPIHandler::AssignIfPresent(Result,"certificate_chain",NewCertificate.certificateChain);
+                RESTAPIHandler::AssignIfPresent(Result,"certificate_id",NewCertificate.certificateId);
+                RESTAPIHandler::AssignIfPresent(Result,"expires_at",NewCertificate.expiresAt);
                 std::cout << Response.getStatus() << " : ";
                 Result->stringify(std::cout);
                 std::cout << std::endl;