From: Mu-Woong Lee <muwoong.lee@samsung.com>
Date: Thu, 21 Apr 2016 07:08:43 +0000 (+0900)
Subject: Code cleanup: merge common, system, social types into one provider types header
X-Git-Tag: submit/tizen/20160503.015801^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=433563eb3983c0393a3542048da0007276cbdba4;p=platform%2Fcore%2Fcontext%2Fcontext-provider.git

Code cleanup: merge common, system, social types into one provider types header

Change-Id: I96e74636b9d2e4ce62a959f170e1e168d6ac1b2f
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>
---

diff --git a/src/app-stats/ActiveWindowMonitor.cpp b/src/app-stats/ActiveWindowMonitor.cpp
index c8d3120..107d598 100644
--- a/src/app-stats/ActiveWindowMonitor.cpp
+++ b/src/app-stats/ActiveWindowMonitor.cpp
@@ -85,18 +85,18 @@ void ctx::AppUseMonitor::__createRecord(std::string appId)
 	int mediaVolume;
 	std::string bssid;
 	Json data;
-	data.set(NULL, STATS_APP_ID, appId);
+	data.set(NULL, KEY_APP_ID, appId);
 
 	if (ctx::system_info::getAudioJackState(&audioJack))
-		data.set(NULL, STATS_AUDIO_JACK, audioJack);
+		data.set(NULL, KEY_AUDIO_JACK, audioJack);
 
 	if (ctx::system_info::getVolume(&systemVolume, &mediaVolume)) {
-		data.set(NULL, STATS_SYSTEM_VOLUME, systemVolume);
-		data.set(NULL, STATS_MEDIA_VOLUME, mediaVolume);
+		data.set(NULL, KEY_SYSTEM_VOLUME, systemVolume);
+		data.set(NULL, KEY_MEDIA_VOLUME, mediaVolume);
 	}
 
 	if (ctx::system_info::getWifiBssid(bssid))
-		data.set(NULL, STATS_BSSID, bssid);
+		data.set(NULL, KEY_BSSID, bssid);
 
 	__dbManager.insert(0, APP_TABLE_USAGE_LOG, data, NULL);
 }
@@ -107,11 +107,11 @@ void ctx::AppUseMonitor::__finishRecord(std::string appId)
 	std::stringstream query;
 	query <<
 		"UPDATE " APP_TABLE_USAGE_LOG \
-		" SET " STATS_DURATION " = strftime('%s', 'now') - " STATS_UNIV_TIME \
-		" WHERE " STATS_COL_ROW_ID " = (" \
-			"SELECT MAX(" STATS_COL_ROW_ID ") FROM " APP_TABLE_USAGE_LOG \
-			" WHERE " STATS_APP_ID " = '" << appId << "'" \
-			" AND " STATS_DURATION " = 0)";
+		" SET " KEY_DURATION " = strftime('%s', 'now') - " KEY_UNIV_TIME \
+		" WHERE " KEY_COL_ROW_ID " = (" \
+			"SELECT MAX(" KEY_COL_ROW_ID ") FROM " APP_TABLE_USAGE_LOG \
+			" WHERE " KEY_APP_ID " = '" << appId << "'" \
+			" AND " KEY_DURATION " = 0)";
 	__dbManager.execute(0, query.str().c_str(), NULL);
 }
 
@@ -143,6 +143,6 @@ void ctx::AppUseMonitor::__removeExpired()
 
 	std::stringstream query;
 	query << "DELETE FROM " APP_TABLE_USAGE_LOG " WHERE " \
-		STATS_UNIV_TIME " < strftime('%s', 'now') - " << LOG_RETENTION_PERIOD;
+		KEY_UNIV_TIME " < strftime('%s', 'now') - " << LOG_RETENTION_PERIOD;
 	__dbManager.execute(0, query.str().c_str(), NULL);
 }
diff --git a/src/app-stats/AppStatisticsTypes.h b/src/app-stats/AppStatisticsTypes.h
index 42b049e..f2ed478 100644
--- a/src/app-stats/AppStatisticsTypes.h
+++ b/src/app-stats/AppStatisticsTypes.h
@@ -17,7 +17,7 @@
 #ifndef _CONTEXT_STATS_APP_TYPES_H_
 #define _CONTEXT_STATS_APP_TYPES_H_
 
-#include "../shared/CommonTypes.h"
+#include "../shared/ProviderTypes.h"
 
 #define APP_HISTORY_PRIV			"apphistory.read"
 #define APP_SUBJ_LOGGER				"stats/app/logger"
diff --git a/src/app-stats/DbHandle.cpp b/src/app-stats/DbHandle.cpp
index 06021e3..414bac1 100644
--- a/src/app-stats/DbHandle.cpp
+++ b/src/app-stats/DbHandle.cpp
@@ -71,11 +71,11 @@ std::string AppDbHandle::createWhereClauseWithDeviceStatus(Json filter)
 
 	whereClause << StatsDbHandleBase::createWhereClause(filter);
 
-	if (filter.get(NULL, STATS_BSSID, &bssid))
-		whereClause << " AND " STATS_BSSID " = '" << bssid << "'";
+	if (filter.get(NULL, KEY_BSSID, &bssid))
+		whereClause << " AND " KEY_BSSID " = '" << bssid << "'";
 
-	if (filter.get(NULL, STATS_AUDIO_JACK, &audioJack))
-		whereClause << " AND " STATS_AUDIO_JACK " = " << audioJack;
+	if (filter.get(NULL, KEY_AUDIO_JACK, &audioJack))
+		whereClause << " AND " KEY_AUDIO_JACK " = " << audioJack;
 
 	return whereClause.str();
 }
@@ -97,16 +97,16 @@ std::string AppDbHandle::createSqlFrequency(Json filter)
 	std::string timeOfDay;
 	std::string appId;
 
-	if (!filter.get(NULL, STATS_APP_ID, &appId)) {
+	if (!filter.get(NULL, KEY_APP_ID, &appId)) {
 		_E("Invalid parameter");
 		return "";
 	}
 
-	if (filter.get(NULL, STATS_DAY_OF_WEEK, &weekStr))
-		filterCleaned.set(NULL, STATS_DAY_OF_WEEK, weekStr);
+	if (filter.get(NULL, KEY_DAY_OF_WEEK, &weekStr))
+		filterCleaned.set(NULL, KEY_DAY_OF_WEEK, weekStr);
 
-	if (filter.get(NULL, STATS_TIME_OF_DAY, &timeOfDay))
-		filterCleaned.set(NULL, STATS_TIME_OF_DAY, timeOfDay);
+	if (filter.get(NULL, KEY_TIME_OF_DAY, &timeOfDay))
+		filterCleaned.set(NULL, KEY_TIME_OF_DAY, timeOfDay);
 
 	std::string whereClause = createWhereClause(filterCleaned);
 
@@ -117,21 +117,21 @@ std::string AppDbHandle::createSqlFrequency(Json filter)
 
 	query <<
 		"INSERT INTO " APP_TEMP_USAGE_FREQ \
-		" SELECT " STATS_APP_ID ", COUNT(*) AS " STATS_TOTAL_COUNT \
+		" SELECT " KEY_APP_ID ", COUNT(*) AS " KEY_TOTAL_COUNT \
 		" FROM " APP_TABLE_USAGE_LOG \
 		" WHERE " << whereClause <<
-		" GROUP BY " STATS_APP_ID ";";
+		" GROUP BY " KEY_APP_ID ";";
 
 	query <<
-		"INSERT OR IGNORE INTO " APP_TEMP_USAGE_FREQ " (" STATS_APP_ID ")" \
+		"INSERT OR IGNORE INTO " APP_TEMP_USAGE_FREQ " (" KEY_APP_ID ")" \
 		" VALUES ('" << appId << "');";
 
 	query <<
-		"SELECT S." STATS_APP_ID ", S." STATS_TOTAL_COUNT ", 1+COUNT(lesser." STATS_TOTAL_COUNT ") AS " STATS_RANK \
+		"SELECT S." KEY_APP_ID ", S." KEY_TOTAL_COUNT ", 1+COUNT(lesser." KEY_TOTAL_COUNT ") AS " KEY_RANK \
 		" FROM " APP_TEMP_USAGE_FREQ " AS S" \
 		" LEFT JOIN " APP_TEMP_USAGE_FREQ " AS lesser" \
-		" ON S." STATS_TOTAL_COUNT " < lesser." STATS_TOTAL_COUNT \
-		" WHERE S." STATS_APP_ID " = '" << appId << "'";
+		" ON S." KEY_TOTAL_COUNT " < lesser." KEY_TOTAL_COUNT \
+		" WHERE S." KEY_APP_ID " = '" << appId << "'";
 
 	return query.str();
 }
@@ -141,17 +141,17 @@ std::string AppDbHandle::createSqlRecentlyUsed(Json filter)
 	std::stringstream query;
 	int limit = DEFAULT_LIMIT;
 
-	filter.get(NULL, STATS_RESULT_SIZE, &limit);
+	filter.get(NULL, KEY_RESULT_SIZE, &limit);
 
 	query <<
-		"SELECT " STATS_APP_ID ", " \
-			"COUNT(*) AS " STATS_TOTAL_COUNT ", " \
-			"SUM(" STATS_DURATION ") AS " STATS_TOTAL_DURATION ", " \
-			"MAX(" STATS_UNIV_TIME ") AS " STATS_LAST_TIME \
+		"SELECT " KEY_APP_ID ", " \
+			"COUNT(*) AS " KEY_TOTAL_COUNT ", " \
+			"SUM(" KEY_DURATION ") AS " KEY_TOTAL_DURATION ", " \
+			"MAX(" KEY_UNIV_TIME ") AS " KEY_LAST_TIME \
 		" FROM " APP_TABLE_USAGE_LOG \
 		" WHERE " << createWhereClauseWithDeviceStatus(filter) <<
-		" GROUP BY " STATS_APP_ID \
-		" ORDER BY MAX(" STATS_UNIV_TIME ") DESC" \
+		" GROUP BY " KEY_APP_ID \
+		" ORDER BY MAX(" KEY_UNIV_TIME ") DESC" \
 		" LIMIT " << limit;
 
 	return query.str();
@@ -162,16 +162,16 @@ std::string AppDbHandle::createSqlFrequentlyUsed(Json filter)
 	std::stringstream query;
 	int limit = DEFAULT_LIMIT;
 
-	filter.get(NULL, STATS_RESULT_SIZE, &limit);
+	filter.get(NULL, KEY_RESULT_SIZE, &limit);
 
 	query <<
-		"SELECT " STATS_APP_ID ", " \
-			"COUNT(*) AS " STATS_TOTAL_COUNT ", " \
-			"SUM(" STATS_DURATION ") AS " STATS_TOTAL_DURATION ", " \
-			"MAX(" STATS_UNIV_TIME ") AS " STATS_LAST_TIME \
+		"SELECT " KEY_APP_ID ", " \
+			"COUNT(*) AS " KEY_TOTAL_COUNT ", " \
+			"SUM(" KEY_DURATION ") AS " KEY_TOTAL_DURATION ", " \
+			"MAX(" KEY_UNIV_TIME ") AS " KEY_LAST_TIME \
 		" FROM " APP_TABLE_USAGE_LOG \
 		" WHERE " << createWhereClauseWithDeviceStatus(filter) <<
-		" GROUP BY " STATS_APP_ID \
+		" GROUP BY " KEY_APP_ID \
 		" ORDER BY COUNT(*) DESC" \
 		" LIMIT " << limit;
 
@@ -183,19 +183,19 @@ std::string AppDbHandle::createSqlRarelyUsed(Json filter)
 	std::stringstream query;
 	int limit = DEFAULT_LIMIT;
 
-	filter.get(NULL, STATS_RESULT_SIZE, &limit);
+	filter.get(NULL, KEY_RESULT_SIZE, &limit);
 
 	query <<
