diff --git a/Trenser.Zenvy/Trenser.Zenvy/controllers/ZenvyController.cpp b/Trenser.Zenvy/Trenser.Zenvy/controllers/ZenvyController.cpp
index 1f26894..3d97204 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/controllers/ZenvyController.cpp
+++ b/Trenser.Zenvy/Trenser.Zenvy/controllers/ZenvyController.cpp
@@ -1,7 +1,7 @@
 #include "ZenvyController.h"
 
 //Authentication
-AuthenticationContext ZenvyController::login(const std::string& email, const std::string& password)
+AuthenticationDTO ZenvyController::login(const std::string& email, const std::string& password)
 {
 	return m_authenticationManagementService->login(email, password);
 }
diff --git a/Trenser.Zenvy/Trenser.Zenvy/controllers/ZenvyController.h b/Trenser.Zenvy/Trenser.Zenvy/controllers/ZenvyController.h
index 11a609d..1a5c77b 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/controllers/ZenvyController.h
+++ b/Trenser.Zenvy/Trenser.Zenvy/controllers/ZenvyController.h
@@ -13,8 +13,6 @@
 #include "TicketManagementService.h"
 #include "Enums.h"
 
-using AuthenticationContext = std::tuple<Enums::LoginStatus, Enums::EmployeeType, Enums::EmployeeDesignation>;
-
 class ZenvyController
 {
 private:
@@ -42,7 +40,7 @@ public:
 		m_ticketManagementService(std::make_shared<TicketManagementService>()) {};
 		
 		//Authentication
-		AuthenticationContext login(const std::string& email, const std::string& password);
+		AuthenticationDTO login(const std::string& email, const std::string& password);
 		void logout();
 		void changePassword(const std::string&);
 };
diff --git a/Trenser.Zenvy/Trenser.Zenvy/services/ApplicationConfig.h b/Trenser.Zenvy/Trenser.Zenvy/services/ApplicationConfig.h
index 4d7db21..8e4705e 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/services/ApplicationConfig.h
+++ b/Trenser.Zenvy/Trenser.Zenvy/services/ApplicationConfig.h
@@ -2,5 +2,8 @@
 
 namespace Config
 {
-	constexpr const char* DEFAULT_PASSWORD = "password";
+	namespace Authentication
+	{
+		constexpr const char* DEFAULT_PASSWORD = "password";
+	}
 }
diff --git a/Trenser.Zenvy/Trenser.Zenvy/services/AuthenticationManagementService.cpp b/Trenser.Zenvy/Trenser.Zenvy/services/AuthenticationManagementService.cpp
index 5c0511a..9d7fc4f 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/services/AuthenticationManagementService.cpp
+++ b/Trenser.Zenvy/Trenser.Zenvy/services/AuthenticationManagementService.cpp
@@ -2,7 +2,7 @@
 #include "AuthenticationManagementService.h"
 #include "ApplicationConfig.h"
 
-std::tuple<Enums::LoginStatus, Enums::EmployeeType, Enums::EmployeeDesignation> AuthenticationManagementService::login(const std::string& email, const std::string& password)
+AuthenticationDTO AuthenticationManagementService::login(const std::string& email, const std::string& password)
 {
 	employeeMap& employees = m_dataStore.getEmployees();
 	Enums::LoginStatus loginStatus = Enums::LoginStatus::USER_NOT_FOUND;
@@ -14,7 +14,7 @@ std::tuple<Enums::LoginStatus, Enums::EmployeeType, Enums::EmployeeDesignation>
 		{
 			if (employee.second->getEmployeePassword() == password)
 			{
-				if (password == Config::DEFAULT_PASSWORD)
+				if (password == Config::Authentication::DEFAULT_PASSWORD)
 				{
 					loginStatus = Enums::LoginStatus::FIRST_LOGIN;
 				}
diff --git a/Trenser.Zenvy/Trenser.Zenvy/services/AuthenticationManagementService.h b/Trenser.Zenvy/Trenser.Zenvy/services/AuthenticationManagementService.h
index 2f812d6..f838311 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/services/AuthenticationManagementService.h
+++ b/Trenser.Zenvy/Trenser.Zenvy/services/AuthenticationManagementService.h
@@ -1,18 +1,21 @@
 #pragma once
 #include <string>
 #include <map>
+#include <tuple>
 #include <utility>
 #include <stdexcept>
 #include "DataStore.h"
 #include "Enums.h"
 
+using AuthenticationDTO = std::tuple<Enums::LoginStatus, Enums::EmployeeType, Enums::EmployeeDesignation>;
+
 class AuthenticationManagementService
 {
 private:
 	DataStore& m_dataStore;
 public:
 	AuthenticationManagementService() : m_dataStore(DataStore::getInstance()) {};
-	std::tuple<Enums::LoginStatus, Enums::EmployeeType, Enums::EmployeeDesignation> login(const std::string& username, const std::string& password);
+	AuthenticationDTO login(const std::string& username, const std::string& password);
 	void logout();
 	void changePassword(const std::string&);
 };
diff --git a/Trenser.Zenvy/Trenser.Zenvy/utilities/Validator.cpp b/Trenser.Zenvy/Trenser.Zenvy/utilities/Validator.cpp
index f6c4306..9d14b40 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/utilities/Validator.cpp
+++ b/Trenser.Zenvy/Trenser.Zenvy/utilities/Validator.cpp
@@ -33,7 +33,7 @@ bool util::isEmailValid(const std::string& email) {
 
 bool util::isPasswordValid(const std::string& password)
 {
-	if (password == Config::DEFAULT_PASSWORD)
+	if (password == Config::Authentication::DEFAULT_PASSWORD)
 	{
 		return false;
 	}
diff --git a/Trenser.Zenvy/Trenser.Zenvy/views/UserInterface.cpp b/Trenser.Zenvy/Trenser.Zenvy/views/UserInterface.cpp
index 3429c22..adea852 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/views/UserInterface.cpp
+++ b/Trenser.Zenvy/Trenser.Zenvy/views/UserInterface.cpp
@@ -65,7 +65,7 @@ void UserInterface::login()
     util::read(email);
     std::cout << "Enter password: ";
     util::read(password);
-    AuthenticationContext authenticationContext = m_controller->login(email, password);
+    AuthenticationDTO authenticationContext = m_controller->login(email, password);
     Enums::LoginStatus loginStatus = std::get<0>(authenticationContext);
     Enums::EmployeeType employeeType = std::get<1>(authenticationContext);
     Enums::EmployeeDesignation employeeDesignation = std::get<2>(authenticationContext);