diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f5e80fee..8ac931500 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,9 +64,16 @@ target_include_directories(${PROJECT_NAME}
 		$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 		$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}> 
 		$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/up-core-api> 
-)
+		${protobuf_INCLUDE_DIR}
+		${spdlog_INCLUDE_DIR}
+		${fmt_INCLUDE_DIR})
 set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON)
-target_link_libraries(${PROJECT_NAME} PRIVATE up-core-api-protos protobuf::protobuf spdlog::spdlog)
+
+target_link_libraries(${PROJECT_NAME} 
+	PRIVATE 
+		up-core-api-protos 
+		protobuf::protobuf 
+		spdlog::spdlog)
 
 if(BUILD_TESTING)
 	enable_testing()
diff --git a/conanfile.py b/conanfile.py
index e79671784..d9b345343 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -16,7 +16,7 @@ class UpCpp(ConanFile):
     options = {"shared": [True, False], "fPIC": [True, False]}
     conan_version = None
     generators = "CMakeDeps", "PkgConfigDeps", "VirtualRunEnv", "VirtualBuildEnv"
-    version = "0.1"
+    version = "0.1.1-dev"
     exports_sources = "CMakeLists.txt", "up-core-api/*", "include/*" ,"src/*" , "test/*", "cmake/*"
 
     options = {
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 84312de71..1a6e23c0a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -215,11 +215,25 @@ add_test("t-17-upriority_test" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/upriority_test)
 add_executable(userializationhint_test
 	utransport/userializationhint_test.cpp)
 target_link_libraries(userializationhint_test 
-		PUBLIC
-			up-cpp::up-cpp
-		PRIVATE
-			GTest::gtest_main
-			GTest::gmock    
-			pthread
+	PUBLIC
+		up-cpp::up-cpp
+	PRIVATE
+		GTest::gtest_main
+		GTest::gmock    
+		pthread
 )
 add_test("t-18-userializationhint_test" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/userializationhint_test)
+
+# include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../)
+add_executable(uuid_test
+	uuid/uuid_test.cpp)
+target_link_libraries(uuid_test 
+	PUBLIC
+		up-cpp::up-cpp
+	PRIVATE
+		GTest::gtest_main
+		GTest::gmock    
+		pthread
+)
+
+add_test("t-18-uuid_test" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uuid_test)
diff --git a/test/uuid/uuid_test.cpp b/test/uuid/uuid_test.cpp
index de5db1515..7773a4e41 100644
--- a/test/uuid/uuid_test.cpp
+++ b/test/uuid/uuid_test.cpp
@@ -23,10 +23,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <gtest/gtest.h>
-
-#include "uprotocol/uuid.pb.h"
-#include "UuidSerializer.h"
-#include "Uuidv8Factory.h"
+#include <up-cpp/uuid/factory/Uuidv8Factory.h>
+#include <up-cpp/uuid/serializer/UuidSerializer.h>
+#include "uuid.pb.h"
 
 using namespace uprotocol::uuid;
 using namespace uprotocol::v1;
@@ -35,23 +34,23 @@ using namespace uprotocol::v1;
 TEST(UUIDTest, Class)
 {
     UUID uuId = Uuidv8Factory::create();
-    std::vector<uint8_t> vectUuid = UuidSerializer::instance().serializeToBytes(uuId);
-    UUID uuIdFromByteArr = UuidSerializer::instance().deserializeFromBytes(vectUuid);
-    EXPECT_TRUE(UuidSerializer::instance().getTime(uuId) == UuidSerializer::instance().getTime(uuIdFromByteArr));
-    EXPECT_TRUE(UuidSerializer::instance().getCount(uuId) == UuidSerializer::instance().getCount(uuIdFromByteArr));
+    std::vector<uint8_t> vectUuid = UuidSerializer::serializeToBytes(uuId);
+    UUID uuIdFromByteArr = UuidSerializer::deserializeFromBytes(vectUuid);
+    EXPECT_TRUE(UuidSerializer::getTime(uuId) == UuidSerializer::getTime(uuIdFromByteArr));
+    EXPECT_TRUE(UuidSerializer::getCount(uuId) == UuidSerializer::getCount(uuIdFromByteArr));
 
     std::string str = "0080b636-8303-8701-8ebe-7a9a9e767a9f";
-    UUID uuIdNew = UuidSerializer::instance().deserializeFromString(str);
-    EXPECT_EQ(UuidSerializer::instance().serializeToString(uuIdNew), str);
+    UUID uuIdNew = UuidSerializer::deserializeFromString(str);
+    EXPECT_EQ(UuidSerializer::serializeToString(uuIdNew), str);
 }
 
 //Negative test - serialize and deserialize
 TEST(UUIDTest, NegStringConstructor)
 {
     std::string str = "0080b636-8303-8701-8ebe-7a9a9e767a9f";
-    UUID uuIdNew = UuidSerializer::instance().deserializeFromString(str);
+    UUID uuIdNew = UuidSerializer::deserializeFromString(str);
     str = "test" +str;
-    EXPECT_NE(UuidSerializer::instance().serializeToString(uuIdNew), str);
+    EXPECT_NE(UuidSerializer::serializeToString(uuIdNew), str);
 }
 
 //Negative test - empty string
@@ -59,28 +58,28 @@ TEST(UUIDTest, NegEmptyString)
 {
     //Empty String
     std::string str = "";
-    UUID uuId = UuidSerializer::instance().deserializeFromString(str);
-    EXPECT_NE(UuidSerializer::instance().serializeToString(uuId), str);
-    EXPECT_EQ(UuidSerializer::instance().getCount(uuId), uint64_t(0));
+    UUID uuId = UuidSerializer::deserializeFromString(str);
+    EXPECT_NE(UuidSerializer::serializeToString(uuId), str);
+    EXPECT_EQ(UuidSerializer::getCount(uuId), uint64_t(0));
 }
 
 //Negative test - deserializeFromString - Invalid String with more than 32 hex characters
 TEST(UUIDTest, NegStringWithMoreThan32HexCharsTest)
 {
     std::string str = "0080b636-8303-8701-8ebe-7a9a9e767a9f-1abc";
-    UUID uuId = UuidSerializer::instance().deserializeFromString(str);
-    EXPECT_NE(UuidSerializer::instance().serializeToString(uuId), str);
-    EXPECT_EQ(UuidSerializer::instance().getCount(uuId), uint64_t(0));
+    UUID uuId = UuidSerializer::deserializeFromString(str);
+    EXPECT_NE(UuidSerializer::serializeToString(uuId), str);
+    EXPECT_EQ(UuidSerializer::getCount(uuId), uint64_t(0));
 }
 
 //Negative test deserializeFromBytes - Empty Byte vector
 TEST(UUIDTest, NegEmptyByteVector)
 {
     std::vector<uint8_t> vectEmpty;
-    UUID uuIdFromByteArr = UuidSerializer::instance().deserializeFromBytes(vectEmpty);
+    UUID uuIdFromByteArr = UuidSerializer::deserializeFromBytes(vectEmpty);
     uint64_t val(0);
 
-    EXPECT_EQ(UuidSerializer::instance().getCount(uuIdFromByteArr), val);
+    EXPECT_EQ(UuidSerializer::getCount(uuIdFromByteArr), val);
 }
 
 //Negative test  deserializeFromBytes - Greater than 16
@@ -94,10 +93,10 @@ TEST(UUIDTest, NegGreaterThanDefinedSize)
         vect[i + 8] = lsb;
     }
 