-		"SELECT i." STATS_APP_ID ", " \
-			"COUNT(u." STATS_DURATION ") AS " STATS_TOTAL_COUNT ", " \
-			"IFNULL(SUM(u." STATS_DURATION "),0) AS " STATS_TOTAL_DURATION ", " \
-			"IFNULL(MAX(u." STATS_UNIV_TIME "),-1) AS " STATS_LAST_TIME \
+		"SELECT i." KEY_APP_ID ", " \
+			"COUNT(u." KEY_DURATION ") AS " KEY_TOTAL_COUNT ", " \
+			"IFNULL(SUM(u." KEY_DURATION "),0) AS " KEY_TOTAL_DURATION ", " \
+			"IFNULL(MAX(u." KEY_UNIV_TIME "),-1) AS " KEY_LAST_TIME \
 		" FROM " APP_TABLE_REMOVABLE_APP " i LEFT OUTER JOIN (" \
 			" SELECT * FROM " APP_TABLE_USAGE_LOG \
 			" WHERE " << createWhereClauseWithDeviceStatus(filter) << ") u" \
-			" ON i." STATS_APP_ID " = u." STATS_APP_ID \
-		" GROUP BY i." STATS_APP_ID \
-		" ORDER BY " STATS_TOTAL_COUNT " ASC" \
+			" ON i." KEY_APP_ID " = u." KEY_APP_ID \
+		" GROUP BY i." KEY_APP_ID \
+		" ORDER BY " KEY_TOTAL_COUNT " ASC" \
 		" LIMIT " << limit;
 
 	return query.str();
@@ -209,12 +209,12 @@ void AppDbHandle::replyTriggerItem(int error, Json &jsonResult)
 	std::string valStr;
 	int val;
 
-	jsonResult.get(NULL, STATS_APP_ID, &valStr);
-	results.set(NULL, STATS_APP_ID, valStr);
-	jsonResult.get(NULL, STATS_TOTAL_COUNT, &val);
-	results.set(NULL, STATS_TOTAL_COUNT, val);
-	jsonResult.get(NULL, STATS_RANK, &val);
-	results.set(NULL, STATS_RANK, val);
+	jsonResult.get(NULL, KEY_APP_ID, &valStr);
+	results.set(NULL, KEY_APP_ID, valStr);
+	jsonResult.get(NULL, KEY_TOTAL_COUNT, &val);
+	results.set(NULL, KEY_TOTAL_COUNT, val);
+	jsonResult.get(NULL, KEY_RANK, &val);
+	results.set(NULL, KEY_RANK, val);
 
 	reqProvider->replyToRead(reqFilter, error, results);
 }
diff --git a/src/app-stats/DbInit.cpp b/src/app-stats/DbInit.cpp
index 9c4ec24..652950b 100644
--- a/src/app-stats/DbInit.cpp
+++ b/src/app-stats/DbInit.cpp
@@ -80,7 +80,7 @@ bool ctx::AppDbInitializer::__appInfoCb(package_info_app_component_type_e compTy
 	Json data;
 	DatabaseManager dbManager;
 
-	data.set(NULL, STATS_APP_ID, appId);
+	data.set(NULL, KEY_APP_ID, appId);
 	return dbManager.insert(0, APP_TABLE_REMOVABLE_APP, data, NULL);
 }
 