-    UUID uuIdFromByteArr = UuidSerializer::instance().deserializeFromBytes(vect);
+    UUID uuIdFromByteArr = UuidSerializer::deserializeFromBytes(vect);
     uint64_t val(0);
 
-    EXPECT_EQ(UuidSerializer::instance().getCount(uuIdFromByteArr), val);
+    EXPECT_EQ(UuidSerializer::getCount(uuIdFromByteArr), val);
 }
 
 //Negative test deserializeFromBytes - Invalid Byte vector
@@ -110,12 +109,12 @@ TEST(UUIDTest, NegInvalidByteVector)
         vect[i] = msb ;
         vect[i + 8] = lsb;
     }
-    UUID uuIdFromByteArr = UuidSerializer::instance().deserializeFromBytes(vect);
+    UUID uuIdFromByteArr = UuidSerializer::deserializeFromBytes(vect);
     uint64_t val(1);
     std::string str = "";
 
-    EXPECT_NE(UuidSerializer::instance().serializeToString(uuIdFromByteArr), str);
-    EXPECT_NE(UuidSerializer::instance().getCount(uuIdFromByteArr), val);
+    EXPECT_NE(UuidSerializer::serializeToString(uuIdFromByteArr), str);
+    EXPECT_NE(UuidSerializer::getCount(uuIdFromByteArr), val);
 }
 
 int main(int argc, char **argv)