diff --git a/src/app-stats/InstallMonitor.cpp b/src/app-stats/InstallMonitor.cpp
index af5169f..a89ce95 100644
--- a/src/app-stats/InstallMonitor.cpp
+++ b/src/app-stats/InstallMonitor.cpp
@@ -84,7 +84,7 @@ bool ctx::AppInstallMonitor::__appInfoCb(package_info_app_component_type_e compT
 
 	if (__lastEventType == PACKAGE_MANAGER_EVENT_TYPE_INSTALL) {
 		Json data;
-		data.set(NULL, STATS_APP_ID, appId);
+		data.set(NULL, KEY_APP_ID, appId);
 		dbManager.insert(0, APP_TABLE_REMOVABLE_APP, data, NULL);
 	} else if (__lastEventType == PACKAGE_MANAGER_EVENT_TYPE_UNINSTALL) {
 		dbManager.execute(0, __createDeletionQuery(APP_TABLE_REMOVABLE_APP, appId).c_str(), NULL);
@@ -98,6 +98,6 @@ std::string ctx::AppInstallMonitor::__createDeletionQuery(const char* tableName,
 {
 	std::stringstream query;
 	query << "DELETE FROM " << tableName;
-	query << " WHERE " STATS_APP_ID " = '" << appId << "'";
+	query << " WHERE " KEY_APP_ID " = '" << appId << "'";
 	return query.str();
 }
diff --git a/src/call/Call.cpp b/src/call/Call.cpp
index 616914a..9700fcf 100644
--- a/src/call/Call.cpp
+++ b/src/call/Call.cpp
@@ -39,7 +39,7 @@ static telephony_noti_e __callNotiIds[] =
 static Json __latest;
 
 SocialStatusCall::SocialStatusCall() :
-	BasicProvider(SOCIAL_ST_SUBJ_CALL)
+	BasicProvider(SUBJ_STATE_CALL)
 {
 	__handleList.count = 0;
 	__handleList.handle = NULL;
@@ -82,19 +82,19 @@ void SocialStatusCall::__handleUpdate(telephony_h handle, telephony_noti_e notiI
 	switch (notiId) {
 	case TELEPHONY_NOTI_VOICE_CALL_STATUS_IDLE:
 	case TELEPHONY_NOTI_VIDEO_CALL_STATUS_IDLE:
-		data.set(NULL, SOCIAL_ST_STATE, SOCIAL_ST_IDLE);
+		data.set(NULL, KEY_STATE, VAL_IDLE);
 		break;
 	case TELEPHONY_NOTI_VOICE_CALL_STATUS_ACTIVE:
 	case TELEPHONY_NOTI_VIDEO_CALL_STATUS_ACTIVE:
-		data.set(NULL, SOCIAL_ST_STATE, SOCIAL_ST_ACTIVE);
+		data.set(NULL, KEY_STATE, VAL_ACTIVE);
 		break;
 	case TELEPHONY_NOTI_VOICE_CALL_STATUS_ALERTING:
 	case TELEPHONY_NOTI_VIDEO_CALL_STATUS_ALERTING:
-		data.set(NULL, SOCIAL_ST_STATE, SOCIAL_ST_ALERTING);
+		data.set(NULL, KEY_STATE, VAL_ALERTING);
 		break;
 	case TELEPHONY_NOTI_VOICE_CALL_STATUS_INCOMING:
 	case TELEPHONY_NOTI_VIDEO_CALL_STATUS_INCOMING:
-		data.set(NULL, SOCIAL_ST_STATE, SOCIAL_ST_INCOMING);
+		data.set(NULL, KEY_STATE, VAL_INCOMING);
 		break;
 /*	// Ignore below cases
 	case TELEPHONY_NOTI_VOICE_CALL_STATUS_HELD:
@@ -111,13 +111,13 @@ void SocialStatusCall::__handleUpdate(telephony_h handle, telephony_noti_e notiI
 	case TELEPHONY_NOTI_VOICE_CALL_STATUS_ACTIVE:
 	case TELEPHONY_NOTI_VOICE_CALL_STATUS_ALERTING:
 	case TELEPHONY_NOTI_VOICE_CALL_STATUS_INCOMING:
-		data.set(NULL, SOCIAL_ST_TYPE, SOCIAL_ST_VOICE);
+		data.set(NULL, KEY_TYPE, VAL_VOICE);
 		break;
 	case TELEPHONY_NOTI_VIDEO_CALL_STATUS_IDLE:
 	case TELEPHONY_NOTI_VIDEO_CALL_STATUS_ACTIVE:
 	case TELEPHONY_NOTI_VIDEO_CALL_STATUS_ALERTING:
 	case TELEPHONY_NOTI_VIDEO_CALL_STATUS_INCOMING:
-		data.set(NULL, SOCIAL_ST_TYPE, SOCIAL_ST_VIDEO);
+		data.set(NULL, KEY_TYPE, VAL_VIDEO);
 		break;
 /*	// Ignore below cases
 	case TELEPHONY_NOTI_VOICE_CALL_STATUS_HELD:
@@ -146,7 +146,7 @@ void SocialStatusCall::__handleUpdate(telephony_h handle, telephony_noti_e notiI
 		// Address
 		std::string address;
 		if (__getCallAddress(callList[i], address)) {
-			data.set(NULL, SOCIAL_ST_ADDRESS, address);
+			data.set(NULL, KEY_ADDRESS, address);
 			break;
 		}
 	}
@@ -221,22 +221,22 @@ bool SocialStatusCall::__getCallState(telephony_call_h& handle, std::string& sta
 
 	switch (st) {
 	case TELEPHONY_CALL_STATUS_ACTIVE:
-		state = SOCIAL_ST_ACTIVE;
+		state = VAL_ACTIVE;
 		break;
 	case TELEPHONY_CALL_STATUS_HELD:
-		state = SOCIAL_ST_HELD;
+		state = VAL_HELD;
 		break;
 	case TELEPHONY_CALL_STATUS_DIALING:
-		state = SOCIAL_ST_DIALING;
+		state = VAL_DIALING;
 		break;
 	case TELEPHONY_CALL_STATUS_ALERTING:
-		state = SOCIAL_ST_ALERTING;
+		state = VAL_ALERTING;
 		break;
 	case TELEPHONY_CALL_STATUS_INCOMING:
-		state = SOCIAL_ST_INCOMING;
+		state = VAL_INCOMING;
 		break;
 	default:
-		state = SOCIAL_ST_IDLE;
+		state = VAL_IDLE;
 	}
 
 	IF_FAIL_RETURN_TAG(!state.empty(), false, _W, "State is empty");
@@ -254,10 +254,10 @@ bool SocialStatusCall::__getCallType(telephony_call_h& handle, std::string& type
 
 	switch (t) {
 	case TELEPHONY_CALL_TYPE_VOICE:
-		type = SOCIAL_ST_VOICE;
+		type = VAL_VOICE;
 		break;
 	case TELEPHONY_CALL_TYPE_VIDEO:
-		type = SOCIAL_ST_VIDEO;
+		type = VAL_VIDEO;
 		break;
 	default:
 		_E("Unknown type: %d", t);
@@ -316,7 +316,7 @@ bool SocialStatusCall::__readCurrentStatus(telephony_h& handle, Json* data)
 	telephony_call_get_call_list(handle, &count, &callList);
 
 	// Default data
-	data->set(NULL, SOCIAL_ST_STATE, SOCIAL_ST_IDLE);
+	data->set(NULL, KEY_STATE, VAL_IDLE);
 
 	// Held & Dialing are ignored
 	for (unsigned int i = 0; i < count; i++) {
@@ -324,25 +324,25 @@ bool SocialStatusCall::__readCurrentStatus(telephony_h& handle, Json* data)
 		std::string state;
 		if (__getCallState(callList[i], state)) {
 			// Skip Held & Dialing
-			if (state.compare(SOCIAL_ST_HELD) == 0 || state.compare(SOCIAL_ST_DIALING) == 0)
+			if (state.compare(VAL_HELD) == 0 || state.compare(VAL_DIALING) == 0)
 				continue;
 
-			data->set(NULL, SOCIAL_ST_STATE, state);
+			data->set(NULL, KEY_STATE, state);
 		}
 
 		// Call type
 		std::string type;
 		if (__getCallType(callList[i], type)) {
-			data->set(NULL, SOCIAL_ST_MEDIUM, type);
+			data->set(NULL, KEY_MEDIUM, type);
 		}
 
 		// Address
 		std::string address;
 		if (__getCallAddress(callList[i], address)) {
-			data->set(NULL, SOCIAL_ST_ADDRESS, address);
+			data->set(NULL, KEY_ADDRESS, address);
 		}
 
-		if (state == SOCIAL_ST_ACTIVE) {
+		if (state == VAL_ACTIVE) {
 			break;
 		}
 	}
@@ -361,7 +361,7 @@ int SocialStatusCall::read()
 
 	bool ret = true;
 	Json data;
-	data.set(NULL, SOCIAL_ST_STATE, SOCIAL_ST_IDLE);
+	data.set(NULL, KEY_STATE, VAL_IDLE);
 
 	for (unsigned int i = 0; i < __handleList.count; i++) {
 		telephony_sim_state_e state;
diff --git a/src/call/Call.h b/src/call/Call.h
index 23d589d..f76faac 100644
--- a/src/call/Call.h
+++ b/src/call/Call.h
@@ -18,7 +18,7 @@
 #define _CONTEXT_SOCIAL_STATUS_CALL_H_
 
 #include <telephony.h>
-#include "../shared/SocialTypes.h"
+#include "../shared/ProviderTypes.h"
 #include "../shared/BasicProvider.h"
 
 namespace ctx {
diff --git a/src/contacts/Contacts.cpp b/src/contacts/Contacts.cpp
index 6b195f7..2dc4657 100644
--- a/src/contacts/Contacts.cpp
+++ b/src/contacts/Contacts.cpp
@@ -23,7 +23,7 @@
 using namespace ctx;
 
 SocialStatusContacts::SocialStatusContacts() :
-	BasicProvider(SOCIAL_ST_SUBJ_CONTACTS),
+	BasicProvider(SUBJ_STATE_CONTACTS),
 	__latestMyProfile(0),
 	__latestPerson(0)
 {
@@ -61,12 +61,12 @@ void SocialStatusContacts::__handleUpdate(const char* viewUri)
 		return;
 	}
 
-	std::string view = (STR_EQ(viewUri, _contacts_my_profile._uri)? SOCIAL_ST_MY_PROFILE : SOCIAL_ST_PERSON);
+	std::string view = (STR_EQ(viewUri, _contacts_my_profile._uri)? VAL_MY_PROFILE : VAL_PERSON);
 	IF_FAIL_VOID_TAG(!__isConsecutiveChange(viewUri), _D, "Ignore consecutive db change: %s", view.c_str());
 
 	Json data;
-	data.set(NULL, SOCIAL_ST_EVENT, SOCIAL_ST_CHANGED);
-	data.set(NULL, SOCIAL_ST_TYPE, view);
+	data.set(NULL, KEY_EVENT, VAL_CHANGED);
+	data.set(NULL, KEY_TYPE, view);
 	publish(NULL, ERR_NONE, data);
 }
 
diff --git a/src/contacts/Contacts.h b/src/contacts/Contacts.h
index 4211a6c..dcabc2b 100644
--- a/src/contacts/Contacts.h
+++ b/src/contacts/Contacts.h
@@ -18,7 +18,7 @@
 #define _CONTEXT_SOCIAL_STATUS_CONTACTS_H_
 
 #include <contacts.h>
-#include "../shared/SocialTypes.h"
+#include "../shared/ProviderTypes.h"
 #include "../shared/BasicProvider.h"
 
 namespace ctx {
diff --git a/src/email/Email.cpp b/src/email/Email.cpp
index b6b9721..3dba025 100644
--- a/src/email/Email.cpp
+++ b/src/email/Email.cpp
@@ -21,7 +21,7 @@
 using namespace ctx;
 
 SocialStatusEmail::SocialStatusEmail()	:
-	BasicProvider(SOCIAL_ST_SUBJ_EMAIL),
+	BasicProvider(SUBJ_STATE_EMAIL),
 	__dbusSignalId(-1),
 	__dbusWatcher(DBusType::SESSION)
 {
@@ -59,13 +59,13 @@ void SocialStatusEmail::onSignal(const char* sender, const char* path, const cha
 		//TODO: Check if this signal actually means that there are new mails
 		_D("sub type: %d, gi1: %d, gc: %s, gi2: %d, gi3: %d", subType, gi1, gc, gi2, gi3);
 		Json dataUpdated;
-		dataUpdated.set(NULL, SOCIAL_ST_EVENT, SOCIAL_ST_RECEIVED);
+		dataUpdated.set(NULL, KEY_EVENT, VAL_RECEIVED);
 		publish(NULL, ERR_NONE, dataUpdated);
 
 	} else if (subType == NOTI_SEND_FINISH) {
 		_D("sub type: %d, gi1: %d, gc: %s, gi2: %d, gi3: %d", subType, gi1, gc, gi2, gi3);
 		Json dataUpdated;
-		dataUpdated.set(NULL, SOCIAL_ST_EVENT, SOCIAL_ST_SENT);
+		dataUpdated.set(NULL, KEY_EVENT, VAL_SENT);
 		publish(NULL, ERR_NONE, dataUpdated);
 	}
 }
diff --git a/src/email/Email.h b/src/email/Email.h
index bfd7702..4c52e99 100644
--- a/src/email/Email.h
+++ b/src/email/Email.h
@@ -18,7 +18,7 @@
 #define _CONTEXT_SOCIAL_STATUS_EMAIL_H_
 
 #include <DBusSignalWatcher.h>
-#include "../shared/SocialTypes.h"
+#include "../shared/ProviderTypes.h"
 #include "../shared/BasicProvider.h"
 
 namespace ctx {
diff --git a/src/headphone/Headphone.cpp b/src/headphone/Headphone.cpp
index a8da0ae..c9a9169 100644
--- a/src/headphone/Headphone.cpp
+++ b/src/headphone/Headphone.cpp
@@ -22,7 +22,7 @@
 using namespace ctx;
 
 DeviceStatusHeadphone::DeviceStatusHeadphone() :
-	BasicProvider(DEVICE_ST_SUBJ_HEADPHONE),
+	BasicProvider(SUBJ_STATE_HEADPHONE),
 	__connected(false),
 	__audioJackState(RUNTIME_INFO_AUDIO_JACK_STATUS_UNCONNECTED),
 	__btAudioState(false),
@@ -141,18 +141,18 @@ bool DeviceStatusHeadphone::__getCurrentStatus()
 
 void DeviceStatusHeadphone::__generateDataPacket(Json* data)
 {
-	data->set(NULL, DEVICE_ST_IS_CONNECTED, __connected ? DEVICE_ST_TRUE : DEVICE_ST_FALSE);
+	data->set(NULL, KEY_IS_CONNECTED, __connected ? VAL_TRUE : VAL_FALSE);
 
 	switch (__audioJackState) {
 	case RUNTIME_INFO_AUDIO_JACK_STATUS_CONNECTED_3WIRE:
-		data->set(NULL, DEVICE_ST_TYPE, DEVICE_ST_NORMAL);
+		data->set(NULL, KEY_TYPE, VAL_NORMAL);
 		break;
 	case RUNTIME_INFO_AUDIO_JACK_STATUS_CONNECTED_4WIRE:
-		data->set(NULL, DEVICE_ST_TYPE, DEVICE_ST_HEADSET);
+		data->set(NULL, KEY_TYPE, VAL_HEADSET);
 		break;
 	default:
 		if (__btAudioState)
-			data->set(NULL, DEVICE_ST_TYPE, DEVICE_ST_BLUETOOTH);
+			data->set(NULL, KEY_TYPE, VAL_BLUETOOTH);
 		break;
 	}
 }
diff --git a/src/headphone/Headphone.h b/src/headphone/Headphone.h
index 5d88b36..a6c8805 100644
--- a/src/headphone/Headphone.h
+++ b/src/headphone/Headphone.h
@@ -20,7 +20,7 @@
 #include <glib.h>
 #include <runtime_info.h>
 #include <bluetooth.h>
-#include "../shared/SystemTypes.h"
+#include "../shared/ProviderTypes.h"
 #include "../shared/BasicProvider.h"
 
 namespace ctx {
diff --git a/src/media-stats/DbHandle.cpp b/src/media-stats/DbHandle.cpp
index e8f0f03..fdfadfc 100644
--- a/src/media-stats/DbHandle.cpp
+++ b/src/media-stats/DbHandle.cpp
@@ -94,17 +94,17 @@ std::string MediaDbHandle::createSqlFrequency(int mediaType, Json filter)
 	std::string weekStr;
 	std::string timeOfDay;
 
-	if (filter.get(NULL, STATS_DAY_OF_WEEK, &weekStr))
-		filterCleaned.set(NULL, STATS_DAY_OF_WEEK, weekStr);
+	if (filter.get(NULL, KEY_DAY_OF_WEEK, &weekStr))
+		filterCleaned.set(NULL, KEY_DAY_OF_WEEK, weekStr);
 
-	if (filter.get(NULL, STATS_TIME_OF_DAY, &timeOfDay))
-		filterCleaned.set(NULL, STATS_TIME_OF_DAY, timeOfDay);
+	if (filter.get(NULL, KEY_TIME_OF_DAY, &timeOfDay))
+		filterCleaned.set(NULL, KEY_TIME_OF_DAY, timeOfDay);
 
 	std::string whereClause = createWhereClause(mediaType, filterCleaned);
 
 	std::stringstream query;
 	query <<
-		"SELECT IFNULL(COUNT(*),0) AS " STATS_TOTAL_COUNT \
+		"SELECT IFNULL(COUNT(*),0) AS " KEY_TOTAL_COUNT \
 		" FROM " MEDIA_TABLE_NAME \
 		" WHERE " << whereClause;
 
@@ -119,8 +119,8 @@ void MediaDbHandle::replyTriggerItem(int error, Json &jsonResult)
 	Json results;
 	int val;
 
-	jsonResult.get(NULL, STATS_TOTAL_COUNT, &val);
-	results.set(NULL, STATS_TOTAL_COUNT, val);
+	jsonResult.get(NULL, KEY_TOTAL_COUNT, &val);
+	results.set(NULL, KEY_TOTAL_COUNT, val);
 
 	reqProvider->replyToRead(reqFilter, error, results);
 }
diff --git a/src/media-stats/MediaContentMonitor.cpp b/src/media-stats/MediaContentMonitor.cpp
index 78ff0ef..734b64b 100644
--- a/src/media-stats/MediaContentMonitor.cpp
+++ b/src/media-stats/MediaContentMonitor.cpp
@@ -138,11 +138,11 @@ void ctx::MediaContentMonitor::__insertLog(int mediaType)
 	data.set(NULL, CX_MEDIA_TYPE, mediaType);
 
 	if (ctx::system_info::getAudioJackState(&audioJack))
-		data.set(NULL, STATS_AUDIO_JACK, audioJack);
+		data.set(NULL, KEY_AUDIO_JACK, audioJack);
 
 	if (ctx::system_info::getVolume(&systemVolume, &mediaVolume)) {
-		data.set(NULL, STATS_SYSTEM_VOLUME, systemVolume);
-		data.set(NULL, STATS_MEDIA_VOLUME, mediaVolume);
+		data.set(NULL, KEY_SYSTEM_VOLUME, systemVolume);
+		data.set(NULL, KEY_MEDIA_VOLUME, mediaVolume);
 	}
 
 	__dbManager.insert(0, MEDIA_TABLE_NAME, data, NULL);
diff --git a/src/media-stats/MediaStatisticsTypes.h b/src/media-stats/MediaStatisticsTypes.h
index a71e553..e0e0700 100644
--- a/src/media-stats/MediaStatisticsTypes.h
+++ b/src/media-stats/MediaStatisticsTypes.h
@@ -17,7 +17,7 @@
 #ifndef _CONTEXT_STATS_MEDIA_TYPES_H_
 #define _CONTEXT_STATS_MEDIA_TYPES_H_
 
-#include "../shared/CommonTypes.h"
+#include "../shared/ProviderTypes.h"
 
 #define MEDIA_HISTORY_PRIV					"mediahistory.read"
 #define MEDIA_SUBJ_LOGGER					"stats/media/logger"
diff --git a/src/message/Message.cpp b/src/message/Message.cpp
index d1873e3..7e589f0 100644
--- a/src/message/Message.cpp
+++ b/src/message/Message.cpp
@@ -22,7 +22,7 @@
 using namespace ctx;
 
 SocialStatusMessage::SocialStatusMessage() :
-	BasicProvider(SOCIAL_ST_SUBJ_MESSAGE),
+	BasicProvider(SUBJ_STATE_MESSAGE),
 	__messageHandle(NULL)
 {
 }
@@ -75,20 +75,20 @@ void SocialStatusMessage::__handleUpdate(msg_struct_t msg)
 	case MSG_TYPE_SMS_REJECT :
 	case MSG_TYPE_SMS_ETWS_PRIMARY :
 	case MSG_TYPE_SMS :
-		data.set(NULL, SOCIAL_ST_TYPE, SOCIAL_ST_SMS);
+		data.set(NULL, KEY_TYPE, VAL_SMS);
 		break;
 	case MSG_TYPE_MMS_NOTI :
 	case MSG_TYPE_MMS_JAVA :
 	case MSG_TYPE_MMS :
-		data.set(NULL, SOCIAL_ST_TYPE, SOCIAL_ST_MMS);
+		data.set(NULL, KEY_TYPE, VAL_MMS);
 		break;
 	default :
 		_W("Unknown message type");
 		return;
 	}
 
-	data.set(NULL, SOCIAL_ST_EVENT, SOCIAL_ST_RECEIVED);
-	data.set(NULL, SOCIAL_ST_ADDRESS, address);
+	data.set(NULL, KEY_EVENT, VAL_RECEIVED);
+	data.set(NULL, KEY_ADDRESS, address);
 
 	publish(NULL, ERR_NONE, data);
 }
diff --git a/src/message/Message.h b/src/message/Message.h
index a272144..4f2514f 100644
--- a/src/message/Message.h
+++ b/src/message/Message.h
@@ -19,7 +19,7 @@
 
 #include <msg.h>
 #include <msg_transport.h>
-#include "../shared/SocialTypes.h"
+#include "../shared/ProviderTypes.h"
 #include "../shared/BasicProvider.h"
 
 namespace ctx {
diff --git a/src/shared/CommonTypes.h b/src/shared/CommonTypes.h
deleted file mode 100644
index d6673e1..0000000
--- a/src/shared/CommonTypes.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _CONTEXT_STATS_COMMON_TYPES_H_
-#define _CONTEXT_STATS_COMMON_TYPES_H_
-
-#define LOG_RETENTION_PERIOD	7776000		/* 90 days in secs */
-
-#define DEFAULT_TIMESPAN		30
-#define DEFAULT_LIMIT			10
-
-#define STATS_QUERY_RESULT		"QueryResult"
-#define STATS_RESULT_SIZE		"ResultSize"
-#define STATS_COL_ROW_ID		"rowId"
-
-#define STATS_TIMESPAN			"TimeSpan"
-#define STATS_START_TIME		"StartTime"
-#define STATS_END_TIME			"EndTime"
-#define STATS_LAST_TIME			"LastTime"
-#define STATS_TOTAL_COUNT		"TotalCount"
-#define STATS_AVERAGE_COUNT		"AvgCount"
-#define STATS_DURATION			"Duration"
-#define STATS_TOTAL_DURATION	"TotalDuration"
-#define STATS_DAY_OF_WEEK		"DayOfWeek"
-#define STATS_HOUR_OF_DAY		"HourOfDay"
-#define STATS_TIME_OF_DAY		"TimeOfDay"
-#define STATS_TOTAL_COUNT		"TotalCount"
-#define STATS_APP_ID			"AppId"
-#define STATS_PKG_ID			"PkgId"
-#define STATS_AUDIO_JACK		"AudioJack"
-#define STATS_SYSTEM_VOLUME		"SystemVolume"
-#define STATS_MEDIA_VOLUME		"MediaVolume"
-#define STATS_BSSID				"BSSID"
-#define STATS_UNIV_TIME			"UTC"
-#define STATS_LOCAL_TIME		"LocalTime"
-#define STATS_RANK				"Rank"
-
-#define STATS_SUN		"Sun"
-#define STATS_MON		"Mon"
-#define STATS_TUE		"Tue"
-#define STATS_WED		"Wed"
-#define STATS_THU		"Thu"
-#define STATS_FRI		"Fri"
-#define STATS_SAT		"Sat"
-#define STATS_WEEKDAY	"Weekday"
-#define STATS_WEEKEND	"Weekend"
-
-enum StatsDayOfWeek_e {
-	STATS_DAY_OF_WEEK_WEEKDAY = 1,
-	STATS_DAY_OF_WEEK_WEEKEND,
-	STATS_DAY_OF_WEEK_ALL,
-	STATS_DAY_OF_WEEK_SUN,
-	STATS_DAY_OF_WEEK_MON,
-	STATS_DAY_OF_WEEK_TUE,
-	STATS_DAY_OF_WEEK_WED,
-	STATS_DAY_OF_WEEK_THU,
-	STATS_DAY_OF_WEEK_FRI,
-	STATS_DAY_OF_WEEK_SAT,
-};
-
-#define TRIG_DEF_RANK			"\"Rank\":{\"type\":\"integer\",\"min\":1}"
-#define TRIG_DEF_TOTAL_COUNT	"\"TotalCount\":{\"type\":\"integer\",\"min\":0}"
-#define TRIG_DEF_TIME_OF_DAY	"\"TimeOfDay\":{\"type\":\"string\"}"
-#define TRIG_DEF_DAY_OF_WEEK	"\"DayOfWeek\":{\"type\":\"string\",\"values\":[\"Mon\",\"Tue\",\"Wed\",\"Thu\",\"Fri\",\"Sat\",\"Sun\",\"Weekday\",\"Weekend\"]}"
-
-#endif	/* End of _CONTEXT_STATS_COMMMON_TYPES_ */
diff --git a/src/shared/DbHandleBase.cpp b/src/shared/DbHandleBase.cpp
index 979f75b..846265d 100644
--- a/src/shared/DbHandleBase.cpp
+++ b/src/shared/DbHandleBase.cpp
@@ -16,12 +16,37 @@
 
 #include <sstream>
 #include <Types.h>
-#include "CommonTypes.h"
+#include "ProviderTypes.h"
 #include "DbHandleBase.h"
 
 #define DAY_OF_WEEK(SECOND) "CAST(strftime('%w', " SECOND ", 'unixepoch') AS INTEGER)"
 #define HOUR_OF_DAY(SECOND) "CAST(strftime('%H', " SECOND ", 'unixepoch') AS INTEGER)"
 
+/* TODO: replace these macros */
+#define STATS_SUN		"Sun"
+#define STATS_MON		"Mon"
+#define STATS_TUE		"Tue"
+#define STATS_WED		"Wed"
+#define STATS_THU		"Thu"
+#define STATS_FRI		"Fri"
+#define STATS_SAT		"Sat"
+#define STATS_WEEKDAY	"Weekday"
+#define STATS_WEEKEND	"Weekend"
+
+enum StatsDayOfWeek_e {
+	STATS_DAY_OF_WEEK_WEEKDAY = 1,
+	STATS_DAY_OF_WEEK_WEEKEND,
+	STATS_DAY_OF_WEEK_ALL,
+	STATS_DAY_OF_WEEK_SUN,
+	STATS_DAY_OF_WEEK_MON,
+	STATS_DAY_OF_WEEK_TUE,
+	STATS_DAY_OF_WEEK_WED,
+	STATS_DAY_OF_WEEK_THU,
+	STATS_DAY_OF_WEEK_FRI,
+	STATS_DAY_OF_WEEK_SAT,
+};
+
+
 using namespace ctx;
 
 StatsDbHandleBase::StatsDbHandleBase(ContextProvider *provider) :
@@ -63,7 +88,7 @@ std::string StatsDbHandleBase::createWhereClause(Json filter)
 	std::string weekStr;
 	std::string timeOfDay;
 
-	if (filter.get(NULL, STATS_DAY_OF_WEEK, &weekStr)) {
+	if (filter.get(NULL, KEY_DAY_OF_WEEK, &weekStr)) {
 		// In case of string (from Trigger)
 		if (weekStr == STATS_WEEKDAY) {
 			week = STATS_DAY_OF_WEEK_WEEKDAY;
@@ -94,15 +119,15 @@ std::string StatsDbHandleBase::createWhereClause(Json filter)
 		}
 	} else {
 		// In case of integer (from History)
-		filter.get(NULL, STATS_DAY_OF_WEEK, &week);
+		filter.get(NULL, KEY_DAY_OF_WEEK, &week);
 	}
 
 	switch(week) {
 	case STATS_DAY_OF_WEEK_WEEKDAY:
-		whereClause << "(" DAY_OF_WEEK(STATS_LOCAL_TIME) " > 0 AND " DAY_OF_WEEK(STATS_LOCAL_TIME) " < 6) AND ";
+		whereClause << "(" DAY_OF_WEEK(KEY_LOCAL_TIME) " > 0 AND " DAY_OF_WEEK(KEY_LOCAL_TIME) " < 6) AND ";
 		break;
 	case STATS_DAY_OF_WEEK_WEEKEND:
-		whereClause << "(" DAY_OF_WEEK(STATS_LOCAL_TIME) " = 0 OR " DAY_OF_WEEK(STATS_LOCAL_TIME) " = 6) AND ";
+		whereClause << "(" DAY_OF_WEEK(KEY_LOCAL_TIME) " = 0 OR " DAY_OF_WEEK(KEY_LOCAL_TIME) " = 6) AND ";
 		break;
 	case STATS_DAY_OF_WEEK_SUN:
 	case STATS_DAY_OF_WEEK_MON:
@@ -111,33 +136,33 @@ std::string StatsDbHandleBase::createWhereClause(Json filter)
 	case STATS_DAY_OF_WEEK_THU:
 	case STATS_DAY_OF_WEEK_FRI:
 	case STATS_DAY_OF_WEEK_SAT:
-		whereClause << DAY_OF_WEEK(STATS_LOCAL_TIME) " = " << week - STATS_DAY_OF_WEEK_SUN << " AND ";
+		whereClause << DAY_OF_WEEK(KEY_LOCAL_TIME) " = " << week - STATS_DAY_OF_WEEK_SUN << " AND ";
 		break;
 	default:
 		break;
 	}
 
-	if (filter.get(NULL, STATS_APP_ID, &appId))
-		whereClause << STATS_APP_ID " = '" << appId << "' AND ";
+	if (filter.get(NULL, KEY_APP_ID, &appId))
+		whereClause << KEY_APP_ID " = '" << appId << "' AND ";
 
-	if (filter.get(NULL, STATS_START_TIME, &start))
-		whereClause << STATS_UNIV_TIME " >= " << start << " AND ";
+	if (filter.get(NULL, KEY_START_TIME, &start))
+		whereClause << KEY_UNIV_TIME " >= " << start << " AND ";
 
-	if (filter.get(NULL, STATS_END_TIME, &end))
-		whereClause << STATS_UNIV_TIME " <= " << end << " AND ";
+	if (filter.get(NULL, KEY_END_TIME, &end))
+		whereClause << KEY_UNIV_TIME " <= " << end << " AND ";
 
-	if (filter.get(NULL, STATS_TIME_OF_DAY, &timeOfDay)) {
+	if (filter.get(NULL, KEY_TIME_OF_DAY, &timeOfDay)) {
 		size_t pivot = timeOfDay.find('-');
 		if (pivot != std::string::npos) {
 			std::string from = timeOfDay.substr(0, pivot);
 			std::string to = timeOfDay.substr(pivot + 1);
-			whereClause << "(" HOUR_OF_DAY(STATS_LOCAL_TIME) " >= " << from \
-				<< " AND " HOUR_OF_DAY(STATS_LOCAL_TIME) " < " << to << ") AND ";
+			whereClause << "(" HOUR_OF_DAY(KEY_LOCAL_TIME) " >= " << from \
+				<< " AND " HOUR_OF_DAY(KEY_LOCAL_TIME) " < " << to << ") AND ";
 		}
 	}
 
-	filter.get(NULL, STATS_TIMESPAN, &timespan);
-	whereClause << STATS_UNIV_TIME " > strftime('%s', 'now', '-" << timespan <<" day')";
+	filter.get(NULL, KEY_TIMESPAN, &timespan);
+	whereClause << KEY_UNIV_TIME " > strftime('%s', 'now', '-" << timespan <<" day')";
 
 	return whereClause.str();
 }
@@ -147,15 +172,15 @@ std::string StatsDbHandleBase::createSqlPeakTime(Json filter, const char* tableN
 	std::stringstream query;
 	int limit = DEFAULT_LIMIT;
 
-	filter.get(NULL, STATS_RESULT_SIZE, &limit);
+	filter.get(NULL, KEY_RESULT_SIZE, &limit);
 
 	query <<
 		"SELECT " \
-			HOUR_OF_DAY(STATS_LOCAL_TIME) " AS " STATS_HOUR_OF_DAY ", COUNT(*) AS " STATS_TOTAL_COUNT \
+			HOUR_OF_DAY(KEY_LOCAL_TIME) " AS " KEY_HOUR_OF_DAY ", COUNT(*) AS " KEY_TOTAL_COUNT \
 		" FROM " << tableName << \
 		" WHERE " << whereClause << \
-		" GROUP BY " HOUR_OF_DAY(STATS_LOCAL_TIME) \
-		" ORDER BY " STATS_TOTAL_COUNT " DESC" \
+		" GROUP BY " HOUR_OF_DAY(KEY_LOCAL_TIME) \
+		" ORDER BY " KEY_TOTAL_COUNT " DESC" \
 		" LIMIT " << limit;
 
 	return query.str();
@@ -166,24 +191,24 @@ std::string StatsDbHandleBase::createSqlCommonSetting(Json filter, const char* t
 	std::stringstream query;
 
 	query <<
-		"SELECT ( SELECT " STATS_AUDIO_JACK \
+		"SELECT ( SELECT " KEY_AUDIO_JACK \
 				" FROM " << tableName << \
 				" WHERE " << whereClause << \
-				" GROUP BY " STATS_AUDIO_JACK \
-				" ORDER BY count(" STATS_AUDIO_JACK ") DESC" \
-				" LIMIT 1 ) AS " STATS_AUDIO_JACK \
-			", ( SELECT " STATS_SYSTEM_VOLUME \
+				" GROUP BY " KEY_AUDIO_JACK \
+				" ORDER BY count(" KEY_AUDIO_JACK ") DESC" \
+				" LIMIT 1 ) AS " KEY_AUDIO_JACK \
+			", ( SELECT " KEY_SYSTEM_VOLUME \
 				" FROM " << tableName << \
 				" WHERE " << whereClause << \
-				" GROUP BY " STATS_SYSTEM_VOLUME \
-				" ORDER BY count(" STATS_SYSTEM_VOLUME ") DESC" \
-				" LIMIT 1 ) AS " STATS_SYSTEM_VOLUME \
-			", ( SELECT " STATS_MEDIA_VOLUME \
+				" GROUP BY " KEY_SYSTEM_VOLUME \
+				" ORDER BY count(" KEY_SYSTEM_VOLUME ") DESC" \
+				" LIMIT 1 ) AS " KEY_SYSTEM_VOLUME \
+			", ( SELECT " KEY_MEDIA_VOLUME \
 				" FROM " << tableName << \
 				" WHERE " << whereClause << \
-				" GROUP BY " STATS_MEDIA_VOLUME \
-				" ORDER BY count(" STATS_MEDIA_VOLUME ") DESC" \
-				" LIMIT 1 ) AS " STATS_MEDIA_VOLUME;
+				" GROUP BY " KEY_MEDIA_VOLUME \
+				" ORDER BY count(" KEY_MEDIA_VOLUME ") DESC" \
+				" LIMIT 1 ) AS " KEY_MEDIA_VOLUME;
 
 	return query.str();
 }
@@ -203,7 +228,7 @@ void StatsDbHandleBase::__jsonVectorToArray(std::vector<Json> &vecJson, Json &js
 
 	for(auto vecJsonPos = vecJson.begin(); vecJsonPos != vecJsonEnd; ++vecJsonPos) {
 		Json originJson = *vecJsonPos;
-		jsonResult.append(NULL, STATS_QUERY_RESULT, originJson);
+		jsonResult.append(NULL, KEY_QUERY_RESULT, originJson);
 	}
 }
 
@@ -218,7 +243,7 @@ void StatsDbHandleBase::onExecuted(unsigned int queryId, int error, std::vector<
 			reqProvider->replyToRead(reqFilter, ERR_OPERATION_FAILED, dummy);
 		}
 	} else {
-		Json results = "{\"" STATS_QUERY_RESULT "\":[]}";
+		Json results = "{\"" KEY_QUERY_RESULT "\":[]}";
 		__jsonVectorToArray(records, results);
 		reqProvider->replyToRead(reqFilter, error, results);
 	}
diff --git a/src/shared/DeviceContextProvider.cpp b/src/shared/DeviceContextProvider.cpp
index f0a8d79..f1eb8d4 100644
--- a/src/shared/DeviceContextProvider.cpp
+++ b/src/shared/DeviceContextProvider.cpp
@@ -57,17 +57,17 @@ void registerProvider(const char *subject, const char *privilege)
 
 SO_EXPORT bool ctx::initDeviceContextProvider()
 {
-	registerProvider<DeviceStatusAlarm>(DEVICE_ST_SUBJ_ALARM, NULL);
-	registerProvider<DeviceStatusTime>(DEVICE_ST_SUBJ_TIME, NULL);
+	registerProvider<DeviceStatusAlarm>(SUBJ_STATE_ALARM, NULL);
+	registerProvider<DeviceStatusTime>(SUBJ_STATE_TIME, NULL);
 
-	registerProvider<DeviceStatusWifi>(DEVICE_ST_SUBJ_WIFI, PRIV_NETWORK);
-	registerProvider<DeviceStatusHeadphone>(DEVICE_ST_SUBJ_HEADPHONE, NULL);
+	registerProvider<DeviceStatusWifi>(SUBJ_STATE_WIFI, PRIV_NETWORK);
+	registerProvider<DeviceStatusHeadphone>(SUBJ_STATE_HEADPHONE, NULL);
 
-	registerProvider<DeviceStatusCharger>(DEVICE_ST_SUBJ_CHARGER, NULL);
-	registerProvider<DeviceStatusGps>(DEVICE_ST_SUBJ_GPS, NULL);
-	registerProvider<DeviceStatusUsb>(DEVICE_ST_SUBJ_USB, NULL);
-	registerProvider<DeviceStatusBattery>(DEVICE_ST_SUBJ_BATTERY, NULL);
-	registerProvider<DeviceStatusPsmode>(DEVICE_ST_SUBJ_PSMODE, NULL);
+	registerProvider<DeviceStatusCharger>(SUBJ_STATE_CHARGER, NULL);
+	registerProvider<DeviceStatusGps>(SUBJ_STATE_GPS, NULL);
+	registerProvider<DeviceStatusUsb>(SUBJ_STATE_USB, NULL);
+	registerProvider<DeviceStatusBattery>(SUBJ_STATE_BATTERY, NULL);
+	registerProvider<DeviceStatusPsmode>(SUBJ_STATE_PSMODE, NULL);
 
 	registerProvider<StationaryActivityProvider>(CTX_ACTIVITY_SUBJ_STATIONARY, NULL);
 	registerProvider<WalkingActivityProvider>(CTX_ACTIVITY_SUBJ_WALKING, NULL);
@@ -75,10 +75,10 @@ SO_EXPORT bool ctx::initDeviceContextProvider()
 	registerProvider<InVehicleActivityProvider>(CTX_ACTIVITY_SUBJ_IN_VEHICLE, NULL);
 
 #ifdef _MOBILE_
-	registerProvider<SocialStatusCall>(SOCIAL_ST_SUBJ_CALL, PRIV_TELEPHONY);
-	registerProvider<SocialStatusEmail>(SOCIAL_ST_SUBJ_EMAIL, NULL);
-	registerProvider<SocialStatusMessage>(SOCIAL_ST_SUBJ_MESSAGE, PRIV_MESSAGE);
-	registerProvider<SocialStatusContacts>(SOCIAL_ST_SUBJ_CONTACTS, PRIV_CONTACT);
+	registerProvider<SocialStatusCall>(SUBJ_STATE_CALL, PRIV_TELEPHONY);
+	registerProvider<SocialStatusEmail>(SUBJ_STATE_EMAIL, NULL);
+	registerProvider<SocialStatusMessage>(SUBJ_STATE_MESSAGE, PRIV_MESSAGE);
+	registerProvider<SocialStatusContacts>(SUBJ_STATE_CONTACTS, PRIV_CONTACT);
 
 	/* Create context providers, which need to be initiated before being subscribed */
 	/*
diff --git a/src/shared/ProviderTypes.h b/src/shared/ProviderTypes.h
new file mode 100644
index 0000000..84f5c68
--- /dev/null
+++ b/src/shared/ProviderTypes.h
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _CONTEXT_PROVIDER_TYPES_H_
+#define _CONTEXT_PROVIDER_TYPES_H_
+
+
+/* FW-wide Data Logger Parameters */
+#define LOG_RETENTION_PERIOD	7776000		/* 90 days in secs */
+
+
+/* FW-wide Default Values */
+#define DEFAULT_TIMESPAN		30
+#define DEFAULT_LIMIT			10
+
+
+/* Subjects */
+#define SUBJ_STATE_BATTERY		"system/battery"
+#define SUBJ_STATE_CHARGER		"system/charger"
+#define SUBJ_STATE_HEADPHONE	"system/headphone"
+#define SUBJ_STATE_WIFI			"system/wifi"
+#define SUBJ_STATE_USB			"system/usb"
+#define SUBJ_STATE_GPS			"system/gps"
+#define SUBJ_STATE_PSMODE		"system/psmode"
+#define SUBJ_STATE_ALARM		"device/alarm"
+#define SUBJ_STATE_TIME			"device/time"
+
+#define SUBJ_STATE_CALL			"social/call"
+#define SUBJ_STATE_EMAIL		"social/email"
+#define SUBJ_STATE_MESSAGE		"social/message"
+#define SUBJ_STATE_CONTACTS		"social/contacts"
+
+
+/* Data & Option Keys */
+#define KEY_QUERY_RESULT	"QueryResult"
+#define KEY_RESULT_SIZE		"ResultSize"
+#define KEY_COL_ROW_ID		"rowId"
+#define KEY_TIMESPAN		"TimeSpan"
+#define KEY_START_TIME		"StartTime"
+#define KEY_END_TIME		"EndTime"
+#define KEY_LAST_TIME		"LastTime"
+#define KEY_TOTAL_COUNT		"TotalCount"
+#define KEY_AVERAGE_COUNT	"AvgCount"
+#define KEY_DURATION		"Duration"
+#define KEY_TOTAL_DURATION	"TotalDuration"
+#define KEY_DAY_OF_WEEK		"DayOfWeek"
+#define KEY_HOUR_OF_DAY		"HourOfDay"
+#define KEY_TIME_OF_DAY		"TimeOfDay"
+#define KEY_TOTAL_COUNT		"TotalCount"
+#define KEY_APP_ID			"AppId"
+#define KEY_PKG_ID			"PkgId"
+#define KEY_AUDIO_JACK		"AudioJack"
+#define KEY_SYSTEM_VOLUME	"SystemVolume"
+#define KEY_MEDIA_VOLUME	"MediaVolume"
+#define KEY_BSSID			"BSSID"
+#define KEY_UNIV_TIME		"UTC"
+#define KEY_LOCAL_TIME		"LocalTime"
+#define KEY_RANK			"Rank"
+
+#define KEY_EVENT			"Event"
+#define KEY_STATE			"State"
+#define KEY_TYPE			"Type"
+#define KEY_LEVEL			"Level"
+#define KEY_BSSID			"BSSID"
+#define KEY_MEDIUM			"Medium"
+#define KEY_ADDRESS			"Address"
+#define KEY_IS_CONNECTED	"IsConnected"
+#define KEY_IS_ENABLED		"IsEnabled"
+#define KEY_IS_CHARGING		"IsCharging"
+#define KEY_DETECTED		"Detected"
+#define KEY_TIME_OF_DAY		"TimeOfDay"
+#define KEY_DAY_OF_WEEK		"DayOfWeek"
+#define KEY_DAY_OF_MONTH	"DayOfMonth"
+
+
+/* Data & Option Values */
+#define VAL_TRUE			1
+#define VAL_FALSE			0
+#define VAL_ENTER			"Enter"
+#define VAL_EXIT			"Exit"
+#define VAL_DISABLED		"Disabled"
+#define VAL_CONNECTED		"Connected"
+#define VAL_UNCONNECTED		"Unconnected"
+#define VAL_SEARCHING		"Searching"
+#define VAL_EMPTY			"Empty"
+#define VAL_CRITICAL		"Critical"
+#define VAL_LOW				"Low"
+#define VAL_NORMAL			"Normal"
+#define VAL_HIGH			"High"
+#define VAL_FULL			"Full"
+#define VAL_HEADSET			"Headset"
+#define VAL_BLUETOOTH		"Bluetooth"
+#define VAL_IDLE			"Idle"
+#define VAL_CONNECTING		"Connecting"
+#define VAL_CONNECTED		"Connected"
+#define VAL_HELD			"Held"
+#define VAL_DIALING			"Dialing"
+#define VAL_VOICE			"Voice"
+#define VAL_VIDEO			"Video"
+#define VAL_SENT			"Sent"
+#define VAL_RECEIVED		"Received"
+#define VAL_SMS				"SMS"
+#define VAL_MMS				"MMS"
+#define VAL_MY_PROFILE		"MyProfile"
+#define VAL_PERSON			"Person"
+#define VAL_CHANGED			"Changed"
+
+#define VAL_ACTIVE		VAL_CONNECTED
+#define VAL_ALERTING	VAL_CONNECTING
+#define VAL_INCOMING	VAL_CONNECTING
+
+
+/* Json Formats */
+#define TRIG_DEF_RANK			"\"Rank\":{\"type\":\"integer\",\"min\":1}"
+#define TRIG_DEF_TOTAL_COUNT	"\"TotalCount\":{\"type\":\"integer\",\"min\":0}"
+#define TRIG_DEF_TIME_OF_DAY	"\"TimeOfDay\":{\"type\":\"string\"}"
+#define TRIG_DEF_DAY_OF_WEEK	"\"DayOfWeek\":{\"type\":\"string\",\"values\":[\"Mon\",\"Tue\",\"Wed\",\"Thu\",\"Fri\",\"Sat\",\"Sun\",\"Weekday\",\"Weekend\"]}"
+#define TRIG_BOOL_ITEM_DEF(sbj)	"\"" sbj "\":{\"type\":\"integer\",\"min\":0,\"max\":1}"
+
+
+#endif	/* _CONTEXT_PROVIDER_TYPES_H_ */
diff --git a/src/shared/SocialTypes.h b/src/shared/SocialTypes.h
deleted file mode 100644
index 82dccff..0000000
--- a/src/shared/SocialTypes.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _CONTEXT_SOCIAL_STATUS_TYPES_H_
-#define _CONTEXT_SOCIAL_STATUS_TYPES_H_
-
-// Subject
-#define SOCIAL_ST_SUBJ_CALL		"social/call"
-#define SOCIAL_ST_SUBJ_EMAIL	"social/email"
-#define SOCIAL_ST_SUBJ_MESSAGE	"social/message"
-#define SOCIAL_ST_SUBJ_CONTACTS	"social/contacts"
-
-// Data Key
-#define SOCIAL_ST_STATE			"State"
-#define SOCIAL_ST_EVENT			"Event"
-#define SOCIAL_ST_TYPE			"Type"
-#define SOCIAL_ST_MEDIUM		"Medium"
-#define SOCIAL_ST_ADDRESS		"Address"
-
-// Data Values
-#define SOCIAL_ST_IDLE			"Idle"
-#define SOCIAL_ST_CONNECTING	"Connecting"
-#define SOCIAL_ST_CONNECTED		"Connected"
-#define SOCIAL_ST_ACTIVE		SOCIAL_ST_CONNECTED
-#define SOCIAL_ST_HELD			"Held"
-#define SOCIAL_ST_DIALING		"Dialing"
-#define SOCIAL_ST_ALERTING		SOCIAL_ST_CONNECTING
-#define SOCIAL_ST_INCOMING		SOCIAL_ST_CONNECTING
-#define SOCIAL_ST_VOICE			"Voice"
-#define SOCIAL_ST_VIDEO			"Video"
-#define SOCIAL_ST_SENT			"Sent"
-#define SOCIAL_ST_RECEIVED		"Received"
-#define SOCIAL_ST_SMS			"SMS"
-#define SOCIAL_ST_MMS			"MMS"
-#define SOCIAL_ST_MY_PROFILE	"MyProfile"
-#define SOCIAL_ST_PERSON		"Person"
-#define SOCIAL_ST_CHANGED		"Changed"
-
-#endif	//_CONTEXT_SOCIAL_STATUS_TYPES_H
diff --git a/src/shared/SystemTypes.h b/src/shared/SystemTypes.h
deleted file mode 100644
index 3129a36..0000000
--- a/src/shared/SystemTypes.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef	_DEVICE_SYSTEM_STATUS_TYPES_H_
-#define	_DEVICE_SYSTEM_STATUS_TYPES_H_
-
-// Subject
-#define DEVICE_ST_SUBJ_BATTERY			"system/battery"
-#define DEVICE_ST_SUBJ_CHARGER			"system/charger"
-#define DEVICE_ST_SUBJ_HEADPHONE		"system/headphone"
-#define DEVICE_ST_SUBJ_WIFI				"system/wifi"
-#define DEVICE_ST_SUBJ_USB				"system/usb"
-#define DEVICE_ST_SUBJ_GPS				"system/gps"
-#define DEVICE_ST_SUBJ_PSMODE			"system/psmode"
-#define DEVICE_ST_SUBJ_ALARM			"device/alarm"
-#define DEVICE_ST_SUBJ_TIME				"device/time"
-
-// Data Key
-#define DEVICE_ST_EVENT			"Event"
-#define DEVICE_ST_STATE			"State"
-#define DEVICE_ST_TYPE			"Type"
-#define DEVICE_ST_LEVEL			"Level"
-#define DEVICE_ST_BSSID			"BSSID"
-#define DEVICE_ST_IS_CONNECTED	"IsConnected"
-#define DEVICE_ST_IS_ENABLED	"IsEnabled"
-#define DEVICE_ST_IS_CHARGING	"IsCharging"
-#define DEVICE_ST_DETECTED		"Detected"
-#define DEVICE_ST_TIME_OF_DAY	"TimeOfDay"
-#define DEVICE_ST_DAY_OF_WEEK	"DayOfWeek"
-#define DEVICE_ST_DAY_OF_MONTH	"DayOfMonth"
-
-// Data Value
-#define DEVICE_ST_TRUE			1
-#define DEVICE_ST_FALSE			0
-#define DEVICE_ST_ENTER			"Enter"
-#define DEVICE_ST_EXIT			"Exit"
-#define DEVICE_ST_DISABLED		"Disabled"
-#define DEVICE_ST_CONNECTED		"Connected"
-#define DEVICE_ST_UNCONNECTED	"Unconnected"
-#define DEVICE_ST_SEARCHING		"Searching"
-#define DEVICE_ST_EMPTY			"Empty"
-#define DEVICE_ST_CRITICAL		"Critical"
-#define DEVICE_ST_LOW			"Low"
-#define DEVICE_ST_NORMAL		"Normal"
-#define DEVICE_ST_HIGH			"High"
-#define DEVICE_ST_FULL			"Full"
-#define DEVICE_ST_HEADSET		"Headset"
-#define DEVICE_ST_BLUETOOTH		"Bluetooth"
-
-#define TRIG_BOOL_ITEM_DEF(sbj)	"\"" sbj "\":{\"type\":\"integer\",\"min\":0,\"max\":1}"
-
-#endif	//_DEVICE_SYSTEM_STATUS_TYPES_H_
diff --git a/src/social-stats/DbHandle.cpp b/src/social-stats/DbHandle.cpp
index 5c1c0a6..7e1b6cc 100644
--- a/src/social-stats/DbHandle.cpp
+++ b/src/social-stats/DbHandle.cpp
@@ -84,13 +84,13 @@ std::string SocialDbHandle::createSqlFreqAddress(Json filter)
 	std::stringstream query;
 	int limit = DEFAULT_LIMIT;
 
-	filter.get(NULL, STATS_RESULT_SIZE, &limit);
+	filter.get(NULL, KEY_RESULT_SIZE, &limit);
 
 	query <<
 		"SELECT " SOCIAL_ADDRESS ", " \
-			"COUNT(*) AS " STATS_TOTAL_COUNT ", " \
-			"SUM(" STATS_DURATION ") AS " STATS_TOTAL_DURATION ", " \
-			"MAX(" STATS_UNIV_TIME ") AS " STATS_LAST_TIME \
+			"COUNT(*) AS " KEY_TOTAL_COUNT ", " \
+			"SUM(" KEY_DURATION ") AS " KEY_TOTAL_DURATION ", " \
+			"MAX(" KEY_UNIV_TIME ") AS " KEY_LAST_TIME \
 		" FROM " SOCIAL_TABLE_CONTACT_LOG \
 		" WHERE " << createWhereClause(filter) <<
 		" GROUP BY " SOCIAL_ADDRESS \
@@ -112,11 +112,11 @@ std::string SocialDbHandle::createSqlFrequency(Json filter)
 		return "";
 	}
 
-	if (filter.get(NULL, STATS_DAY_OF_WEEK, &weekStr))
-		filterCleaned.set(NULL, STATS_DAY_OF_WEEK, weekStr);
+	if (filter.get(NULL, KEY_DAY_OF_WEEK, &weekStr))
+		filterCleaned.set(NULL, KEY_DAY_OF_WEEK, weekStr);
 
-	if (filter.get(NULL, STATS_TIME_OF_DAY, &timeOfDay))
-		filterCleaned.set(NULL, STATS_TIME_OF_DAY, timeOfDay);
+	if (filter.get(NULL, KEY_TIME_OF_DAY, &timeOfDay))
+		filterCleaned.set(NULL, KEY_TIME_OF_DAY, timeOfDay);
 
 	std::stringstream query;
 
@@ -125,7 +125,7 @@ std::string SocialDbHandle::createSqlFrequency(Json filter)
 
 	query <<
 		"INSERT INTO " SOCIAL_TEMP_CONTACT_FREQ \
-		" SELECT " SOCIAL_ADDRESS ", COUNT(*) AS " STATS_TOTAL_COUNT \
+		" SELECT " SOCIAL_ADDRESS ", COUNT(*) AS " KEY_TOTAL_COUNT \
 		" FROM " SOCIAL_TABLE_CONTACT_LOG \
 		" WHERE " << createWhereClause(filterCleaned) <<
 		" GROUP BY " SOCIAL_ADDRESS ";";
@@ -135,10 +135,10 @@ std::string SocialDbHandle::createSqlFrequency(Json filter)
 		" VALUES ('" << address << "');";
 
 	query <<
-		"SELECT S." SOCIAL_ADDRESS ", S." STATS_TOTAL_COUNT ", 1+COUNT(lesser." STATS_TOTAL_COUNT ") AS " STATS_RANK \
+		"SELECT S." SOCIAL_ADDRESS ", S." KEY_TOTAL_COUNT ", 1+COUNT(lesser." KEY_TOTAL_COUNT ") AS " KEY_RANK \
 		" FROM " SOCIAL_TEMP_CONTACT_FREQ " AS S" \
 		" LEFT JOIN " SOCIAL_TEMP_CONTACT_FREQ " AS lesser" \
-		" ON S." STATS_TOTAL_COUNT " < lesser." STATS_TOTAL_COUNT \
+		" ON S." KEY_TOTAL_COUNT " < lesser." KEY_TOTAL_COUNT \
 		" WHERE S." SOCIAL_ADDRESS " = '" << address << "'";
 
 
@@ -155,10 +155,10 @@ void SocialDbHandle::replyTriggerItem(int error, Json &jsonResult)
 
 	jsonResult.get(NULL, SOCIAL_ADDRESS, &valStr);
 	results.set(NULL, SOCIAL_ADDRESS, valStr);
-	jsonResult.get(NULL, STATS_TOTAL_COUNT, &val);
-	results.set(NULL, STATS_TOTAL_COUNT, val);
-	jsonResult.get(NULL, STATS_RANK, &val);
-	results.set(NULL, STATS_RANK, val);
+	jsonResult.get(NULL, KEY_TOTAL_COUNT, &val);
+	results.set(NULL, KEY_TOTAL_COUNT, val);
+	jsonResult.get(NULL, KEY_RANK, &val);
+	results.set(NULL, KEY_RANK, val);
 
 	reqProvider->replyToRead(reqFilter, error, results);
 }
diff --git a/src/social-stats/LogAggregator.cpp b/src/social-stats/LogAggregator.cpp
index dac092d..2fc9608 100644
--- a/src/social-stats/LogAggregator.cpp
+++ b/src/social-stats/LogAggregator.cpp
@@ -53,7 +53,7 @@ bool ctx::ContactLogAggregator::onTimerExpired(int timerId)
 void ctx::ContactLogAggregator::aggregateContactLog()
 {
 	__dbManager.execute(0,
-			"SELECT IFNULL(MAX(" STATS_UNIV_TIME "),0) AS " STATS_LAST_TIME \
+			"SELECT IFNULL(MAX(" KEY_UNIV_TIME "),0) AS " KEY_LAST_TIME \
 			", (strftime('%s', 'now', 'localtime')) - (strftime('%s', 'now')) AS " TIME_DIFFERENCE \
 			" FROM " SOCIAL_TABLE_CONTACT_LOG, this);
 }
@@ -63,7 +63,7 @@ void ctx::ContactLogAggregator::onExecuted(unsigned int queryId, int error, std:
 	IF_FAIL_VOID_TAG(!records.empty(), _E, "Invalid query result");
 
 	int lastTime = 0;
-	records[0].get(NULL, STATS_LAST_TIME, &lastTime);
+	records[0].get(NULL, KEY_LAST_TIME, &lastTime);
 	records[0].get(NULL, TIME_DIFFERENCE, &__timeDiff);
 
 	_D("Last Time: %d / Local - UTC: %d", lastTime, __timeDiff);
@@ -149,9 +149,9 @@ void ctx::ContactLogAggregator::__insertContactLogList(contacts_list_h list)
 
 		data.set(NULL, SOCIAL_ADDRESS, address);
 		data.set(NULL, SOCIAL_PHONE_LOG_TYPE, logType);
-		data.set(NULL, STATS_DURATION, duration);
-		data.set(NULL, STATS_UNIV_TIME, accessTime);
-		data.set(NULL, STATS_LOCAL_TIME, accessTime + __timeDiff);
+		data.set(NULL, KEY_DURATION, duration);
+		data.set(NULL, KEY_UNIV_TIME, accessTime);
+		data.set(NULL, KEY_LOCAL_TIME, accessTime + __timeDiff);
 
 		__dbManager.insert(0, SOCIAL_TABLE_CONTACT_LOG, data, NULL);
 
@@ -162,6 +162,6 @@ void ctx::ContactLogAggregator::__removeExpiredLog()
 {
 	std::stringstream query;
 	query << "DELETE FROM " SOCIAL_TABLE_CONTACT_LOG " WHERE " \
-		STATS_UNIV_TIME " < strftime('%s', 'now') - " << LOG_RETENTION_PERIOD;
+		KEY_UNIV_TIME " < strftime('%s', 'now') - " << LOG_RETENTION_PERIOD;
 	__dbManager.execute(0, query.str().c_str(), NULL);
 }
diff --git a/src/social-stats/SocialStatisticsTypes.h b/src/social-stats/SocialStatisticsTypes.h
index 7c68b93..845f577 100644
--- a/src/social-stats/SocialStatisticsTypes.h
+++ b/src/social-stats/SocialStatisticsTypes.h
@@ -17,7 +17,7 @@
 #ifndef _CONTEXT_STATS_SOCIAL_TYPES_H_
 #define _CONTEXT_STATS_SOCIAL_TYPES_H_
 
-#include "../shared/CommonTypes.h"
+#include "../shared/ProviderTypes.h"
 
 #define SOCIAL_HISTORY_PRIV			"callhistory.read"
 #define SOCIAL_SUBJ_LOGGER			"stats/contact/logger"
diff --git a/src/system/Battery.cpp b/src/system/Battery.cpp
index e86a595..b2d36a4 100644
--- a/src/system/Battery.cpp
+++ b/src/system/Battery.cpp
@@ -19,7 +19,7 @@
 using namespace ctx;
 
 DeviceStatusBattery::DeviceStatusBattery()
-	: BasicProvider(DEVICE_ST_SUBJ_BATTERY)
+	: BasicProvider(SUBJ_STATE_BATTERY)
 {
 }
 
@@ -58,13 +58,13 @@ void DeviceStatusBattery::__handleUpdate(device_callback_e deviceType, void* val
 	IF_FAIL_VOID(levelString);
 
 	Json dataRead;
-	dataRead.set(NULL, DEVICE_ST_LEVEL, levelString);
+	dataRead.set(NULL, KEY_LEVEL, levelString);
 
 	bool chargingState = false;
 	int ret = device_battery_is_charging(&chargingState);
 	IF_FAIL_VOID_TAG(ret == DEVICE_ERROR_NONE, _E, "Getting state failed");
 
-	dataRead.set(NULL, DEVICE_ST_IS_CHARGING, chargingState ? DEVICE_ST_TRUE : DEVICE_ST_FALSE);
+	dataRead.set(NULL, KEY_IS_CHARGING, chargingState ? VAL_TRUE : VAL_FALSE);
 	publish(NULL, ERR_NONE, dataRead);
 }
 
@@ -72,16 +72,16 @@ const char* DeviceStatusBattery::__transToString(intptr_t level)
 {
 	switch (level) {
 	case DEVICE_BATTERY_LEVEL_EMPTY:
-		return DEVICE_ST_EMPTY;
+		return VAL_EMPTY;
 
 	case DEVICE_BATTERY_LEVEL_CRITICAL:
-		return DEVICE_ST_CRITICAL;
+		return VAL_CRITICAL;
 
 	case DEVICE_BATTERY_LEVEL_LOW:
-		return DEVICE_ST_LOW;
+		return VAL_LOW;
 
 	case DEVICE_BATTERY_LEVEL_HIGH:
-		return DEVICE_ST_NORMAL;
+		return VAL_NORMAL;
 
 	case DEVICE_BATTERY_LEVEL_FULL:
 	{
@@ -89,9 +89,9 @@ const char* DeviceStatusBattery::__transToString(intptr_t level)
 		device_battery_get_percent(&percent);
 
 		if (percent == 100) {
-			return DEVICE_ST_FULL;
+			return VAL_FULL;
 		} else {
-			return DEVICE_ST_HIGH;
+			return VAL_HIGH;
 		}
 		break;
 	}
@@ -127,13 +127,13 @@ int DeviceStatusBattery::read()
 	const char* levelString = __transToString(level);
 	IF_FAIL_RETURN(levelString, ERR_OPERATION_FAILED);
 
-	dataRead.set(NULL, DEVICE_ST_LEVEL, levelString);
+	dataRead.set(NULL, KEY_LEVEL, levelString);
 
 	bool chargingState = false;
 	ret = device_battery_is_charging(&chargingState);
 	IF_FAIL_RETURN(ret == DEVICE_ERROR_NONE, ERR_OPERATION_FAILED);
 
-	dataRead.set(NULL, DEVICE_ST_IS_CHARGING, chargingState ? DEVICE_ST_TRUE : DEVICE_ST_FALSE);
+	dataRead.set(NULL, KEY_IS_CHARGING, chargingState ? VAL_TRUE : VAL_FALSE);
 
 	replyToRead(NULL, ERR_NONE, dataRead);
 	return ERR_NONE;
diff --git a/src/system/Battery.h b/src/system/Battery.h
index 40e4ce0..fab5a3c 100644
--- a/src/system/Battery.h
+++ b/src/system/Battery.h
@@ -19,7 +19,7 @@
 
 #include <device/callback.h>
 #include <device/battery.h>
-#include "../shared/SystemTypes.h"
+#include "../shared/ProviderTypes.h"
 #include "../shared/BasicProvider.h"
 
 namespace ctx {
diff --git a/src/system/Charger.cpp b/src/system/Charger.cpp
index 5703747..8142bb4 100644
--- a/src/system/Charger.cpp
+++ b/src/system/Charger.cpp
@@ -19,7 +19,7 @@
 using namespace ctx;
 
 DeviceStatusCharger::DeviceStatusCharger() :
-	DeviceStatusRuntimeInfo(DEVICE_ST_SUBJ_CHARGER, RUNTIME_INFO_KEY_CHARGER_CONNECTED)
+	DeviceStatusRuntimeInfo(SUBJ_STATE_CHARGER, RUNTIME_INFO_KEY_CHARGER_CONNECTED)
 {
 }
 
@@ -46,7 +46,7 @@ void DeviceStatusCharger::handleUpdate()
 	IF_FAIL_VOID_TAG(ret == RUNTIME_INFO_ERROR_NONE, _E, "Getting runtime info failed");
 
 	Json dataRead;
-	dataRead.set(NULL, DEVICE_ST_IS_CONNECTED, chargerStatus ? DEVICE_ST_TRUE : DEVICE_ST_FALSE);
+	dataRead.set(NULL, KEY_IS_CONNECTED, chargerStatus ? VAL_TRUE : VAL_FALSE);
 
 	publish(NULL, ERR_NONE, dataRead);
 }
@@ -59,7 +59,7 @@ int DeviceStatusCharger::read()
 	int ret = runtime_info_get_value_bool(RUNTIME_INFO_KEY_CHARGER_CONNECTED, &chargerStatus);
 	IF_FAIL_RETURN_TAG(ret == RUNTIME_INFO_ERROR_NONE, ERR_OPERATION_FAILED, _E, "Getting runtime info failed");
 
-	dataRead.set(NULL, DEVICE_ST_IS_CONNECTED, chargerStatus ? DEVICE_ST_TRUE : DEVICE_ST_FALSE);
+	dataRead.set(NULL, KEY_IS_CONNECTED, chargerStatus ? VAL_TRUE : VAL_FALSE);
 
 	replyToRead(NULL, ERR_NONE, dataRead);
 	return ERR_NONE;
diff --git a/src/system/Gps.cpp b/src/system/Gps.cpp
index fb01f9d..47b08d0 100644
--- a/src/system/Gps.cpp
+++ b/src/system/Gps.cpp
@@ -23,13 +23,13 @@ static const char* __getStatusString(int gpsStatus)
 {
 	switch (gpsStatus) {
 	case RUNTIME_INFO_GPS_STATUS_DISABLED:
-		return DEVICE_ST_DISABLED;
+		return VAL_DISABLED;
 
 	case RUNTIME_INFO_GPS_STATUS_SEARCHING:
-		return DEVICE_ST_SEARCHING;
+		return VAL_SEARCHING;
 
 	case RUNTIME_INFO_GPS_STATUS_CONNECTED:
-		return DEVICE_ST_CONNECTED;
+		return VAL_CONNECTED;
 
 	default:
 		_E("Unknown GPS status: %d", gpsStatus);
@@ -38,7 +38,7 @@ static const char* __getStatusString(int gpsStatus)
 }
 
 DeviceStatusGps::DeviceStatusGps() :
-	DeviceStatusRuntimeInfo(DEVICE_ST_SUBJ_GPS, RUNTIME_INFO_KEY_GPS_STATUS)
+	DeviceStatusRuntimeInfo(SUBJ_STATE_GPS, RUNTIME_INFO_KEY_GPS_STATUS)
 {
 }
 
@@ -71,7 +71,7 @@ void DeviceStatusGps::handleUpdate()
 	const char* stateStr = __getStatusString(gpsStatus);
 	IF_FAIL_VOID(stateStr);
 
-	dataRead.set(NULL, DEVICE_ST_STATE, stateStr);
+	dataRead.set(NULL, KEY_STATE, stateStr);
 
 	publish(NULL, ERR_NONE, dataRead);
 }
@@ -87,7 +87,7 @@ int DeviceStatusGps::read()
 	const char* stateStr = __getStatusString(gpsStatus);
 	IF_FAIL_RETURN(stateStr, ERR_OPERATION_FAILED);
 
-	dataRead.set(NULL, DEVICE_ST_STATE, stateStr);
+	dataRead.set(NULL, KEY_STATE, stateStr);
 
 	replyToRead(NULL, ERR_NONE, dataRead);
 	return ERR_NONE;
diff --git a/src/system/Psmode.cpp b/src/system/Psmode.cpp
index cc0cf30..c6d80ea 100644
--- a/src/system/Psmode.cpp
+++ b/src/system/Psmode.cpp
@@ -19,7 +19,7 @@
 using namespace ctx;
 
 DeviceStatusPsmode::DeviceStatusPsmode() :
-	BasicProvider(DEVICE_ST_SUBJ_PSMODE)
+	BasicProvider(SUBJ_STATE_PSMODE)
 {
 }
 
@@ -52,7 +52,7 @@ void DeviceStatusPsmode::__handleUpdate(keynode_t *node)
 	status = vconf_keynode_get_int(node);
 	IF_FAIL_VOID_TAG(status >= 0, _E, "Getting state failed");
 
-	dataRead.set(NULL, DEVICE_ST_IS_ENABLED, status == 0 ? DEVICE_ST_FALSE : DEVICE_ST_TRUE);
+	dataRead.set(NULL, KEY_IS_ENABLED, status == 0 ? VAL_FALSE : VAL_TRUE);
 
 	publish(NULL, ERR_NONE, dataRead);
 }
@@ -78,7 +78,7 @@ int DeviceStatusPsmode::read()
 	IF_FAIL_RETURN(ret == VCONF_OK, ERR_OPERATION_FAILED);
 
 	Json dataRead;
-	dataRead.set(NULL, DEVICE_ST_IS_ENABLED, mode == 0 ? DEVICE_ST_FALSE : DEVICE_ST_TRUE);
+	dataRead.set(NULL, KEY_IS_ENABLED, mode == 0 ? VAL_FALSE : VAL_TRUE);
 
 	replyToRead(NULL, ERR_NONE, dataRead);
 	return ERR_NONE;
diff --git a/src/system/Psmode.h b/src/system/Psmode.h
index 78ec7ec..f821bd3 100644
--- a/src/system/Psmode.h
+++ b/src/system/Psmode.h
@@ -18,7 +18,7 @@
 #define _DEVICE_SYSTEM_STATUS_POWER_SAVING_MODE_H_
 
 #include <vconf.h>
-#include "../shared/SystemTypes.h"
+#include "../shared/ProviderTypes.h"
 #include "../shared/BasicProvider.h"
 
 namespace ctx {
diff --git a/src/system/RuntimeInfoBase.h b/src/system/RuntimeInfoBase.h
index c99f462..2ff12a7 100644
--- a/src/system/RuntimeInfoBase.h
+++ b/src/system/RuntimeInfoBase.h
@@ -18,7 +18,7 @@
 #define _DEVICE_SYSTEM_STATUS_RUNTIME_INFO_BASE_H_
 
 #include <runtime_info.h>
-#include "../shared/SystemTypes.h"
+#include "../shared/ProviderTypes.h"
 #include "../shared/BasicProvider.h"
 
 namespace ctx {
diff --git a/src/system/Usb.cpp b/src/system/Usb.cpp
index 935aaeb..6c9b087 100644
--- a/src/system/Usb.cpp
+++ b/src/system/Usb.cpp
@@ -20,7 +20,7 @@
 using namespace ctx;
 
 DeviceStatusUsb::DeviceStatusUsb()	:
-	DeviceStatusRuntimeInfo(DEVICE_ST_SUBJ_USB, RUNTIME_INFO_KEY_USB_CONNECTED)
+	DeviceStatusRuntimeInfo(SUBJ_STATE_USB, RUNTIME_INFO_KEY_USB_CONNECTED)
 {
 }
 
@@ -47,7 +47,7 @@ void DeviceStatusUsb::handleUpdate()
 	IF_FAIL_VOID_TAG(ret == RUNTIME_INFO_ERROR_NONE, _E, "Getting runtime info failed");
 
 	Json dataRead;
-	dataRead.set(NULL, DEVICE_ST_IS_CONNECTED, status ? DEVICE_ST_TRUE : DEVICE_ST_FALSE);
+	dataRead.set(NULL, KEY_IS_CONNECTED, status ? VAL_TRUE : VAL_FALSE);
 
 	publish(NULL, ERR_NONE, dataRead);
 }
@@ -60,7 +60,7 @@ int DeviceStatusUsb::read()
 	int ret = runtime_info_get_value_bool(RUNTIME_INFO_KEY_USB_CONNECTED, &status);
 	IF_FAIL_RETURN_TAG(ret == RUNTIME_INFO_ERROR_NONE, ERR_OPERATION_FAILED, _E, "Getting runtime info failed");
 
-	dataRead.set(NULL, DEVICE_ST_IS_CONNECTED, status ? DEVICE_ST_TRUE : DEVICE_ST_FALSE);
+	dataRead.set(NULL, KEY_IS_CONNECTED, status ? VAL_TRUE : VAL_FALSE);
 
 	replyToRead(NULL, ERR_NONE, dataRead);
 	return ERR_NONE;
diff --git a/src/time/Alarm.cpp b/src/time/Alarm.cpp
index 26bac0b..8c3740a 100644
--- a/src/time/Alarm.cpp
+++ b/src/time/Alarm.cpp
@@ -19,7 +19,7 @@
 using namespace ctx;
 
 DeviceStatusAlarm::DeviceStatusAlarm()
-	: ContextProvider(DEVICE_ST_SUBJ_ALARM)
+	: ContextProvider(SUBJ_STATE_ALARM)
 {
 }
 
@@ -53,7 +53,7 @@ int DeviceStatusAlarm::subscribe(Json option, Json *requestResult)
 	int dow = __getArrangedDayOfWeek(option);
 
 	int time;
-	for (int i = 0; option.getAt(NULL, DEVICE_ST_TIME_OF_DAY, i, &time); i++) {
+	for (int i = 0; option.getAt(NULL, KEY_TIME_OF_DAY, i, &time); i++) {
 		__add(time, dow);
 	}
 
@@ -74,7 +74,7 @@ int DeviceStatusAlarm::unsubscribe(Json option)
 	int dow = __getArrangedDayOfWeek(option);
 
 	int time;
-	for (int i = 0; option.getAt(NULL, DEVICE_ST_TIME_OF_DAY, i, &time); i++) {
+	for (int i = 0; option.getAt(NULL, KEY_TIME_OF_DAY, i, &time); i++) {
 		__remove(time, dow);
 	}
 
@@ -92,7 +92,7 @@ int DeviceStatusAlarm::__getArrangedDayOfWeek(Json& option)
 	int dow = 0;
 
 	std::string tempDay;
-	for (int i = 0; option.getAt(NULL, DEVICE_ST_DAY_OF_WEEK, i, &tempDay); i++) {
+	for (int i = 0; option.getAt(NULL, KEY_DAY_OF_WEEK, i, &tempDay); i++) {
 		dow |= TimerManager::dowToInt(tempDay);
 	}
 	_D("Requested day of week (%#x)", dow);
@@ -226,8 +226,8 @@ void DeviceStatusAlarm::__handleUpdate(int hour, int min, int dayOfWeek)
 	Json dataRead;
 	int resultTime = hour * 60 + min;
 	std::string resultDay = TimerManager::dowToStr(dayOfWeek);
-	dataRead.set(NULL, DEVICE_ST_TIME_OF_DAY, resultTime);
-	dataRead.set(NULL, DEVICE_ST_DAY_OF_WEEK, resultDay);
+	dataRead.set(NULL, KEY_TIME_OF_DAY, resultTime);
+	dataRead.set(NULL, KEY_DAY_OF_WEEK, resultDay);
 
 	for (auto it = __optionSet.begin(); it != __optionSet.end(); ++it) {
 		Json option = (**it);
@@ -241,7 +241,7 @@ bool DeviceStatusAlarm::__isMatched(Json& option, int time, std::string day)
 {
 	bool ret = false;
 	int optionTime;
-	for (int i = 0; option.getAt(NULL, DEVICE_ST_TIME_OF_DAY, i, &optionTime); i++){
+	for (int i = 0; option.getAt(NULL, KEY_TIME_OF_DAY, i, &optionTime); i++){
 		if (time == optionTime) {
 			ret = true;
 			break;
@@ -250,7 +250,7 @@ bool DeviceStatusAlarm::__isMatched(Json& option, int time, std::string day)
 	IF_FAIL_RETURN(ret, false);
 
 	std::string optionDay;
-	for (int i = 0; option.getAt(NULL, DEVICE_ST_DAY_OF_WEEK, i, &optionDay); i++){
+	for (int i = 0; option.getAt(NULL, KEY_DAY_OF_WEEK, i, &optionDay); i++){
 		if (day == optionDay) {
 			return true;
 		}
diff --git a/src/time/Alarm.h b/src/time/Alarm.h
index 797e62f..85b6419 100644
--- a/src/time/Alarm.h
+++ b/src/time/Alarm.h
@@ -21,7 +21,7 @@
 #include <set>
 #include <TimerManager.h>
 #include <ContextProvider.h>
-#include "../shared/SystemTypes.h"
+#include "../shared/ProviderTypes.h"
 
 namespace ctx {
 
diff --git a/src/time/Time.cpp b/src/time/Time.cpp
index d4ba82f..770c560 100644
--- a/src/time/Time.cpp
+++ b/src/time/Time.cpp
@@ -20,7 +20,7 @@
 using namespace ctx;
 
 DeviceStatusTime::DeviceStatusTime() :
-	BasicProvider(DEVICE_ST_SUBJ_TIME)
+	BasicProvider(SUBJ_STATE_TIME)
 {
 }
 
@@ -68,9 +68,9 @@ int DeviceStatusTime::read()
 	std::string dayOfWeek = TimerManager::dowToStr(0x01 << timeInfo.tm_wday);
 
 	Json dataRead;
-	dataRead.set(NULL, DEVICE_ST_DAY_OF_MONTH, dayOfMonth);
-	dataRead.set(NULL, DEVICE_ST_DAY_OF_WEEK, dayOfWeek);
-	dataRead.set(NULL, DEVICE_ST_TIME_OF_DAY, minuteOfDay);
+	dataRead.set(NULL, KEY_DAY_OF_MONTH, dayOfMonth);
+	dataRead.set(NULL, KEY_DAY_OF_WEEK, dayOfWeek);
+	dataRead.set(NULL, KEY_TIME_OF_DAY, minuteOfDay);
 
 	_I("Time: %02d:%02d, Day of Week: %s, Day of Month: %d", timeInfo.tm_hour, timeInfo.tm_min, dayOfWeek.c_str(), dayOfMonth);
 
diff --git a/src/time/Time.h b/src/time/Time.h
index 9562723..ac1862f 100644
--- a/src/time/Time.h
+++ b/src/time/Time.h
@@ -18,7 +18,7 @@
 #define _DEVICE_SYSTEM_STATUS_TIME_H_
 
 #include "../shared/BasicProvider.h"
-#include "../shared/SystemTypes.h"
+#include "../shared/ProviderTypes.h"
 
 namespace ctx {
 
diff --git a/src/wifi/Wifi.cpp b/src/wifi/Wifi.cpp
index f5f2b49..f70d59c 100644
--- a/src/wifi/Wifi.cpp
+++ b/src/wifi/Wifi.cpp
@@ -21,7 +21,7 @@
 using namespace ctx;
 
 DeviceStatusWifi::DeviceStatusWifi() :
-	BasicProvider(DEVICE_ST_SUBJ_WIFI),
+	BasicProvider(SUBJ_STATE_WIFI),
 	__lastState(UNKNOWN),
 	__isInitialized(false),
 	__isActivated(false),
@@ -124,16 +124,16 @@ bool DeviceStatusWifi::__getResponsePacket(Json* data)
 {
 	switch (__lastState) {
 	case DISABLED:
-		data->set(NULL, DEVICE_ST_STATE, DEVICE_ST_DISABLED);
+		data->set(NULL, KEY_STATE, VAL_DISABLED);
 		break;
 
 	case UNCONNECTED:
-		data->set(NULL, DEVICE_ST_STATE, DEVICE_ST_UNCONNECTED);
+		data->set(NULL, KEY_STATE, VAL_UNCONNECTED);
 		break;
 
 	case CONNECTED:
-		data->set(NULL, DEVICE_ST_STATE, DEVICE_ST_CONNECTED);
-		data->set(NULL, DEVICE_ST_BSSID, __bssid);
+		data->set(NULL, KEY_STATE, VAL_CONNECTED);
+		data->set(NULL, KEY_BSSID, __bssid);
 		break;
 
 	default:
diff --git a/src/wifi/Wifi.h b/src/wifi/Wifi.h
index 7fbe2f2..35574b0 100644
--- a/src/wifi/Wifi.h
+++ b/src/wifi/Wifi.h
@@ -20,7 +20,7 @@
 #include <string>
 #include <wifi.h>
 #include "../shared/BasicProvider.h"
-#include "../shared/SystemTypes.h"
+#include "../shared/ProviderTypes.h"
 
 namespace ctx {