diff --git a/rpcs3/Emu/SysCalls/ModuleManager.cpp b/rpcs3/Emu/SysCalls/ModuleManager.cpp
index 5e1d472032..76df8fb2f7 100644
--- a/rpcs3/Emu/SysCalls/ModuleManager.cpp
+++ b/rpcs3/Emu/SysCalls/ModuleManager.cpp
@@ -15,11 +15,6 @@ extern void cellFont_unload();
 extern Module *cellFont;
 extern void sys_net_init();
 extern Module *sys_net;
-extern void sceNpTrophy_unload();
-extern void sceNpTrophy_init();
-extern Module *sceNpTrophy;
-extern void sceNp_init();
-extern Module *sceNp;
 extern void cellUserInfo_init();
 extern Module *cellUserInfo;
 extern void cellSysutil_init();
@@ -70,6 +65,23 @@ extern void cellVpost_init();
 extern Module *cellVpost;
 extern void libmixer_init();
 extern Module *libmixer;
+extern void sceNp_init();
+extern Module *sceNp;
+extern void sceNpClans_unload();
+extern void sceNpClans_init();
+extern Module *sceNpClans;
+extern void sceNpCommerce2_unload();
+extern void sceNpCommerce2_init();
+extern Module *sceNpCommerce2;
+extern void sceNpSns_unload();
+extern void sceNpSns_init();
+extern Module *sceNpSns;
+extern void sceNpTrophy_unload();
+extern void sceNpTrophy_init();
+extern Module *sceNpTrophy;
+extern void sceNpTus_unload();
+extern void sceNpTus_init();
+extern Module *sceNpTus;
 extern void sysPrxForUser_init();
 extern Module *sysPrxForUser;
 extern void sys_fs_init();
diff --git a/rpcs3/Emu/SysCalls/Modules/sceNp.cpp b/rpcs3/Emu/SysCalls/Modules/sceNp.cpp
index f8588f7c6d..253001353c 100644
--- a/rpcs3/Emu/SysCalls/Modules/sceNp.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/sceNp.cpp
@@ -1471,844 +1471,6 @@ int sceNpLookupUserProfileAsync()
 	return CELL_OK;
 }
 
-int sceNpClansSendInvitationResponse()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansUpdateClanInfo()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansRetrieveChallenges()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansSearchByProfile()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansGetMemberInfo()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansCancelMembershipRequest()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansGetAutoAcceptStatus()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansTerm()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansDisbandClan()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansGetClanInfo()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansAddBlacklistEntry()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansLeaveClan()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansGetBlacklist()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansSendMembershipRequest()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansRemoveBlacklistEntry()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansUpdateAutoAcceptStatus()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansGetClanListByNpId()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansCancelInvitation()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansRetrieveAnnouncements()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansPostChallenge()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansGetMemberList()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansRetrievePostedChallenges()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansSendMembershipResponse()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansCreateRequest()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansInit()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansChangeMemberRole()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansCreateClan()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansKickMember()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansSearchByName()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-int sceNpClansPostAnnouncement()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansSendInvitation()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansGetClanList()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-int sceNpClansRemoveChallenge()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansRemovePostedChallenge()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansDestroyRequest()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansJoinClan()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansRemoveAnnouncement()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansAbortRequest()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpClansUpdateMemberInfo()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2DoCheckoutStartAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2GetProductInfoListGetResult()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2GetContentRatingDescriptor()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2GetBGDLAvailability()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2GetStoreBrowseUserdata()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2DestroyReq()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2Init()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2GetCategoryContentsStart()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2DoDlListFinishAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2Term()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2CreateSessionAbort()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2DoDlListStartAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2DestroyCtx()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2GetCategoryContentsCreateReq()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2AbortReq()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2GetProductInfoStart()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2CreateSessionFinish()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2GetContentInfo()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2DoProductBrowseStartAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2GetProductInfoListStart()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2DestroyGetCategoryContentsResult()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2SetBGDLAvailability()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2GetProductInfoCreateReq()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2DoProductCodeFinishAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2GetContentRatingInfoFromCategoryInfo()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2DoProductBrowseFinishAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2GetCategoryInfo()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2GetProductInfoGetResult()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2GetCategoryContentsGetResult()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2CreateSessionStart()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2DoCheckoutFinishAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2InitGetCategoryContentsResult()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2GetGameProductInfoFromGetProductInfoListResult()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2CreateCtx()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2GetPrice()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2GetGameSkuInfoFromGameProductInfo()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2DoProductCodeStartAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2InitGetProductInfoListResult()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2GetProductInfoListCreateReq()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2GetGameProductInfoFromContentInfo()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2GetContentRatingInfoFromGameProductInfo()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2ExecuteStoreBrowse()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2GetGameProductInfo()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2DestroyGetProductInfoResult()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2DestroyGetProductInfoListResult()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2InitGetProductInfoResult()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpCommerce2GetCategoryInfoFromContentInfo()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusDeleteMultiSlotDataVUser()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusGetMultiSlotVariable()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusSetMultiSlotVariableAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusSetDataVUser()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusGetMultiUserVariable()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusTryAndSetVariableVUserAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusCreateTransactionCtx()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusPollAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusAddAndGetVariableAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusTerm()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusGetMultiSlotVariableVUser()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusGetMultiSlotDataStatusVUserAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusGetMultiUserDataStatusVUser()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusDestroyTitleCtx()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusDeleteMultiSlotDataAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusAbortTransaction()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusGetMultiUserDataStatus()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusTryAndSetVariableVUser()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusGetMultiUserDataStatusVUserAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusGetDataVUserAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusDestroyTransactionCtx()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusTryAndSetVariable()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusGetDataAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusSetTimeout()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusGetMultiSlotDataStatusAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusGetMultiUserVariableVUser()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusCreateTitleCtx()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusSetData()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusGetData()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusInit()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusAddAndGetVariable()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusGetMultiUserVariableVUserAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusSetMultiSlotVariableVUserAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusSetDataVUserAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusGetMultiSlotDataStatusVUser()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusAddAndGetVariableVUserAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusGetDataVUser()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusDeleteMultiSlotVariable()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusWaitAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusGetMultiSlotVariableAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusTryAndSetVariableAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusDeleteMultiSlotVariableVUserAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusDeleteMultiSlotVariableVUser()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusGetMultiUserDataStatusAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusDeleteMultiSlotDataVUserAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusGetMultiSlotDataStatus()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusGetMultiUserVariableAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusSetMultiSlotVariable()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusDeleteMultiSlotData()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusSetDataAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusDeleteMultiSlotVariableAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusAddAndGetVariableVUser()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusSetMultiSlotVariableVUser()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
-int sceNpTusGetMultiSlotVariableVUserAsync()
-{
-	UNIMPLEMENTED_FUNC(sceNp);
-	return CELL_OK;
-}
-
 int sceNpUtilBandwidthTestShutdown()
 {
 	UNIMPLEMENTED_FUNC(sceNp);
@@ -2562,146 +1724,6 @@ void sceNp_init()
 	sceNp->AddFunc(0xfd39ae13, sceNpBasicGetFriendPresenceByNpId);
 	sceNp->AddFunc(0xfe37a7f4, sceNpManagerGetNpId);
 	sceNp->AddFunc(0xff0a2378, sceNpLookupUserProfileAsync);
-	sceNp->AddFunc(0x095e12c6, sceNpClansSendInvitationResponse);
-	sceNp->AddFunc(0x09f9e1a9, sceNpClansUpdateClanInfo);
-	sceNp->AddFunc(0x0df25834, sceNpClansRetrieveChallenges);
-	sceNp->AddFunc(0x1221a1bf, sceNpClansSearchByProfile);
-	sceNp->AddFunc(0x20472da0, sceNpClansGetMemberInfo);
-	sceNp->AddFunc(0x299ccc9b, sceNpClansCancelMembershipRequest);
-	sceNp->AddFunc(0x38dadf1f, sceNpClansGetAutoAcceptStatus);
-	sceNp->AddFunc(0x42332cb7, sceNpClansTerm);
-	sceNp->AddFunc(0x4826f6d5, sceNpClansDisbandClan);
-	sceNp->AddFunc(0x487de998, sceNpClansGetClanInfo);
-	sceNp->AddFunc(0x4d06aef7, sceNpClansAddBlacklistEntry);
-	sceNp->AddFunc(0x560f717b, sceNpClansLeaveClan);
-	sceNp->AddFunc(0x56bc5a7c, sceNpClansGetBlacklist);
-	sceNp->AddFunc(0x59743b2b, sceNpClansSendMembershipRequest);
-	sceNp->AddFunc(0x5bff9da1, sceNpClansRemoveBlacklistEntry);
-	sceNp->AddFunc(0x5da94854, sceNpClansUpdateAutoAcceptStatus);
-	sceNp->AddFunc(0x672399a8, sceNpClansGetClanListByNpId);
-	sceNp->AddFunc(0x726dffd5, sceNpClansCancelInvitation);
-	sceNp->AddFunc(0x727aa7f8, sceNpClansRetrieveAnnouncements);
-	sceNp->AddFunc(0x83d65529, sceNpClansPostChallenge);
-	sceNp->AddFunc(0x856ff5c0, sceNpClansGetMemberList);
-	sceNp->AddFunc(0x8e785b97, sceNpClansRetrievePostedChallenges);
-	sceNp->AddFunc(0x942dbdc4, sceNpClansSendMembershipResponse);
-	sceNp->AddFunc(0x9a72232d, sceNpClansCreateRequest);
-	sceNp->AddFunc(0x9b820047, sceNpClansInit);
-	sceNp->AddFunc(0x9cac2085, sceNpClansChangeMemberRole);
-	sceNp->AddFunc(0xa6a31a38, sceNpClansCreateClan);
-	sceNp->AddFunc(0xaa7912b5, sceNpClansKickMember);
-	sceNp->AddFunc(0xace0cfba, sceNpClansSearchByName);
-	sceNp->AddFunc(0xada45b84, sceNpClansPostAnnouncement);
-	sceNp->AddFunc(0xbc05ef31, sceNpClansSendInvitation);
-	sceNp->AddFunc(0xca4181b4, sceNpClansGetClanList);
-	sceNp->AddFunc(0xce6dc0f0, sceNpClansRemoveChallenge);
-	sceNp->AddFunc(0xd3346dc4, sceNpClansRemovePostedChallenge);
-	sceNp->AddFunc(0xd6551cd1, sceNpClansDestroyRequest);
-	sceNp->AddFunc(0xdbf300ca, sceNpClansJoinClan);
-	sceNp->AddFunc(0xe2590f60, sceNpClansRemoveAnnouncement);
-	sceNp->AddFunc(0xe82969e2, sceNpClansAbortRequest);
-	sceNp->AddFunc(0xf4a2d52b, sceNpClansUpdateMemberInfo);
-	sceNp->AddFunc(0x104551a6, sceNpCommerce2DoCheckoutStartAsync);
-	sceNp->AddFunc(0x146618df, sceNpCommerce2GetProductInfoListGetResult);
-	sceNp->AddFunc(0x150fdca3, sceNpCommerce2GetContentRatingDescriptor);
-	sceNp->AddFunc(0x1fa1b312, sceNpCommerce2GetStoreBrowseUserdata);
-	sceNp->AddFunc(0x2a910f05, sceNpCommerce2DestroyReq);
-	sceNp->AddFunc(0x3539d233, sceNpCommerce2Init);
-	sceNp->AddFunc(0x371a2edd, sceNpCommerce2GetCategoryContentsStart);
-	sceNp->AddFunc(0x3d627d81, sceNpCommerce2GetBGDLAvailability);
-	sceNp->AddFunc(0x410d42be, sceNpCommerce2DoDlListFinishAsync);
-	sceNp->AddFunc(0x4d4a094c, sceNpCommerce2Term);
-	sceNp->AddFunc(0x62023e98, sceNpCommerce2CreateSessionAbort);
-	sceNp->AddFunc(0x6ca9efd4, sceNpCommerce2DoDlListStartAsync);
-	sceNp->AddFunc(0x6f67ea80, sceNpCommerce2DestroyCtx);
-	sceNp->AddFunc(0x7370d8d0, sceNpCommerce2GetCategoryContentsCreateReq);
-	sceNp->AddFunc(0x8df0057f, sceNpCommerce2AbortReq);
-	sceNp->AddFunc(0x8f46325b, sceNpCommerce2GetProductInfoStart);
-	sceNp->AddFunc(0x91f8843d, sceNpCommerce2CreateSessionFinish);
-	sceNp->AddFunc(0x972ab46c, sceNpCommerce2GetContentInfo);
-	sceNp->AddFunc(0x9825a0fc, sceNpCommerce2DoProductBrowseStartAsync);
-	sceNp->AddFunc(0x9cde07cc, sceNpCommerce2GetProductInfoListStart);
-	sceNp->AddFunc(0x9d9cb96b, sceNpCommerce2DestroyGetCategoryContentsResult);
-	sceNp->AddFunc(0xa5a863fe, sceNpCommerce2SetBGDLAvailability);
-	sceNp->AddFunc(0xa975ebb4, sceNpCommerce2GetProductInfoCreateReq);
-	sceNp->AddFunc(0xa9f945b3, sceNpCommerce2DoProductCodeFinishAsync);
-	sceNp->AddFunc(0xac78c1f3, sceNpCommerce2GetContentRatingInfoFromCategoryInfo);
-	sceNp->AddFunc(0xb23e3bd1, sceNpCommerce2DoProductBrowseFinishAsync);
-	sceNp->AddFunc(0xbd49eab2, sceNpCommerce2GetCategoryInfo);
-	sceNp->AddFunc(0xbf5f58ea, sceNpCommerce2GetProductInfoGetResult);
-	sceNp->AddFunc(0xca0ea996, sceNpCommerce2GetCategoryContentsGetResult);
-	sceNp->AddFunc(0xcc18cd2c, sceNpCommerce2CreateSessionStart);
-	sceNp->AddFunc(0xd43a130e, sceNpCommerce2DoCheckoutFinishAsync);
-	sceNp->AddFunc(0xd8a473a3, sceNpCommerce2InitGetCategoryContentsResult);
-	sceNp->AddFunc(0xd9956ce7, sceNpCommerce2GetGameProductInfoFromGetProductInfoListResult);
-	sceNp->AddFunc(0xd9fdcec2, sceNpCommerce2CreateCtx);
-	sceNp->AddFunc(0xda8e322d, sceNpCommerce2GetPrice);
-	sceNp->AddFunc(0xdb19194c, sceNpCommerce2GetGameSkuInfoFromGameProductInfo);
-	sceNp->AddFunc(0xde7ab33d, sceNpCommerce2DoProductCodeStartAsync);
-	sceNp->AddFunc(0xe0f90e44, sceNpCommerce2InitGetProductInfoListResult);
-	sceNp->AddFunc(0xe1e7b5ac, sceNpCommerce2GetProductInfoListCreateReq);
-	sceNp->AddFunc(0xe51a4944, sceNpCommerce2GetGameProductInfoFromContentInfo);
-	sceNp->AddFunc(0xec324c8f, sceNpCommerce2GetContentRatingInfoFromGameProductInfo);
-	sceNp->AddFunc(0xeef51be0, sceNpCommerce2ExecuteStoreBrowse);
-	sceNp->AddFunc(0xef645654, sceNpCommerce2GetGameProductInfo);
-	sceNp->AddFunc(0xef8eafcd, sceNpCommerce2DestroyGetProductInfoResult);
-	sceNp->AddFunc(0xf6139b58, sceNpCommerce2DestroyGetProductInfoListResult);
-	sceNp->AddFunc(0xf798f5e3, sceNpCommerce2InitGetProductInfoResult);
-	sceNp->AddFunc(0xfc216890, sceNpCommerce2GetCategoryInfoFromContentInfo);
-	sceNp->AddFunc(0x01711e81, sceNpTusDeleteMultiSlotDataVUser);
-	sceNp->AddFunc(0x0423e622, sceNpTusGetMultiSlotVariable);
-	sceNp->AddFunc(0x065b610d, sceNpTusSetMultiSlotVariableAsync);
-	sceNp->AddFunc(0x0835deb2, sceNpTusSetDataVUser);
-	sceNp->AddFunc(0x0d15043b, sceNpTusGetMultiUserVariable);
-	sceNp->AddFunc(0x17db7aa7, sceNpTusTryAndSetVariableVUserAsync);
-	sceNp->AddFunc(0x1904435e, sceNpTusCreateTransactionCtx);
-	sceNp->AddFunc(0x19bce18c, sceNpTusPollAsync);
-	sceNp->AddFunc(0x1fa5c87d, sceNpTusAddAndGetVariableAsync);
-	sceNp->AddFunc(0x225aed26, sceNpTusTerm);
-	sceNp->AddFunc(0x2357ba9e, sceNpTusGetMultiSlotVariableVUser);
-	sceNp->AddFunc(0x2ab21ea9, sceNpTusGetMultiSlotDataStatusVUserAsync);
-	sceNp->AddFunc(0x2d1b9f1a, sceNpTusGetMultiUserDataStatusVUser);
-	sceNp->AddFunc(0x2e162a62, sceNpTusDestroyTitleCtx);
-	sceNp->AddFunc(0x3175af23, sceNpTusDeleteMultiSlotDataAsync);
-	sceNp->AddFunc(0x325c6284, sceNpTusAbortTransaction);
-	sceNp->AddFunc(0x348dbcb4, sceNpTusGetMultiUserDataStatus);
-	sceNp->AddFunc(0x3602bc80, sceNpTusTryAndSetVariableVUser);
-	sceNp->AddFunc(0x368fec59, sceNpTusGetMultiUserDataStatusVUserAsync);
-	sceNp->AddFunc(0x38f364b0, sceNpTusGetDataVUserAsync);
-	sceNp->AddFunc(0x44eca8b4, sceNpTusDestroyTransactionCtx);
-	sceNp->AddFunc(0x47e9424a, sceNpTusTryAndSetVariable);
-	sceNp->AddFunc(0x5175abb9, sceNpTusGetDataAsync);
-	sceNp->AddFunc(0x59432970, sceNpTusSetTimeout);
-	sceNp->AddFunc(0x651fd79f, sceNpTusGetMultiSlotDataStatusAsync);
-	sceNp->AddFunc(0x6c511024, sceNpTusGetMultiUserVariableVUser);
-	sceNp->AddFunc(0x7caf58ee, sceNpTusCreateTitleCtx);
-	sceNp->AddFunc(0x7d5f0f0e, sceNpTusSetData);
-	sceNp->AddFunc(0x8ddd0d85, sceNpTusGetData);
-	sceNp->AddFunc(0x8f87a06b, sceNpTusInit);
-	sceNp->AddFunc(0x94989003, sceNpTusAddAndGetVariable);
-	sceNp->AddFunc(0x9549d22c, sceNpTusGetMultiUserVariableVUserAsync);
-	sceNp->AddFunc(0x96a06212, sceNpTusSetMultiSlotVariableVUserAsync);
-	sceNp->AddFunc(0x9cc0cf44, sceNpTusSetDataVUserAsync);
-	sceNp->AddFunc(0xa3abfadb, sceNpTusGetMultiSlotDataStatusVUser);
-	sceNp->AddFunc(0xa7993bf3, sceNpTusAddAndGetVariableVUserAsync);
-	sceNp->AddFunc(0xae4e590e, sceNpTusGetDataVUser);
-	sceNp->AddFunc(0xaf985783, sceNpTusDeleteMultiSlotVariable);
-	sceNp->AddFunc(0xb8e8ff22, sceNpTusWaitAsync);
-	sceNp->AddFunc(0xbb2877f2, sceNpTusGetMultiSlotVariableAsync);
-	sceNp->AddFunc(0xbbb244b7, sceNpTusTryAndSetVariableAsync);
-	sceNp->AddFunc(0xc2e18da8, sceNpTusDeleteMultiSlotVariableVUserAsync);
-	sceNp->AddFunc(0xc4e51fbf, sceNpTusDeleteMultiSlotVariableVUser);
-	sceNp->AddFunc(0xc66ba67e, sceNpTusGetMultiUserDataStatusAsync);
-	sceNp->AddFunc(0xc815b219, sceNpTusDeleteMultiSlotDataVUserAsync);
-	sceNp->AddFunc(0xc848d425, sceNpTusGetMultiSlotDataStatus);
-	sceNp->AddFunc(0xcc7a31cd, sceNpTusGetMultiUserVariableAsync);
-	sceNp->AddFunc(0xcc86a8f6, sceNpTusSetMultiSlotVariable);
-	sceNp->AddFunc(0xe0719847, sceNpTusDeleteMultiSlotData);
-	sceNp->AddFunc(0xe847341f, sceNpTusSetDataAsync);
-	sceNp->AddFunc(0xf5363608, sceNpTusDeleteMultiSlotVariableAsync);
-	sceNp->AddFunc(0xf60be06f, sceNpTusAddAndGetVariableVUser);
-	sceNp->AddFunc(0xf819be91, sceNpTusSetMultiSlotVariableVUser);
-	sceNp->AddFunc(0xfc7d346e, sceNpTusGetMultiSlotVariableVUserAsync);
 	sceNp->AddFunc(0x432b3cbf, sceNpUtilBandwidthTestShutdown);
 	sceNp->AddFunc(0xc2ced2b7, sceNpUtilBandwidthTestInitStart);
 	sceNp->AddFunc(0xc880f37d, sceNpUtilBandwidthTestGetStatus);
diff --git a/rpcs3/Emu/SysCalls/Modules/sceNp.h b/rpcs3/Emu/SysCalls/Modules/sceNp.h
index da5fd62d34..f8526e476d 100644
--- a/rpcs3/Emu/SysCalls/Modules/sceNp.h
+++ b/rpcs3/Emu/SysCalls/Modules/sceNp.h
@@ -1,35 +1,37 @@
 #pragma once
 
+#include "cellRtc.h"
+
 // Error Codes
 enum
 {
 	// NP Manager Utility
-	SCE_NP_ERROR_NOT_INITIALIZED             = 0x8002aa01,
-	SCE_NP_ERROR_ALREADY_INITIALIZED         = 0x8002aa02,
-	SCE_NP_ERROR_INVALID_ARGUMENT            = 0x8002aa03,
-	SCE_NP_ERROR_OUT_OF_MEMORY               = 0x8002aa04,
-	SCE_NP_ERROR_ID_NO_SPACE                 = 0x8002aa05,
-	SCE_NP_ERROR_ID_NOT_FOUND                = 0x8002aa06,
-	SCE_NP_ERROR_SESSION_RUNNING             = 0x8002aa07,
-	SCE_NP_ERROR_LOGINID_ALREADY_EXISTS      = 0x8002aa08,
-	SCE_NP_ERROR_INVALID_TICKET_SIZE         = 0x8002aa09,
-	SCE_NP_ERROR_INVALID_STATE               = 0x8002aa0a,
-	SCE_NP_ERROR_ABORTED                     = 0x8002aa0b,
-	SCE_NP_ERROR_OFFLINE                     = 0x8002aa0c,
-	SCE_NP_ERROR_VARIANT_ACCOUNT_ID          = 0x8002aa0d,
-	SCE_NP_ERROR_GET_CLOCK                   = 0x8002aa0e,
-	SCE_NP_ERROR_INSUFFICIENT_BUFFER         = 0x8002aa0f,
-	SCE_NP_ERROR_EXPIRED_TICKET              = 0x8002aa10,
-	SCE_NP_ERROR_TICKET_PARAM_NOT_FOUND      = 0x8002aa11,
-	SCE_NP_ERROR_UNSUPPORTED_TICKET_VERSION  = 0x8002aa12,
-	SCE_NP_ERROR_TICKET_STATUS_CODE_INVALID  = 0x8002aa13,
-	SCE_NP_ERROR_INVALID_TICKET_VERSION      = 0x8002aa14,
-	SCE_NP_ERROR_ALREADY_USED                = 0x8002aa15,
-	SCE_NP_ERROR_DIFFERENT_USER              = 0x8002aa16,
-	SCE_NP_ERROR_ALREADY_DONE                = 0x8002aa17,
+	SCE_NP_ERROR_NOT_INITIALIZED            = 0x8002aa01,
+	SCE_NP_ERROR_ALREADY_INITIALIZED        = 0x8002aa02,
+	SCE_NP_ERROR_INVALID_ARGUMENT           = 0x8002aa03,
+	SCE_NP_ERROR_OUT_OF_MEMORY              = 0x8002aa04,
+	SCE_NP_ERROR_ID_NO_SPACE                = 0x8002aa05,
+	SCE_NP_ERROR_ID_NOT_FOUND               = 0x8002aa06,
+	SCE_NP_ERROR_SESSION_RUNNING            = 0x8002aa07,
+	SCE_NP_ERROR_LOGINID_ALREADY_EXISTS     = 0x8002aa08,
+	SCE_NP_ERROR_INVALID_TICKET_SIZE        = 0x8002aa09,
+	SCE_NP_ERROR_INVALID_STATE              = 0x8002aa0a,
+	SCE_NP_ERROR_ABORTED                    = 0x8002aa0b,
+	SCE_NP_ERROR_OFFLINE                    = 0x8002aa0c,
+	SCE_NP_ERROR_VARIANT_ACCOUNT_ID         = 0x8002aa0d,
+	SCE_NP_ERROR_GET_CLOCK                  = 0x8002aa0e,
+	SCE_NP_ERROR_INSUFFICIENT_BUFFER        = 0x8002aa0f,
+	SCE_NP_ERROR_EXPIRED_TICKET             = 0x8002aa10,
+	SCE_NP_ERROR_TICKET_PARAM_NOT_FOUND     = 0x8002aa11,
+	SCE_NP_ERROR_UNSUPPORTED_TICKET_VERSION = 0x8002aa12,
+	SCE_NP_ERROR_TICKET_STATUS_CODE_INVALID = 0x8002aa13,
+	SCE_NP_ERROR_INVALID_TICKET_VERSION     = 0x8002aa14,
+	SCE_NP_ERROR_ALREADY_USED               = 0x8002aa15,
+	SCE_NP_ERROR_DIFFERENT_USER             = 0x8002aa16,
+	SCE_NP_ERROR_ALREADY_DONE               = 0x8002aa17,
 };
 
-// NP Manager Utility: Status
+// NP Manager Utility statuses
 enum
 {
 	SCE_NP_MANAGER_STATUS_OFFLINE         = -1,
@@ -39,22 +41,1857 @@ enum
 	SCE_NP_MANAGER_STATUS_ONLINE          = 3,
 };
 
+// IDs for attachment data objects
 enum
 {
-	SCE_NP_COMMUNICATION_SIGNATURE_SIZE      = 160,
-	SCE_NET_NP_COMMUNICATION_PASSPHRASE_SIZE = 128,
+	SCE_NP_BASIC_INVALID_ATTACHMENT_DATA_ID = 0,
+	SCE_NP_BASIC_SELECTED_INVITATION_DATA   = 1,
+	SCE_NP_BASIC_SELECTED_MESSAGE_DATA      = 2,
 };
 
-// Structs
+// Actions made in system GUI
+enum
+{
+	SCE_NP_BASIC_MESSAGE_ACTION_UNKNOWN = 0,
+	SCE_NP_BASIC_MESSAGE_ACTION_USE     = 1,
+	SCE_NP_BASIC_MESSAGE_ACTION_ACCEPT  = 2,
+	SCE_NP_BASIC_MESSAGE_ACTION_DENY    = 3,
+};
+
+// Main types of messages
+enum
+{
+	SCE_NP_BASIC_MESSAGE_MAIN_TYPE_DATA_ATTACHMENT = 0,
+	SCE_NP_BASIC_MESSAGE_MAIN_TYPE_GENERAL         = 1,
+	SCE_NP_BASIC_MESSAGE_MAIN_TYPE_ADD_FRIEND      = 2,
+	SCE_NP_BASIC_MESSAGE_MAIN_TYPE_INVITE          = 3,
+	SCE_NP_BASIC_MESSAGE_MAIN_TYPE_CUSTOM_DATA     = 4,
+	SCE_NP_BASIC_MESSAGE_MAIN_TYPE_URL_ATTACHMENT  = 5,
+};
+
+// Sub types of messages
+enum
+{
+	SCE_NP_BASIC_MESSAGE_DATA_ATTACHMENT_SUBTYPE_ACTION_USE = 0,
+	SCE_NP_BASIC_MESSAGE_GENERAL_SUBTYPE_NONE               = 0,
+	SCE_NP_BASIC_MESSAGE_ADD_FRIEND_SUBTYPE_NONE            = 0,
+	SCE_NP_BASIC_MESSAGE_INVITE_SUBTYPE_ACTION_ACCEPT_DENY  = 0,
+	SCE_NP_BASIC_MESSAGE_CUSTOM_DATA_SUBTYPE_ACTION_USE     = 0,
+	SCE_NP_BASIC_MESSAGE_URL_ATTACHMENT_SUBTYPE_ACTION_USE  = 0,
+	SCE_NP_BASIC_MESSAGE_INVITE_SUBTYPE_ACTION_ACCEPT       = 1,
+};
+
+// Applicable features of messages
+enum
+{
+	SCE_NP_BASIC_MESSAGE_FEATURES_MULTI_RECEIPIENTS = 0x00000001,
+	SCE_NP_BASIC_MESSAGE_FEATURES_BOOTABLE          = 0x00000002,
+	SCE_NP_BASIC_MESSAGE_FEATURES_ASSUME_SEND       = 0x00000004,
+};
+
+// Types of messages
+enum
+{
+	SCE_NP_BASIC_MESSAGE_INFO_TYPE_MESSAGE_ATTACHMENT           = 0,
+	SCE_NP_BASIC_MESSAGE_INFO_TYPE_MATCHING_INVITATION          = 1,
+	SCE_NP_BASIC_MESSAGE_INFO_TYPE_CLAN_MESSAGE                 = 3,
+	SCE_NP_BASIC_MESSAGE_INFO_TYPE_CUSTOM_DATA_MESSAGE          = 4,
+	SCE_NP_BASIC_MESSAGE_INFO_TYPE_ANY_UNREAD_MESSAGE           = 5,
+	SCE_NP_BASIC_MESSAGE_INFO_TYPE_BOOTABLE_INVITATION          = 6,
+	SCE_NP_BASIC_MESSAGE_INFO_TYPE_BOOTABLE_CUSTOM_DATA_MESSAGE = 7,
+};
+
+// Comparison operator specified as the search condition
+enum
+{
+	SCE_NP_MATCHING2_OPERATOR_EQ = 1,
+	SCE_NP_MATCHING2_OPERATOR_NE = 2,
+	SCE_NP_MATCHING2_OPERATOR_LT = 3,
+	SCE_NP_MATCHING2_OPERATOR_LE = 4,
+	SCE_NP_MATCHING2_OPERATOR_GT = 5,
+	SCE_NP_MATCHING2_OPERATOR_GE = 6,
+};
+
+// Message cast type
+enum
+{
+	SCE_NP_MATCHING2_CASTTYPE_BROADCAST      = 1,
+	SCE_NP_MATCHING2_CASTTYPE_UNICAST        = 2,
+	SCE_NP_MATCHING2_CASTTYPE_MULTICAST      = 3,
+	SCE_NP_MATCHING2_CASTTYPE_MULTICAST_TEAM = 4,
+};
+
+// Session type
+enum
+{
+	SCE_NP_MATCHING2_SESSION_TYPE_LOBBY = 1,
+	SCE_NP_MATCHING2_SESSION_TYPE_ROOM  = 2,
+};
+
+// Signaling type
+enum
+{
+	SCE_NP_MATCHING2_SIGNALING_TYPE_NONE = 0,
+	SCE_NP_MATCHING2_SIGNALING_TYPE_MESH = 1,
+	SCE_NP_MATCHING2_SIGNALING_TYPE_STAR = 2,
+};
+
+// Event cause
+enum
+{
+	SCE_NP_MATCHING2_EVENT_CAUSE_LEAVE_ACTION       = 1,
+	SCE_NP_MATCHING2_EVENT_CAUSE_KICKOUT_ACTION     = 2,
+	SCE_NP_MATCHING2_EVENT_CAUSE_GRANT_OWNER_ACTION = 3,
+	SCE_NP_MATCHING2_EVENT_CAUSE_SERVER_OPERATION   = 4,
+	SCE_NP_MATCHING2_EVENT_CAUSE_MEMBER_DISAPPEARED = 5,
+	SCE_NP_MATCHING2_EVENT_CAUSE_SERVER_INTERNAL    = 6,
+	SCE_NP_MATCHING2_EVENT_CAUSE_CONNECTION_ERROR   = 7,
+	SCE_NP_MATCHING2_EVENT_CAUSE_NP_SIGNED_OUT      = 8,
+	SCE_NP_MATCHING2_EVENT_CAUSE_SYSTEM_ERROR       = 9,
+	SCE_NP_MATCHING2_EVENT_CAUSE_CONTEXT_ERROR      = 10,
+	SCE_NP_MATCHING2_EVENT_CAUSE_CONTEXT_ACTION     = 11,
+};
+
+// Server status
+enum
+{
+	SCE_NP_MATCHING2_SERVER_STATUS_AVAILABLE   = 1,
+	SCE_NP_MATCHING2_SERVER_STATUS_UNAVAILABLE = 2,
+	SCE_NP_MATCHING2_SERVER_STATUS_BUSY        = 3,
+	SCE_NP_MATCHING2_SERVER_STATUS_MAINTENANCE = 4,
+};
+
+// Member role
+enum
+{
+	SCE_NP_MATCHING2_ROLE_MEMBER = 1,
+	SCE_NP_MATCHING2_ROLE_OWNER  = 2,
+};
+
+// Status of kicked-out member with regards to rejoining
+enum
+{
+	SCE_NP_MATCHING2_BLOCKKICKFLAG_OK = 0,
+	SCE_NP_MATCHING2_BLOCKKICKFLAG_NG = 1,
+};
+
+// Sort method
+enum
+{
+	SCE_NP_MATCHING2_SORT_METHOD_JOIN_DATE   = 0,
+	SCE_NP_MATCHING2_SORT_METHOD_SLOT_NUMBER = 1,
+};
+
+// Context options (matching)
+enum
+{
+	SCE_NP_MATCHING2_CONTEXT_OPTION_USE_ONLINENAME = 0x01,
+	SCE_NP_MATCHING2_CONTEXT_OPTION_USE_AVATARURL  = 0x02,
+};
+
+// User information acquisition option
+enum
+{
+	SCE_NP_MATCHING2_GET_USER_INFO_LIST_OPTION_WITH_ONLINENAME = 0x01,
+	SCE_NP_MATCHING2_GET_USER_INFO_LIST_OPTION_WITH_AVATARURL  = 0x02,
+};
+
+// Room search options
+enum
+{
+	SCE_NP_MATCHING2_SEARCH_ROOM_OPTION_WITH_NPID       = 0x01,
+	SCE_NP_MATCHING2_SEARCH_ROOM_OPTION_WITH_ONLINENAME = 0x02,
+	SCE_NP_MATCHING2_SEARCH_ROOM_OPTION_WITH_AVATARURL  = 0x04,
+	SCE_NP_MATCHING2_SEARCH_ROOM_OPTION_NAT_TYPE_FILTER = 0x08,
+	SCE_NP_MATCHING2_SEARCH_ROOM_OPTION_RANDOM          = 0x10,
+};
+
+// Send options
+enum
+{
+	SCE_NP_MATCHING2_SEND_MSG_OPTION_WITH_NPID       = 0x01,
+	SCE_NP_MATCHING2_SEND_MSG_OPTION_WITH_ONLINENAME = 0x02,
+	SCE_NP_MATCHING2_SEND_MSG_OPTION_WITH_AVATARURL  = 0x04,
+};
+
+// Flag-type lobby attribute
+enum
+{
+	SCE_NP_MATCHING2_LOBBY_FLAG_ATTR_PERMANENT           = 0x80000000,
+	SCE_NP_MATCHING2_LOBBY_FLAG_ATTR_CLAN                = 0x40000000,
+	SCE_NP_MATCHING2_LOBBY_FLAG_ATTR_MEMBER_NOTIFICATION = 0x20000000,
+};
+
+// Attribute ID of lobby member internal binary attribute
+enum
+{
+	SCE_NP_MATCHING2_LOBBYMEMBER_BIN_ATTR_INTERNAL_1_ID = 0x0039,
+};
+
+// Flag-type room attribute
+enum
+{
+	SCE_NP_MATCHING2_ROOM_FLAG_ATTR_OWNER_AUTO_GRANT     = 0x80000000,
+	SCE_NP_MATCHING2_ROOM_FLAG_ATTR_CLOSED               = 0x40000000,
+	SCE_NP_MATCHING2_ROOM_FLAG_ATTR_FULL                 = 0x20000000,
+	SCE_NP_MATCHING2_ROOM_FLAG_ATTR_HIDDEN               = 0x10000000,
+	SCE_NP_MATCHING2_ROOM_FLAG_ATTR_NAT_TYPE_RESTRICTION = 0x04000000,
+	SCE_NP_MATCHING2_ROOM_FLAG_ATTR_PROHIBITIVE_MODE     = 0x02000000,
+};
+
+// Flah-type room member attribute
+enum
+{
+	SCE_NP_MATCHING2_ROOMMEMBER_FLAG_ATTR_OWNER = 0x80000000,
+};
+
+// ID of external room search integer attribute
+enum
+{
+	SCE_NP_MATCHING2_ROOM_SEARCHABLE_INT_ATTR_EXTERNAL_1_ID = 0x004c,
+	SCE_NP_MATCHING2_ROOM_SEARCHABLE_INT_ATTR_EXTERNAL_2_ID = 0x004d,
+	SCE_NP_MATCHING2_ROOM_SEARCHABLE_INT_ATTR_EXTERNAL_3_ID = 0x004e,
+	SCE_NP_MATCHING2_ROOM_SEARCHABLE_INT_ATTR_EXTERNAL_4_ID = 0x004f,
+	SCE_NP_MATCHING2_ROOM_SEARCHABLE_INT_ATTR_EXTERNAL_5_ID = 0x0050,
+	SCE_NP_MATCHING2_ROOM_SEARCHABLE_INT_ATTR_EXTERNAL_6_ID = 0x0051,
+	SCE_NP_MATCHING2_ROOM_SEARCHABLE_INT_ATTR_EXTERNAL_7_ID = 0x0052,
+	SCE_NP_MATCHING2_ROOM_SEARCHABLE_INT_ATTR_EXTERNAL_8_ID = 0x0053,
+};
+
+// ID of external room search binary attribute
+enum
+{
+	SCE_NP_MATCHING2_ROOM_SEARCHABLE_BIN_ATTR_EXTERNAL_1_ID = 0x0054,
+};
+
+// ID of external room binary attribute
+enum
+{
+	SCE_NP_MATCHING2_ROOM_BIN_ATTR_EXTERNAL_1_ID = 0x0055,
+	SCE_NP_MATCHING2_ROOM_BIN_ATTR_EXTERNAL_2_ID = 0x0056,
+};
+
+// ID of internal room binary attribute
+enum
+{
+	SCE_NP_MATCHING2_ROOM_BIN_ATTR_INTERNAL_1_ID = 0x0057,
+	SCE_NP_MATCHING2_ROOM_BIN_ATTR_INTERNAL_2_ID = 0x0058,
+};
+
+// ID of internal room member binary attribute
+enum
+{
+	SCE_NP_MATCHING2_ROOMMEMBER_BIN_ATTR_INTERNAL_1_ID = 0x0059,
+};
+
+// Attribute ID of user binary attribute
+enum
+{
+	SCE_NP_MATCHING2_USER_BIN_ATTR_1_ID = 0x005f,
+};
+
+// Event of request functions
+enum
+{
+	SCE_NP_MATCHING2_REQUEST_EVENT_GetServerInfo                  = 0x0001,
+	SCE_NP_MATCHING2_REQUEST_EVENT_GetWorldInfoList               = 0x0002,
+	SCE_NP_MATCHING2_REQUEST_EVENT_GetRoomMemberDataExternalList  = 0x0003,
+	SCE_NP_MATCHING2_REQUEST_EVENT_SetRoomDataExternal            = 0x0004,
+	SCE_NP_MATCHING2_REQUEST_EVENT_GetRoomDataExternalList        = 0x0005,
+	SCE_NP_MATCHING2_REQUEST_EVENT_GetLobbyInfoList               = 0x0006,
+	SCE_NP_MATCHING2_REQUEST_EVENT_SetUserInfo                    = 0x0007,
+	SCE_NP_MATCHING2_REQUEST_EVENT_GetUserInfoList                = 0x0008,
+	SCE_NP_MATCHING2_REQUEST_EVENT_CreateServerContext            = 0x0009,
+	SCE_NP_MATCHING2_REQUEST_EVENT_DeleteServerContext            = 0x000a,
+	SCE_NP_MATCHING2_REQUEST_EVENT_CreateJoinRoom                 = 0x0101,
+	SCE_NP_MATCHING2_REQUEST_EVENT_JoinRoom                       = 0x0102,
+	SCE_NP_MATCHING2_REQUEST_EVENT_LeaveRoom                      = 0x0103,
+	SCE_NP_MATCHING2_REQUEST_EVENT_GrantRoomOwner                 = 0x0104,
+	SCE_NP_MATCHING2_REQUEST_EVENT_KickoutRoomMember              = 0x0105,
+	SCE_NP_MATCHING2_REQUEST_EVENT_SearchRoom                     = 0x0106,
+	SCE_NP_MATCHING2_REQUEST_EVENT_SendRoomChatMessage            = 0x0107,
+	SCE_NP_MATCHING2_REQUEST_EVENT_SendRoomMessage                = 0x0108,
+	SCE_NP_MATCHING2_REQUEST_EVENT_SetRoomDataInternal            = 0x0109,
+	SCE_NP_MATCHING2_REQUEST_EVENT_GetRoomDataInternal            = 0x010a,
+	SCE_NP_MATCHING2_REQUEST_EVENT_SetRoomMemberDataInternal      = 0x010b,
+	SCE_NP_MATCHING2_REQUEST_EVENT_GetRoomMemberDataInternal      = 0x010c,
+	SCE_NP_MATCHING2_REQUEST_EVENT_SetSignalingOptParam           = 0x010d,
+	SCE_NP_MATCHING2_REQUEST_EVENT_JoinLobby                      = 0x0201,
+	SCE_NP_MATCHING2_REQUEST_EVENT_LeaveLobby                     = 0x0202,
+	SCE_NP_MATCHING2_REQUEST_EVENT_SendLobbyChatMessage           = 0x0203,
+	SCE_NP_MATCHING2_REQUEST_EVENT_SendLobbyInvitation            = 0x0204,
+	SCE_NP_MATCHING2_REQUEST_EVENT_SetLobbyMemberDataInternal     = 0x0205,
+	SCE_NP_MATCHING2_REQUEST_EVENT_GetLobbyMemberDataInternal     = 0x0206,
+	SCE_NP_MATCHING2_REQUEST_EVENT_GetLobbyMemberDataInternalList = 0x0207,
+	SCE_NP_MATCHING2_REQUEST_EVENT_SignalingGetPingInfo           = 0x0e01,
+};
+
+// Room event
+enum
+{
+	SCE_NP_MATCHING2_ROOM_EVENT_MemberJoined                  = 0x1101,
+	SCE_NP_MATCHING2_ROOM_EVENT_MemberLeft                    = 0x1102,
+	SCE_NP_MATCHING2_ROOM_EVENT_Kickedout                     = 0x1103,
+	SCE_NP_MATCHING2_ROOM_EVENT_RoomDestroyed                 = 0x1104,
+	SCE_NP_MATCHING2_ROOM_EVENT_RoomOwnerChanged              = 0x1105,
+	SCE_NP_MATCHING2_ROOM_EVENT_UpdatedRoomDataInternal       = 0x1106,
+	SCE_NP_MATCHING2_ROOM_EVENT_UpdatedRoomMemberDataInternal = 0x1107,
+	SCE_NP_MATCHING2_ROOM_EVENT_UpdatedSignalingOptParam      = 0x1108,
+};
+
+// Room message event
+enum
+{
+	SCE_NP_MATCHING2_ROOM_MSG_EVENT_ChatMessage = 0x2101,
+	SCE_NP_MATCHING2_ROOM_MSG_EVENT_Message     = 0x2102,
+};
+
+// Lobby event
+enum
+{
+	SCE_NP_MATCHING2_LOBBY_EVENT_MemberJoined                   = 0x3201,
+	SCE_NP_MATCHING2_LOBBY_EVENT_MemberLeft                     = 0x3202,
+	SCE_NP_MATCHING2_LOBBY_EVENT_LobbyDestroyed                 = 0x3203,
+	SCE_NP_MATCHING2_LOBBY_EVENT_UpdatedLobbyMemberDataInternal = 0x3204,
+};
+
+// Lobby message event
+enum
+{
+	SCE_NP_MATCHING2_LOBBY_MSG_EVENT_ChatMessage = 0x4201,
+	SCE_NP_MATCHING2_LOBBY_MSG_EVENT_Invitation  = 0x4202,
+};
+
+// Signaling event
+enum
+{
+	SCE_NP_MATCHING2_SIGNALING_EVENT_Dead        = 0x5101,
+	SCE_NP_MATCHING2_SIGNALING_EVENT_Established = 0x5102,
+};
+
+// Context event
+enum
+{
+	SCE_NP_MATCHING2_CONTEXT_EVENT_StartOver = 0x6f01,
+	SCE_NP_MATCHING2_CONTEXT_EVENT_Start     = 0x6f02,
+	SCE_NP_MATCHING2_CONTEXT_EVENT_Stop      = 0x6f03,
+};
+
+// Context options (signaling)
+enum
+{
+	SCE_NP_SIGNALING_CTX_OPT_BANDWIDTH_PROBE_DISABLE = 0,
+	SCE_NP_SIGNALING_CTX_OPT_BANDWIDTH_PROBE_ENABLE  = 1,
+	SCE_NP_SIGNALING_CTX_OPT_BANDWIDTH_PROBE         = 1,
+};
+
+// Event types (including extended ones)
+enum
+{
+	SCE_NP_SIGNALING_EVENT_DEAD                 = 0,
+	SCE_NP_SIGNALING_EVENT_ESTABLISHED          = 1,
+	SCE_NP_SIGNALING_EVENT_NETINFO_ERROR        = 2,
+	SCE_NP_SIGNALING_EVENT_NETINFO_RESULT       = 3,
+	SCE_NP_SIGNALING_EVENT_EXT_PEER_ACTIVATED   = 10,
+	SCE_NP_SIGNALING_EVENT_EXT_PEER_DEACTIVATED = 11,
+	SCE_NP_SIGNALING_EVENT_EXT_MUTUAL_ACTIVATED = 12,
+};
+
+// Connection states
+enum
+{
+	SCE_NP_SIGNALING_CONN_STATUS_INACTIVE = 0,
+	SCE_NP_SIGNALING_CONN_STATUS_PENDING  = 1,
+	SCE_NP_SIGNALING_CONN_STATUS_ACTIVE   = 2,
+};
+
+// Connection information to obtain
+enum
+{
+	SCE_NP_SIGNALING_CONN_INFO_RTT            = 1,
+	SCE_NP_SIGNALING_CONN_INFO_BANDWIDTH      = 2,
+	SCE_NP_SIGNALING_CONN_INFO_PEER_NPID      = 3,
+	SCE_NP_SIGNALING_CONN_INFO_PEER_ADDRESS   = 4,
+	SCE_NP_SIGNALING_CONN_INFO_MAPPED_ADDRESS = 5,
+	SCE_NP_SIGNALING_CONN_INFO_PACKET_LOSS    = 6,
+};
+
+// NAT status type
+enum
+{
+	SCE_NP_SIGNALING_NETINFO_NAT_STATUS_UNKNOWN = 0,
+	SCE_NP_SIGNALING_NETINFO_NAT_STATUS_TYPE1   = 1,
+	SCE_NP_SIGNALING_NETINFO_NAT_STATUS_TYPE2   = 2,
+	SCE_NP_SIGNALING_NETINFO_NAT_STATUS_TYPE3   = 3,
+};
+
+// UPnP status
+enum
+{
+	SCE_NP_SIGNALING_NETINFO_UPNP_STATUS_UNKNOWN = 0,
+	SCE_NP_SIGNALING_NETINFO_UPNP_STATUS_INVALID = 1,
+	SCE_NP_SIGNALING_NETINFO_UPNP_STATUS_VALID   = 2,
+};
+
+// NP port status
+enum
+{
+	SCE_NP_SIGNALING_NETINFO_NPPORT_STATUS_CLOSED = 0,
+	SCE_NP_SIGNALING_NETINFO_NPPORT_STATUS_OPEN   = 1,
+};
+
+// Constants for common NP functions and structures
+enum
+{
+	SCE_NET_NP_AVATAR_IMAGE_MAX_SIZE         = 204800,
+	SCE_NET_NP_AVATAR_IMAGE_MAX_SIZE_LARGE   = 204800,
+	SCE_NET_NP_AVATAR_IMAGE_MAX_SIZE_MIDDLE  = 102400,
+	SCE_NET_NP_AVATAR_IMAGE_MAX_SIZE_SMALL   = 10240,
+	SCE_NET_NP_AVATAR_URL_MAX_LENGTH         = 127,
+	SCE_NET_NP_ONLINEID_MIN_LENGTH           = 3,
+	SCE_NET_NP_ONLINEID_MAX_LENGTH           = 16,
+	SCE_NET_NP_ONLINENAME_MAX_LENGTH         = 48,
+	SCE_NET_NP_ABOUT_ME_MAX_LENGTH           = 63,
+	SCE_NP_FRIEND_MAX_NUM                    = 100,
+	SCE_NET_NP_COMMUNICATION_PASSPHRASE_SIZE = 128,
+	SCE_NP_COMMUNICATION_SIGNATURE_SIZE      = 160,
+	SCE_NP_COMMUNICATION_PASSPHRASE_SIZE     = SCE_NET_NP_COMMUNICATION_PASSPHRASE_SIZE,
+};
+
+// Constants for basic NP functions and structures
+enum
+{
+	SCE_NP_BASIC_MAX_MESSAGE_SIZE                       = 512,
+	SCE_NP_BASIC_MAX_PRESENCE_SIZE                      = 128,
+	SCE_NP_BASIC_MAX_MESSAGE_ATTACHMENT_SIZE            = 1048576,
+	SCE_NP_BASIC_SUBJECT_CHARACTER_MAX                  = 18,
+	SCE_NP_BASIC_BODY_CHARACTER_MAX                     = 512,
+	SCE_NP_BASIC_DESCRIPTION_CHARACTER_MAX              = 341,
+	SCE_NP_BASIC_SEND_MESSAGE_MAX_RECIPIENTS            = 12,
+	SCE_NP_BASIC_PRESENCE_TITLE_SIZE_MAX                = 128,
+	SCE_NP_BASIC_PRESENCE_STATUS_SIZE_MAX               = 64,
+	SCE_NP_BASIC_PRESENCE_STATUS_CHARACTER_MAX          = 21,
+	SCE_NP_BASIC_PRESENCE_EXTENDED_STATUS_SIZE_MAX      = 192,
+	SCE_NP_BASIC_PRESENCE_EXTENDED_STATUS_CHARACTER_MAX = 63,
+	SCE_NP_BASIC_PRESENCE_COMMENT_SIZE_MAX              = 64,
+	SCE_NP_BASIC_MAX_INVITATION_DATA_SIZE               = 1024,
+	SCE_NP_BASIC_MAX_URL_ATTACHMENT_SIZE                = 2048,
+	SCE_NP_BASIC_PLAYER_HISTORY_MAX_PLAYERS             = 8,
+};
+
+// Common constants of sceNpClans
+enum
+{
+	SCE_NP_CLANS_CLAN_NAME_MAX_LENGTH        = 64,
+	SCE_NP_CLANS_CLAN_TAG_MAX_LENGTH         = 8,
+	SCE_NP_CLANS_CLAN_DESCRIPTION_MAX_LENGTH = 255,
+};
+
+// Constants for custom menu functions and structures
+enum
+{
+	SCE_NP_CUSTOM_MENU_ACTION_CHARACTER_MAX = 21,
+	SCE_NP_CUSTOM_MENU_ACTION_ITEMS_MAX = 7,
+	SCE_NP_CUSTOM_MENU_ACTION_ITEMS_TOTAL_MAX = 16,
+	SCE_NP_CUSTOM_MENU_EXCEPTION_ITEMS_MAX = 256,
+};
+
+// Constants for manager functions and structures
+enum
+{
+	SCE_NP_COOKIE_MAX_SIZE       = 1024,
+	SCE_NP_TICKET_MAX_SIZE       = 65536,
+	SCE_NP_TICKET_PARAM_DATA_LEN = 256,
+	SCE_NP_ENTITLEMENT_ID_SIZE   = 32,
+};
+
+// Constants for matching functions and structures
+enum
+{
+	SCE_NP_MATCHING2_ALLOWED_USER_MAX                                      = 100,
+	SCE_NP_MATCHING2_BLOCKED_USER_MAX                                      = 100,
+	SCE_NP_MATCHING2_CHAT_MSG_MAX_SIZE                                     = 1024,
+	SCE_NP_MATCHING2_BIN_MSG_MAX_SIZE                                      = 1024,
+	SCE_NP_MATCHING2_GROUP_LABEL_SIZE                                      = 8,
+	SCE_NP_MATCHING2_INVITATION_OPTION_DATA_MAX_SIZE                       = 32,
+	SCE_NP_MATCHING2_INVITATION_TARGET_SESSION_MAX                         = 2,
+	SCE_NP_MATCHING2_LOBBY_MEMBER_DATA_INTERNAL_LIST_MAX                   = 256,
+	SCE_NP_MATCHING2_LOBBY_MEMBER_DATA_INTERNAL_EXTENDED_DATA_LIST_MAX     = 64,
+	SCE_NP_MATCHING2_LOBBYMEMBER_BIN_ATTR_INTERNAL_NUM                     = 1,
+	SCE_NP_MATCHING2_LOBBYMEMBER_BIN_ATTR_INTERNAL_MAX_SIZE                = 64,
+	SCE_NP_MATCHING2_LOBBY_MAX_SLOT                                        = 256,
+	SCE_NP_MATCHING2_PRESENCE_OPTION_DATA_SIZE                             = 16,
+	SCE_NP_MATCHING2_RANGE_FILTER_START_INDEX_MIN                          = 1,
+	SCE_NP_MATCHING2_RANGE_FILTER_MAX                                      = 20,
+	SCE_NP_MATCHING2_ROOM_MAX_SLOT                                         = 64,
+	SCE_NP_MATCHING2_ROOM_GROUP_ID_MAX                                     = 15,
+	SCE_NP_MATCHING2_ROOM_BIN_ATTR_EXTERNAL_NUM                            = 2,
+	SCE_NP_MATCHING2_ROOM_BIN_ATTR_EXTERNAL_MAX_SIZE                       = 256,
+	SCE_NP_MATCHING2_ROOM_BIN_ATTR_INTERNAL_NUM                            = 2,
+	SCE_NP_MATCHING2_ROOM_BIN_ATTR_INTERNAL_MAX_SIZE                       = 256,
+	SCE_NP_MATCHING2_ROOM_SEARCHABLE_INT_ATTR_EXTERNAL_NUM                 = 8,
+	SCE_NP_MATCHING2_ROOM_SEARCHABLE_BIN_ATTR_EXTERNAL_MAX_SIZE            = 64,
+	SCE_NP_MATCHING2_ROOMMEMBER_BIN_ATTR_INTERNAL_NUM                      = 1,
+	SCE_NP_MATCHING2_ROOMMEMBER_BIN_ATTR_INTERNAL_MAX_SIZE                 = 64,
+	SCE_NP_MATCHING2_SESSION_PASSWORD_SIZE                                 = 8,
+	SCE_NP_MATCHING2_USER_BIN_ATTR_NUM                                     = 1,
+	SCE_NP_MATCHING2_USER_BIN_ATTR_MAX_SIZE                                = 128,
+	SCE_NP_MATCHING2_GET_USER_INFO_LIST_NPID_NUM_MAX                       = 25,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_GetServerInfo                     = 4,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_GetWorldInfoList                  = 3848,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_GetRoomMemberDataExternalList     = 15624,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_GetRoomDataExternalList           = 25768,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_GetLobbyInfoList                  = 1296,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_GetUserInfoList                   = 17604,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_CreateJoinRoom                    = 25224,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_JoinRoom                          = 25224,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_SearchRoom                        = 25776,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_SendRoomChatMessage               = 1,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_GetRoomDataInternal               = 25224,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_GetRoomMemberDataInternal         = 372,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_JoinLobby                         = 1124,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_SendLobbyChatMessage              = 1,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_GetLobbyMemberDataInternal        = 672,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_GetLobbyMemberDataInternalList    = 42760,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_SignalingGetPingInfo              = 40,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_RoomMemberUpdateInfo              = 396,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_RoomUpdateInfo                    = 28,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_RoomOwnerUpdateInfo               = 40,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_RoomDataInternalUpdateInfo        = 26208,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_RoomMemberDataInternalUpdateInfo  = 493,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_SignalingOptParamUpdateInfo       = 8,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_RoomMessageInfo                   = 1407,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_LobbyMemberUpdateInfo             = 696,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_LobbyUpdateInfo                   = 8,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_LobbyMemberDataInternalUpdateInfo = 472,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_LobbyMessageInfo                  = 1790,
+	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_LobbyInvitationInfo               = 870,
+};
+
+// Constants for ranking (score) functions and structures
+enum
+{
+	SCE_NP_SCORE_COMMENT_MAXLEN          = 63,
+	SCE_NP_SCORE_CENSOR_COMMENT_MAXLEN   = 255,
+	SCE_NP_SCORE_SANITIZE_COMMENT_MAXLEN = 255,
+	SCE_NP_SCORE_GAMEINFO_SIZE           = 64,
+	SCE_NP_SCORE_MAX_CTX_NUM             = 32,
+	SCE_NP_SCORE_MAX_RANGE_NUM_PER_TRANS = 100,
+	SCE_NP_SCORE_MAX_NPID_NUM_PER_TRANS  = 101,
+	SCE_NP_SCORE_MAX_CLAN_NUM_PER_TRANS  = 101,
+};
+
+// Constants for signaling functions and structures
+enum
+{
+	SCE_NP_SIGNALING_CTX_MAX = 8,
+};
+
+// NP communication ID structure
 struct SceNpCommunicationId
 {
-	char data[9];
-	char term;
+	s8 data[9];
+	s8 term;
 	u8 num;
-	char dummy;
+	//s8 dummy;
 };
 
+// OnlineId structure
+struct SceNpOnlineId
+{
+	s8 data[16];
+	s8 term;
+	//s8 dummy[3];
+};
+
+// NP ID structure
+struct SceNpId
+{
+	SceNpOnlineId handle;
+	//u8 opt[8];
+	//u8 reserved[8];
+};
+
+// Online Name structure
+struct SceNpOnlineName
+{
+	s8 data[48];
+	s8 term;
+	s8 padding[3];
+};
+
+// Avatar structure
+struct SceNpAvatarUrl
+{
+	s8 data[127];
+	s8 term;
+};
+
+// Avatar image structure
+struct SceNpAvatarImage
+{
+	u8 data[SCE_NET_NP_AVATAR_IMAGE_MAX_SIZE];
+	be_t<u32> size;
+	//u8 reserved[12];
+};
+
+// Self introduction structure
+struct SceNpAboutMe
+{
+	s8 data[SCE_NET_NP_ABOUT_ME_MAX_LENGTH];
+	s8 term;
+};
+
+// User information structure
+struct SceNpUserInfo
+{
+	SceNpId userId;
+	SceNpOnlineName name;
+	SceNpAvatarUrl icon;
+};
+
+// User information structure (pointer version)
+struct SceNpUserInfo2
+{
+	SceNpId npId;
+	SceNpOnlineName onlineName;
+	SceNpAvatarUrl avatarUrl;
+};
+
+// Often used languages structure
+struct SceNpMyLanguages
+{
+	be_t<s32> language1;
+	be_t<s32> language2;
+	be_t<s32> language3;
+	u8 padding[4];
+};
+
+// NP communication passphrase
+struct SceNpCommunicationPassphrase
+{
+	u8 data[SCE_NP_COMMUNICATION_PASSPHRASE_SIZE];
+};
+
+// NP communication signature
 struct SceNpCommunicationSignature
 {
-	uint8_t data[SCE_NP_COMMUNICATION_SIGNATURE_SIZE];
+	u8 data[SCE_NP_COMMUNICATION_SIGNATURE_SIZE];
 };
+
+// NP cache information structure
+struct SceNpManagerCacheParam
+{
+	SceNpOnlineId onlineId;
+	SceNpId npId;
+	SceNpOnlineName onlineName;
+	SceNpAvatarUrl avatarUrl;
+};
+
+// Message attachment data
+struct SceNpBasicAttachmentData
+{
+	be_t<u32> id;
+	be_t<u32> size;
+};
+
+// Message extended attachment data
+struct SceNpBasicExtendedAttachmentData
+{
+	be_t<u64> flags;
+	be_t<u64> msgId;
+	SceNpBasicAttachmentData data;
+	be_t<u32> userAction;
+	bool markedAsUsed;
+	//be_t<u8> reserved[3];
+};
+
+// Message structure
+struct SceNpBasicMessageDetails
+{
+	be_t<u64> msgId;
+	be_t<u16> mainType;
+	be_t<u16> subType;
+	be_t<u32> msgFeatures;
+	const SceNpId npids;
+	be_t<u32> count;
+	const s8 subject;
+	const s8 body;
+	const be_t<u32> data;
+	be_t<u32> size;
+};
+
+// Presence details of an user
+struct SceNpBasicPresenceDetails
+{
+	s8 title[SCE_NP_BASIC_PRESENCE_TITLE_SIZE_MAX];
+	s8 status[SCE_NP_BASIC_PRESENCE_STATUS_SIZE_MAX];
+	s8 comment[SCE_NP_BASIC_PRESENCE_COMMENT_SIZE_MAX];
+	u8 data[SCE_NP_BASIC_MAX_PRESENCE_SIZE];
+	be_t<u32> size;
+	be_t<s32> state;
+};
+
+// Extended presence details of an user
+struct SceNpBasicPresenceDetails2
+{
+	be_t<u32> struct_size;
+	be_t<s32> state;
+	s8 title[SCE_NP_BASIC_PRESENCE_TITLE_SIZE_MAX];
+	s8 status[SCE_NP_BASIC_PRESENCE_EXTENDED_STATUS_SIZE_MAX];
+	s8 comment[SCE_NP_BASIC_PRESENCE_COMMENT_SIZE_MAX];
+	u8 data[SCE_NP_BASIC_MAX_PRESENCE_SIZE];
+	be_t<u32> size;
+};
+
+// Country/region code
+struct SceNpCountryCode
+{
+	s8 data[2];
+	s8 term;
+	s8 padding[1];
+};
+
+// Date information
+struct SceNpDate
+{
+	be_t<u16> year;
+	u8 month;
+	u8 day;
+};
+
+// Entitlement ID (fixed-length)
+struct SceNpEntitlementId
+{
+	u8 data[SCE_NP_ENTITLEMENT_ID_SIZE]; // Unsigned char? What is the right type...?
+};
+
+// Callback for getting the connection status
+typedef void(SceNpManagerCallback)(s32 event, s32 result, u32 arg_addr);
+
+// Request callback function
+typedef void(*SceNpMatching2RequestCallback)(u16 ctxId, u32 reqId, u16 event,
+	                                         u32 eventKey, s32 errorCode, u32 dataSize, u32 *arg
+	);
+
+// NOTE: Use SceNpCommunicationPassphrase instead
+// Np communication passphrase
+//SceNpCommunicationPassphrase SceNpMatching2TitlePassphrase;
+
+// Session password
+struct SceNpMatching2SessionPassword
+{
+	u8 data[SCE_NP_MATCHING2_SESSION_PASSWORD_SIZE];
+};
+
+// Optional presence data
+struct SceNpMatching2PresenceOptionData
+{
+	u8 data[SCE_NP_MATCHING2_PRESENCE_OPTION_DATA_SIZE];
+	be_t<u32> length;
+};
+
+// Integer-type attribute
+struct SceNpMatching2IntAttr
+{
+	be_t<u16> id;
+	u8 padding[2];
+	be_t<u32> num;
+};
+
+// Binary-type attribute
+struct SceNpMatching2BinAttr
+{
+	be_t<u16> id;
+	u8 padding[2];
+	be_t<u32> ptr;
+	be_t<u32> size;
+};
+
+// Range filter
+struct SceNpMatching2RangeFilter
+{
+	be_t<u32> startIndex;
+	be_t<u32> max;
+};
+
+// Integer-type search condition
+struct SceNpMatching2IntSearchFilter
+{
+	u8 searchOperator;
+	u8 padding[3];
+	SceNpMatching2IntAttr attr;
+};
+
+// Binary-type search condition
+struct SceNpMatching2BinSearchFilter
+{
+	u8 searchOperator;
+	u8 padding[3];
+	SceNpMatching2BinAttr attr;
+};
+
+// Range of result
+struct SceNpMatching2Range
+{
+	be_t<u32> startIndex;
+	be_t<u32> total;
+	be_t<u32> size;
+};
+
+// Session information about a session joined by the user
+struct SceNpMatching2JoinedSessionInfo
+{
+	u8 sessionType;
+	u8 padding1[1];
+	be_t<u16> serverId;
+	be_t<u32> worldId;
+	be_t<u64> lobbyId;
+	be_t<u64> roomId;
+	CellRtcTick joinDate;
+};
+
+// User information
+struct SceNpMatching2UserInfo
+{
+	SceNpMatching2UserInfo *next;
+	SceNpUserInfo2 userInfo;
+	SceNpMatching2BinAttr *userBinAttr;
+	be_t<u32> userBinAttrNum;
+	SceNpMatching2JoinedSessionInfo joinedSessionInfo;
+	be_t<u32> joinedSessionInfoNum;
+};
+
+// Server
+struct SceNpMatching2Server
+{
+	be_t<u16> serverId;
+	u8 status;
+	u8 padding[1];
+};
+
+// World
+struct SceNpMatching2World
+{
+	be_t<u32> worldId;
+	be_t<u32> numOfLobby;
+	be_t<u32> maxNumOfTotalLobbyMember;
+	be_t<u32> curNumOfTotalLobbyMember;
+	be_t<u32> curNumOfRoom;
+	be_t<u32> curNumOfTotalRoomMember;
+	bool withEntitlementId;
+	SceNpEntitlementId entitlementId;
+	u8 padding[3];
+};
+
+// Lobby member internal binary attribute
+struct SceNpMatching2LobbyMemberBinAttrInternal
+{
+	CellRtcTick updateDate;
+	SceNpMatching2BinAttr data;
+	u8 padding[4];
+};
+
+// Lobby-internal lobby member information
+struct SceNpMatching2LobbyMemberDataInternal
+{
+	SceNpMatching2LobbyMemberDataInternal *next;
+	SceNpUserInfo2 userInfo;
+	CellRtcTick joinDate;
+	be_t<u16> memberId;
+	u8 padding[2];
+	be_t<u32> flagAttr;
+	SceNpMatching2JoinedSessionInfo joinedSessionInfo;
+	be_t<u32> joinedSessionInfoNum;
+	SceNpMatching2LobbyMemberBinAttrInternal lobbyMemberBinAttrInternal;
+	be_t<u32> lobbyMemberBinAttrInternalNum; // Unsigned ints are be_t<u32> not uint, right?
+};
+
+// Lobby member ID list
+struct SceNpMatching2LobbyMemberIdList
+{
+	be_t<u16> memberId;
+	be_t<u32> memberIdNum;
+	be_t<u16> me;
+	u8 padding[6];
+};
+
+// Lobby-internal binary attribute
+struct SceNpMatching2LobbyBinAttrInternal
+{
+	CellRtcTick updateDate;
+	be_t<u16> updateMemberId;
+	u8 padding[2];
+	SceNpMatching2BinAttr data;
+};
+
+// Lobby-external lobby information
+struct SceNpMatching2LobbyDataExternal
+{
+	SceNpMatching2LobbyDataExternal *next;
+	be_t<u16> serverId;
+	u8 padding1[2];
+	be_t<u32> worldId;
+	u8 padding2[4];
+	be_t<u64> lobbyId;
+	be_t<u32> maxSlot;
+	be_t<u32> curMemberNum;
+	be_t<u32> flagAttr;
+	SceNpMatching2IntAttr lobbySearchableIntAttrExternal;
+	be_t<u32> lobbySearchableIntAttrExternalNum;
+	SceNpMatching2BinAttr lobbySearchableBinAttrExternal;
+	be_t<u32> lobbySearchableBinAttrExternalNum;
+	SceNpMatching2BinAttr lobbyBinAttrExternal;
+	be_t<u32> lobbyBinAttrExternalNum;
+	u8 padding3[4];
+};
+
+// Lobby-internal lobby information
+struct SceNpMatching2LobbyDataInternal
+{
+	be_t<u16> serverId;
+	u8 padding1[2];
+	be_t<u32> worldId;
+	be_t<u64> lobbyId;
+	be_t<u32> maxSlot;
+	SceNpMatching2LobbyMemberIdList memberIdList;
+	be_t<u32> flagAttr;
+	SceNpMatching2LobbyBinAttrInternal lobbyBinAttrInternal;
+	be_t<u32> lobbyBinAttrInternalNum;
+};
+
+// Lobby message transmission destination
+union SceNpMatching2LobbyMessageDestination
+{
+	be_t<u16> unicastTarget;
+	struct multicastTarget {
+		be_t<u16> *memberId;
+		be_t<u32> memberIdNum;
+	};
+};
+
+// Group label
+struct SceNpMatching2GroupLabel
+{
+	u8 data[SCE_NP_MATCHING2_GROUP_LABEL_SIZE];
+};
+
+// Set groups in a room
+struct SceNpMatching2RoomGroupConfig
+{
+	be_t<u32> slotNum;
+	bool withLabel;
+	SceNpMatching2GroupLabel label;
+	bool withPassword;
+	u8 padding[2];
+};
+
+// Set group password
+struct SceNpMatching2RoomGroupPasswordConfig
+{
+	u8 groupId;
+	bool withPassword;
+	u8 padding[1];
+};
+
+// Group (of slots in a room)
+struct SceNpMatching2RoomGroup
+{
+	u8 groupId;
+	bool withPassword;
+	bool withLabel;
+	u8 padding[1];
+	SceNpMatching2GroupLabel label;
+	be_t<u32> slotNum;
+	be_t<u32> curGroupMemberNum;
+};
+
+// Internal room member binary attribute
+struct SceNpMatching2RoomMemberBinAttrInternal
+{
+	CellRtcTick updateDate;
+	SceNpMatching2BinAttr data;
+	u8 padding[4];
+};
+
+// External room member data
+struct SceNpMatching2RoomMemberDataExternal
+{
+	SceNpMatching2RoomMemberDataExternal *next;
+	SceNpUserInfo2 userInfo;
+	CellRtcTick joinDate;
+	u8 role;
+	u8 padding[7];
+};
+
+// Internal room member data
+struct SceNpMatching2RoomMemberDataInternal
+{
+	SceNpMatching2RoomMemberDataInternal *next;
+	SceNpUserInfo2 userInfo;
+	CellRtcTick joinDate;
+	be_t<u16> memberId;
+	u8 teamId;
+	u8 padding1[1];
+	SceNpMatching2RoomGroup roomGroup;
+	u8 natType;
+	u8 padding2[3];
+	be_t<u32> flagAttr;
+	SceNpMatching2RoomMemberBinAttrInternal roomMemberBinAttrInternal;
+	be_t<u32> roomMemberBinAttrInternalNum;
+};
+
+// Internal room member data list
+struct SceNpMatching2RoomMemberDataInternalList
+{
+	SceNpMatching2RoomMemberDataInternal members;
+	be_t<u32> membersNum;
+	SceNpMatching2RoomMemberDataInternal me;
+	SceNpMatching2RoomMemberDataInternal owner;
+};
+
+// Internal room binary attribute
+struct SceNpMatching2RoomBinAttrInternal
+{
+	CellRtcTick updateDate;
+	be_t<u16> updateMemberId;
+	u8 padding[2];
+	SceNpMatching2BinAttr data;
+};
+
+// External room data
+struct SceNpMatching2RoomDataExternal
+{
+	SceNpMatching2RoomDataExternal *next;
+	be_t<u16> serverId;
+	u8 padding1[2];
+	be_t<u32> worldId;
+	be_t<u16> publicSlotNum;
+	be_t<u16> privateSlotNum;
+	be_t<u64> lobbyId;
+	be_t<u64> roomId;
+	be_t<u16> openPublicSlotNum;
+	be_t<u16> maxSlot;
+	be_t<u16> openPrivateSlotNum;
+	be_t<u16> curMemberNum;
+	be_t<u64> passwordSlotMask;
+	SceNpUserInfo2 owner;
+	SceNpMatching2RoomGroup roomGroup;
+	be_t<u32> roomGroupNum;
+	be_t<u32> flagAttr;
+	SceNpMatching2IntAttr roomSearchableIntAttrExternal;
+	be_t<u32> roomSearchableIntAttrExternalNum;
+	SceNpMatching2BinAttr roomSearchableBinAttrExternal;
+	be_t<u32> roomSearchableBinAttrExternalNum;
+	SceNpMatching2BinAttr roomBinAttrExternal;
+	be_t<u32> roomBinAttrExternalNum;
+};
+
+// Internal room data
+struct SceNpMatching2RoomDataInternal
+{
+	be_t<u16> serverId;
+	u8 padding1[2];
+	be_t<u32> worldId;
+	be_t<u64> lobbyId;
+	be_t<u64> roomId;
+	be_t<u64> passwordSlotMask;
+	be_t<u32> maxSlot;
+	SceNpMatching2RoomMemberDataInternalList memberList;
+	SceNpMatching2RoomGroup *roomGroup;
+	be_t<u32> roomGroupNum;
+	be_t<u32> flagAttr;
+	SceNpMatching2RoomBinAttrInternal *roomBinAttrInternal;
+	be_t<u32> roomBinAttrInternalNum;
+};
+
+// Room message recipient
+union SceNpMatching2RoomMessageDestination
+{
+	be_t<u16> unicastTarget;
+	struct multicastTarget {
+		be_t<u16> memberId;
+		be_t<u32> memberIdNum;
+	};
+	u8 multicastTargetTeamId;
+};
+
+// Invitation data
+struct SceNpMatching2InvitationData
+{
+	SceNpMatching2JoinedSessionInfo targetSession;
+	be_t<u32> targetSessionNum;
+	be_t<u32> optData;
+	be_t<u32> optDataLen;
+};
+
+// Signaling option parameter
+struct SceNpMatching2SignalingOptParam
+{
+	u8 type;
+	//u8 reserved1[1];
+	be_t<u16> hubMemberId;
+	//u8 reserved2[4];
+};
+
+// Option parameters for requests
+struct SceNpMatching2RequestOptParam
+{
+	SceNpMatching2RequestCallback cbFunc;
+	be_t<u32> *cbFuncArg;
+	be_t<u32> timeout;
+	be_t<u16> appReqId;
+	u8 padding[2];
+};
+
+// Room slot information
+struct SceNpMatching2RoomSlotInfo
+{
+	be_t<u64> roomId;
+	be_t<u64> joinedSlotMask;
+	be_t<u64> passwordSlotMask;
+	be_t<u16> publicSlotNum;
+	be_t<u16> privateSlotNum;
+	be_t<u16> openPublicSlotNum;
+	be_t<u16> openPrivateSlotNum;
+};
+
+// Server data request parameter
+struct SceNpMatching2GetServerInfoRequest
+{
+	be_t<u16> serverId;
+};
+
+// Server data request response data
+struct SceNpMatching2GetServerInfoResponse
+{
+	SceNpMatching2Server server;
+};
+
+// Request parameter for creating a server context
+struct SceNpMatching2CreateServerContextRequest
+{
+	be_t<u16> serverId;
+};
+
+// Request parameter for deleting a server context
+struct SceNpMatching2DeleteServerContextRequest
+{
+	be_t<u16> serverId;
+};
+
+// World data list request parameter
+struct SceNpMatching2GetWorldInfoListRequest
+{
+	be_t<u16> serverId;
+};
+
+// World data list request response data
+struct SceNpMatching2GetWorldInfoListResponse
+{
+	SceNpMatching2World world;
+	be_t<u32> worldNum;
+};
+
+// User information setting request parameter
+struct SceNpMatching2SetUserInfoRequest
+{
+	be_t<u16> serverId;
+	u8 padding[2];
+	SceNpMatching2BinAttr *userBinAttr;
+	be_t<u32> userBinAttrNum;
+};
+
+// User information list acquisition request parameter
+struct SceNpMatching2GetUserInfoListRequest
+{
+	be_t<u16> serverId;
+	u8 padding[2];
+	SceNpId npId;
+	be_t<u32> npIdNum;
+	be_t<u16> attrId;
+	be_t<u32> attrIdNum;
+	be_t<s32> option; // int should be be_t<s32>, right?
+};
+
+// User information list acquisition response data
+struct SceNpMatching2GetUserInfoListResponse
+{
+	SceNpMatching2UserInfo userInfo;
+	be_t<u32> userInfoNum;
+};
+
+// External room member data list request parameter
+struct SceNpMatching2GetRoomMemberDataExternalListRequest
+{
+	be_t<u64> roomId;
+};
+
+// External room member data list request response data
+struct SceNpMatching2GetRoomMemberDataExternalListResponse
+{
+	SceNpMatching2RoomMemberDataExternal roomMemberDataExternal;
+	be_t<u32> roomMemberDataExternalNum;
+};
+
+// External room data configuration request parameters
+struct SceNpMatching2SetRoomDataExternalRequest
+{
+	be_t<u64> roomId;
+	SceNpMatching2IntAttr roomSearchableIntAttrExternal;
+	be_t<u32> roomSearchableIntAttrExternalNum;
+	SceNpMatching2BinAttr roomSearchableBinAttrExternal;
+	be_t<u32> roomSearchableBinAttrExternalNum;
+	SceNpMatching2BinAttr roomBinAttrExternal;
+	be_t<u32> roomBinAttrExternalNum;
+};
+
+// External room data list request parameters
+struct SceNpMatching2GetRoomDataExternalListRequest
+{
+	be_t<u64> roomId;
+	be_t<u32> roomIdNum;
+	be_t<u16> attrId;
+	be_t<u32> attrIdNum;
+};
+
+// External room data list request response data
+struct SceNpMatching2GetRoomDataExternalListResponse
+{
+	SceNpMatching2RoomDataExternal roomDataExternal;
+	be_t<u32> roomDataExternalNum;
+};
+
+// Create-and-join room request parameters
+struct SceNpMatching2CreateJoinRoomRequest
+{
+	be_t<u32> worldId;
+	u8 padding1[4];
+	be_t<u64> lobbyId;
+	be_t<u32> maxSlot;
+	be_t<u32> flagAttr;
+	SceNpMatching2BinAttr roomBinAttrInternal;
+	be_t<u32> roomBinAttrInternalNum;
+	SceNpMatching2IntAttr roomSearchableIntAttrExternal;
+	be_t<u32> roomSearchableIntAttrExternalNum;
+	SceNpMatching2BinAttr roomSearchableBinAttrExternal;
+	be_t<u32> roomSearchableBinAttrExternalNum;
+	SceNpMatching2BinAttr roomBinAttrExternal;
+	be_t<u32> roomBinAttrExternalNum;
+	SceNpMatching2SessionPassword roomPassword;
+	SceNpMatching2RoomGroupConfig groupConfig;
+	be_t<u32> groupConfigNum;
+	be_t<u64> passwordSlotMask;
+	SceNpId allowedUser;
+	be_t<u32> allowedUserNum;
+	SceNpId blockedUser;
+	be_t<u32> blockedUserNum;
+	SceNpMatching2GroupLabel joinRoomGroupLabel;
+	SceNpMatching2BinAttr roomMemberBinAttrInternal;
+	be_t<u32> roomMemberBinAttrInternalNum;
+	u8 teamId;
+	u8 padding2[3];
+	SceNpMatching2SignalingOptParam sigOptParam;
+	u8 padding3[4];
+};
+
+// Create-and-join room request response data
+struct SceNpMatching2CreateJoinRoomResponse
+{
+	SceNpMatching2RoomDataInternal roomDataInternal;
+};
+
+// Join room request parameters
+struct SceNpMatching2JoinRoomRequest
+{
+	be_t<u64> roomId;
+	SceNpMatching2SessionPassword roomPassword;
+	SceNpMatching2GroupLabel joinRoomGroupLabel;
+	SceNpMatching2BinAttr roomMemberBinAttrInternal;
+	be_t<u32> roomMemberBinAttrInternalNum;
+	SceNpMatching2PresenceOptionData optData;
+	u8 teamId;
+	u8 padding[3];
+};
+
+// Join room request response data
+struct SceNpMatching2JoinRoomResponse
+{
+	SceNpMatching2RoomDataInternal roomDataInternal;
+};
+
+// Leave room request parameters
+struct SceNpMatching2LeaveRoomRequest
+{
+	be_t<u64> roomId;
+	SceNpMatching2PresenceOptionData optData;
+	u8 padding[4];
+};
+
+// Room ownership grant request parameters
+struct SceNpMatching2GrantRoomOwnerRequest
+{
+	be_t<u64> roomId;
+	be_t<u16> newOwner;
+	u8 padding[2];
+	SceNpMatching2PresenceOptionData optData;
+};
+
+// Kickout request parameters
+struct SceNpMatching2KickoutRoomMemberRequest
+{
+	be_t<u64> roomId;
+	be_t<u16> target;
+	u8 blockKickFlag;
+	u8 padding[1];
+	SceNpMatching2PresenceOptionData optData;
+};
+
+// Room search parameters
+struct SceNpMatching2SearchRoomRequest
+{
+	be_t<s32> option;
+	be_t<u32> worldId;
+	be_t<u64> lobbyId;
+	SceNpMatching2RangeFilter rangeFilter;
+	be_t<u32> flagFilter;
+	be_t<u32> flagAttr;
+	SceNpMatching2IntSearchFilter intFilter;
+	be_t<u32> intFilterNum;
+	SceNpMatching2BinSearchFilter binFilter;
+	be_t<u32> binFilterNum;
+	be_t<u16> attrId;
+	be_t<u32> attrIdNum;
+};
+
+// Room search response data
+struct SceNpMatching2SearchRoomResponse
+{
+	SceNpMatching2Range range;
+	SceNpMatching2RoomDataExternal roomDataExternal;
+};
+
+// Room message send request parameters
+struct SceNpMatching2SendRoomMessageRequest
+{
+	be_t<u64> roomId;
+	u8 castType;
+	u8 padding[3];
+	SceNpMatching2RoomMessageDestination dst;
+	be_t<u32> msg; // const void = be_t<u32>, right?
+	be_t<u32> msgLen;
+	be_t<s32> option; // int = be_t<s32>, right?
+};
+
+// Room chat message send request parameters
+struct SceNpMatching2SendRoomChatMessageRequest
+{
+	be_t<u64> roomId;
+	u8 castType;
+	u8 padding[3];
+	SceNpMatching2RoomMessageDestination dst;
+	be_t<u32> msg;
+	be_t<u32> msgLen;
+	be_t<s32> option;
+};
+
+// Room chat message send request response data
+struct SceNpMatching2SendRoomChatMessageResponse
+{
+	bool filtered;
+};
+
+// Internal room data configuration request parameters
+struct SceNpMatching2SetRoomDataInternalRequest
+{
+	be_t<u64> roomId;
+	be_t<u32> flagFilter;
+	be_t<u32> flagAttr;
+	SceNpMatching2BinAttr roomBinAttrInternal;
+	be_t<u32> roomBinAttrInternalNum;
+	SceNpMatching2RoomGroupPasswordConfig passwordConfig;
+	be_t<u32> passwordConfigNum;
+	be_t<u64> passwordSlotMask;
+	be_t<u16> ownerPrivilegeRank;
+	be_t<u32> ownerPrivilegeRankNum;
+	u8 padding[4];
+};
+
+// Internal room data request parameters
+struct SceNpMatching2GetRoomDataInternalRequest
+{
+	be_t<u64> roomId;
+	be_t<u16> attrId;
+	be_t<u32> attrIdNum;
+};
+
+// Internal room data request response data
+struct SceNpMatching2GetRoomDataInternalResponse
+{
+	SceNpMatching2RoomDataInternal roomDataInternal;
+};
+
+// Internal room member data configuration request parameters
+struct SceNpMatching2SetRoomMemberDataInternalRequest
+{
+	be_t<u64> roomId;
+	be_t<u16> memberId;
+	u8 teamId;
+	u8 padding[5];
+	be_t<u32> flagFilter;
+	be_t<u32> flagAttr;
+	SceNpMatching2BinAttr roomMemberBinAttrInternal;
+	be_t<u32> roomMemberBinAttrInternalNum;
+};
+
+// Internal room member data request parameters
+struct SceNpMatching2GetRoomMemberDataInternalRequest
+{
+	be_t<u64> roomId;
+	be_t<u16> memberId;
+	u8 padding[6];
+	be_t<u16> attrId;
+	be_t<u32> attrIdNum;
+};
+
+// Internal room member data request response data
+struct SceNpMatching2GetRoomMemberDataInternalResponse
+{
+	SceNpMatching2RoomMemberDataInternal roomMemberDataInternal;
+};
+
+// Signaling option parameter setting request parameter
+struct SceNpMatching2SetSignalingOptParamRequest
+{
+	be_t<u64> roomId;
+	SceNpMatching2SignalingOptParam sigOptParam;
+};
+
+// Lobby information list acquisition request parameter
+struct SceNpMatching2GetLobbyInfoListRequest
+{
+	be_t<u32> worldId;
+	SceNpMatching2RangeFilter rangeFilter;
+	be_t<u16> attrId;
+	be_t<u32> attrIdNum;
+};
+
+// Lobby information list acquisition response data
+struct SceNpMatching2GetLobbyInfoListResponse
+{
+	SceNpMatching2Range range;
+	SceNpMatching2LobbyDataExternal lobbyDataExternal;
+};
+
+// Lobby joining request parameter
+struct SceNpMatching2JoinLobbyRequest
+{
+	be_t<u64> lobbyId;
+	SceNpMatching2JoinedSessionInfo joinedSessionInfo;
+	be_t<u32> joinedSessionInfoNum;
+	SceNpMatching2BinAttr lobbyMemberBinAttrInternal;
+	be_t<u32> lobbyMemberBinAttrInternalNum;
+	SceNpMatching2PresenceOptionData optData;
+	u8 padding[4];
+};
+
+// Lobby joining response data
+struct SceNpMatching2JoinLobbyResponse
+{
+	SceNpMatching2LobbyDataInternal lobbyDataInternal;
+};
+
+// Lobby leaving request parameter
+struct SceNpMatching2LeaveLobbyRequest
+{
+	be_t<u64> lobbyId;
+	SceNpMatching2PresenceOptionData optData;
+	u8 padding[4];
+};
+
+// Lobby chat message sending request parameter
+struct SceNpMatching2SendLobbyChatMessageRequest
+{
+	be_t<u64> lobbyId;
+	u8 castType;
+	u8 padding[3];
+	SceNpMatching2LobbyMessageDestination dst;
+	be_t<u32> msg;
+	be_t<u32> msgLen;
+	be_t<s32> option;
+};
+
+// Lobby chat message sending response data
+struct SceNpMatching2SendLobbyChatMessageResponse
+{
+	bool filtered;
+};
+
+// Lobby invitation message sending request parameter
+struct SceNpMatching2SendLobbyInvitationRequest
+{
+	be_t<u64> lobbyId;
+	u8 castType;
+	u8 padding[3];
+	SceNpMatching2LobbyMessageDestination dst;
+	SceNpMatching2InvitationData invitationData;
+	be_t<s32> option;
+};
+
+// Lobby-internal lobby member information setting request parameter
+struct SceNpMatching2SetLobbyMemberDataInternalRequest
+{
+	be_t<u64> lobbyId;
+	be_t<u16> memberId;
+	u8 padding1[2];
+	be_t<u32> flagFilter;
+	be_t<u32> flagAttr;
+	SceNpMatching2JoinedSessionInfo *joinedSessionInfo;
+	be_t<u32> joinedSessionInfoNum;
+	SceNpMatching2BinAttr lobbyMemberBinAttrInternal;
+	be_t<u32> lobbyMemberBinAttrInternalNum;
+	u8 padding2[4];
+};
+
+// Lobby-internal lobby member information acquisition request parameter
+struct SceNpMatching2GetLobbyMemberDataInternalRequest
+{
+	be_t<u64> lobbyId;
+	be_t<u16> memberId;
+	u8 padding[6];
+	be_t<u16> attrId;
+	be_t<u32> attrIdNum;
+};
+
+// Lobby-internal lobby member information acquisition response data
+struct SceNpMatching2GetLobbyMemberDataInternalResponse
+{
+	SceNpMatching2LobbyMemberDataInternal lobbyMemberDataInternal;
+};
+
+// Request parameters for obtaining a list of lobby-internal lobby member information
+struct SceNpMatching2GetLobbyMemberDataInternalListRequest
+{
+	be_t<u64> lobbyId;
+	be_t<u16> memberId;
+	be_t<u32> memberIdNum;
+	be_t<u16> attrId;
+	be_t<u32> attrIdNum;
+	bool extendedData;
+	u8 padding[7];
+};
+
+// Reponse data for obtaining a list of lobby-internal lobby member information
+struct SceNpMatching2GetLobbyMemberDataInternalListResponse
+{
+	SceNpMatching2LobbyMemberDataInternal lobbyMemberDataInternal;
+	be_t<u32> lobbyMemberDataInternalNum;
+};
+
+// Request parameters for obtaining Ping information
+struct SceNpMatching2SignalingGetPingInfoRequest
+{
+	be_t<u64> roomId;
+	//u8 reserved[16];
+};
+
+// Response data for obtaining Ping information
+struct SceNpMatching2SignalingGetPingInfoResponse
+{
+	be_t<u16> serverId;
+	u8 padding1[2];
+	be_t<u32> worldId;
+	be_t<u64> roomId;
+	be_t<u32> rtt;
+	//u8 reserved[20];
+};
+
+// Join request parameters for room in prohibitive mode
+struct SceNpMatching2JoinProhibitiveRoomRequest
+{
+	SceNpMatching2JoinRoomRequest joinParam;
+	SceNpId blockedUser;
+	be_t<u32> blockedUserNum;
+};
+
+// Room member update information
+struct SceNpMatching2RoomMemberUpdateInfo
+{
+	SceNpMatching2RoomMemberDataInternal roomMemberDataInternal;
+	u8 eventCause;
+	u8 padding[3];
+	SceNpMatching2PresenceOptionData optData;
+};
+
+// Room owner update information
+struct SceNpMatching2RoomOwnerUpdateInfo
+{
+	be_t<u16> prevOwner;
+	be_t<u16> newOwner;
+	u8 eventCause;
+	u8 padding[3];
+	SceNpMatching2SessionPassword roomPassword;
+	SceNpMatching2PresenceOptionData optData;
+};
+
+// Room update information
+struct SceNpMatching2RoomUpdateInfo
+{
+	u8 eventCause;
+	u8 padding[3];
+	be_t<s32> errorCode;
+	SceNpMatching2PresenceOptionData optData;
+};
+
+// Internal room data update information
+struct SceNpMatching2RoomDataInternalUpdateInfo
+{
+	SceNpMatching2RoomDataInternal newRoomDataInternal;
+	be_t<u32> newFlagAttr;
+	be_t<u32> prevFlagAttr;
+	be_t<u64> newRoomPasswordSlotMask;
+	be_t<u64> prevRoomPasswordSlotMask;
+	SceNpMatching2RoomGroup newRoomGroup;
+	be_t<u32> newRoomGroupNum;
+	SceNpMatching2RoomBinAttrInternal newRoomBinAttrInternal;
+	be_t<u32> newRoomBinAttrInternalNum;
+};
+
+// Internal room member data update information
+struct SceNpMatching2RoomMemberDataInternalUpdateInfo
+{
+	SceNpMatching2RoomMemberDataInternal newRoomMemberDataInternal;
+	be_t<u16> newFlagAttr;
+	be_t<u16> prevFlagAttr;
+	u8 newTeamId;
+	SceNpMatching2RoomMemberBinAttrInternal newRoomMemberBinAttrInternal;
+	be_t<u32> newRoomMemberBinAttrInternalNum;
+};
+
+// Room message information
+struct SceNpMatching2RoomMessageInfo
+{
+	bool filtered;
+	u8 castType;
+	u8 padding[2];
+	SceNpMatching2RoomMessageDestination dst;
+	SceNpUserInfo2 srcMember;
+	be_t<u32> msg;
+	be_t<u32> msgLen;
+};
+
+// Lobby member update information
+struct SceNpMatching2LobbyMemberUpdateInfo
+{
+	SceNpMatching2LobbyMemberDataInternal *lobbyMemberDataInternal;
+	u8 eventCause;
+	u8 padding[3];
+	SceNpMatching2PresenceOptionData optData;
+};
+
+// Lobby update information
+struct SceNpMatching2LobbyUpdateInfo
+{
+	u8 eventCause;
+	u8 padding[3];
+	be_t<s32> errorCode;
+};
+
+// Lobby-internal lobby member information update information
+struct SceNpMatching2LobbyMemberDataInternalUpdateInfo
+{
+	be_t<u16> memberId;
+	u8 padding[2];
+	SceNpId npId;
+	be_t<u16> flagFilter;
+	be_t<u16> newFlagAttr;
+	SceNpMatching2JoinedSessionInfo newJoinedSessionInfo;
+	be_t<u32> newJoinedSessionInfoNum;
+	SceNpMatching2LobbyMemberBinAttrInternal newLobbyMemberBinAttrInternal;
+	be_t<u32> newLobbyMemberBinAttrInternalNum;
+};
+
+// Lobby message information
+struct SceNpMatching2LobbyMessageInfo
+{
+	bool filtered;
+	u8 castType;
+	u8 padding[2];
+	SceNpMatching2LobbyMessageDestination dst;
+	SceNpUserInfo2 srcMember;
+	be_t<u32> msg;
+	be_t<u32> msgLen;
+};
+
+// Lobby invitation message information
+struct SceNpMatching2LobbyInvitationInfo
+{
+	u8 castType;
+	u8 padding[3];
+	SceNpMatching2LobbyMessageDestination dst;
+	SceNpUserInfo2 srcMember;
+	SceNpMatching2InvitationData invitationData;
+};
+
+// Update information of the signaling option parameter
+struct SceNpMatching2SignalingOptParamUpdateInfo
+{
+	SceNpMatching2SignalingOptParam newSignalingOptParam;
+};
+
+// Matching2 utility intilization parameters
+struct SceNpMatching2UtilityInitParam
+{
+	//sys_memory_container_t containerId; //TODO: Uncomment this once sys_memory_container_t is implemented
+	be_t<u32> requestCbQueueLen;
+	be_t<u32> sessionEventCbQueueLen;;
+	be_t<u32> sessionMsgCbQueueLen;;
+	//u8 reserved[16];
+};
+
+// Matching2 memory information
+struct SceNpMatching2MemoryInfo
+{
+	be_t<u32> totalMemSize;
+	be_t<u32> curMemUsage;;
+	be_t<u32> maxMemUsage;;
+	//u8 reserved[12];
+};
+
+// Matching2 information on the event data queues in the system
+struct SceNpMatching2CbQueueInfo
+{
+	be_t<u32> requestCbQueueLen;
+	be_t<u32> curRequestCbQueueLen;;
+	be_t<u32> maxRequestCbQueueLen;;
+	be_t<u32> sessionEventCbQueueLen;;
+	be_t<u32> curSessionEventCbQueueLen;;
+	be_t<u32> maxSessionEventCbQueueLen;;
+	be_t<u32> sessionMsgCbQueueLen;;
+	be_t<u32> curSessionMsgCbQueueLen;;
+	be_t<u32> maxSessionMsgCbQueueLen;;
+	//u8 reserved[12];
+};
+
+// Score data unique to the application
+struct SceNpScoreGameInfo
+{
+	u8 nativeData[SCE_NP_SCORE_GAMEINFO_SIZE];
+};
+
+// Ranking comment structure
+struct SceNpScoreComment
+{
+	s8 data[SCE_NP_SCORE_COMMENT_MAXLEN];
+	s8 term[1];
+};
+
+// Ranking information structure
+struct SceNpScoreRankData
+{
+	SceNpId npId;
+	SceNpOnlineName onlineName;
+	be_t<s32> pcId;
+	be_t<u32> serialRank;
+	be_t<u32> rank;
+	be_t<u32> highestRank;
+	be_t<s64> scoreValue;
+	be_t<s32> hasGameData;
+	//u8 pad0[4];
+	CellRtcTick recordDate;
+};
+
+// Ranking information of a player or a clan member
+struct SceNpScorePlayerRankData
+{
+	be_t<s32> hasData;
+	//u8 pad0[4];
+	SceNpScoreRankData rankData;
+};
+
+// Scoreboard information
+struct SceNpScoreBoardInfo
+{
+	be_t<u32> rankLimit;
+	be_t<u32> updateMode;
+	be_t<u32> sortMode;
+	be_t<u32> uploadNumLimit;
+	be_t<u32> uploadSizeLimit;
+};
+
+// NOTE: Use SceNpCommunicationPassphrase instead
+// Authentication information per NP Communication ID for score ranking
+// SceNpCommunicationPassphrase SceNpScorePassphrase;
+
+// NP ID structure with player character ID
+struct SceNpScoreNpIdPcId
+{
+	SceNpId npId;
+	be_t<s32> pcId;
+	//u8 pad[4];
+};
+
+// Basic clan information to be used in raking
+struct SceNpScoreClanBasicInfo
+{
+	s8 clanName[SCE_NP_CLANS_CLAN_NAME_MAX_LENGTH + 1];
+	s8 clanTag[SCE_NP_CLANS_CLAN_TAG_MAX_LENGTH + 1];
+	//u8 reserved[10];
+};
+
+// Clan member information handled in ranking
+struct SceNpScoreClansMemberDescription
+{
+	s8 description[SCE_NP_CLANS_CLAN_DESCRIPTION_MAX_LENGTH + 1];
+};
+
+// Clan ranking information
+struct SceNpScoreClanRankData
+{
+	be_t<u32> clanId;
+	SceNpScoreClanBasicInfo clanInfo;
+	be_t<u32> regularMemberCount;
+	be_t<u32> recordMemberCount;
+	be_t<u32> serialRank;
+	be_t<u32> rank;
+	be_t<s64> scoreValue;
+	CellRtcTick recordDate;
+	SceNpId npId;
+	SceNpOnlineName onlineName;
+	uint8_t reserved[32];
+};
+
+// Clan ranking information to be obtained for a specified clan ID
+struct SceNpScoreClanIdRankData
+{
+	be_t<s32> hasData;
+	//u8 pad0[4];
+	SceNpScoreClanRankData rankData;
+};
+
+// Union for connection information
+union SceNpSignalingConnectionInfo {
+	be_t<u32> rtt;
+	be_t<u32> bandwidth;
+	SceNpId npId;
+	struct address {
+		be_t<u32> addr; // in_addr
+		//in_port_t port; // TODO: Implement this?
+	};
+	be_t<u32> packet_loss;
+};
+
+// Network information structure
+struct SceNpSignalingNetInfo
+{
+	be_t<u32> size;
+	be_t<u32> local_addr; // in_addr
+	be_t<u32> mapped_addr; // in_addr
+	be_t<s32> nat_status;
+	be_t<s32> upnp_status;
+	be_t<s32> npport_status;
+	be_t<u16> npport;
+};
+
+// NP signaling callback function
+typedef void(*SceNpSignalingHandler)(u32 ctx_id, u32 subject_id, s32 event, s32 error_code, u32 arg_addr);
\ No newline at end of file
diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpClans.cpp b/rpcs3/Emu/SysCalls/Modules/sceNpClans.cpp
new file mode 100644
index 0000000000..5a6b204fbf
--- /dev/null
+++ b/rpcs3/Emu/SysCalls/Modules/sceNpClans.cpp
@@ -0,0 +1,293 @@
+#include "stdafx.h"
+#include "Emu/SysCalls/Modules.h"
+#include "Emu/System.h"
+#include "cellRtc.h"
+#include "sceNp.h"
+#include "sceNpClans.h"
+
+//void sceNpClans_unload();
+//void sceNpClans_init();
+//Module sceNpClans(0x003a, sceNpClans_init, nullptr, sceNpClans_unload);
+Module *sceNpClans = nullptr;
+
+int sceNpClansInit()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansTerm()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansCreateRequest()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansDestroyRequest()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansAbortRequest()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansCreateClan()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansDisbandClan()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansGetClanList()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansGetClanListByNpId()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansSearchByProfile()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansSearchByName()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansGetClanInfo()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansUpdateClanInfo()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansGetMemberList()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansGetMemberInfo()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansUpdateMemberInfo()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansChangeMemberRole()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansGetAutoAcceptStatus()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansUpdateAutoAcceptStatus()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansJoinClan()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansLeaveClan()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansKickMember()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansSendInvitation()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansCancelInvitation()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansSendInvitationResponse()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansSendMembershipRequest()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansCancelMembershipRequest()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansSendMembershipResponse()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansGetBlacklist()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansAddBlacklistEntry()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansRemoveBlacklistEntry()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansRetrieveAnnouncements()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansPostAnnouncement()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansRemoveAnnouncement()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansPostChallenge()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansRetrievePostedChallenges()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansRemovePostedChallenge()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansRetrieveChallenges()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+int sceNpClansRemoveChallenge()
+{
+	UNIMPLEMENTED_FUNC(sceNpClans);
+	return CELL_OK;
+}
+
+void sceNpClans_unload()
+{
+	// TODO: Unload Clans module
+}
+
+void sceNpClans_init()
+{
+	sceNpClans->AddFunc(0x9b820047, sceNpClansInit);
+	sceNpClans->AddFunc(0x42332cb7, sceNpClansTerm);
+	sceNpClans->AddFunc(0x9a72232d, sceNpClansCreateRequest);
+	sceNpClans->AddFunc(0xd6551cd1, sceNpClansDestroyRequest);
+	sceNpClans->AddFunc(0xe82969e2, sceNpClansAbortRequest);
+	sceNpClans->AddFunc(0xa6a31a38, sceNpClansCreateClan);
+	sceNpClans->AddFunc(0x4826f6d5, sceNpClansDisbandClan);
+	sceNpClans->AddFunc(0xca4181b4, sceNpClansGetClanList);
+	sceNpClans->AddFunc(0x672399a8, sceNpClansGetClanListByNpId);
+	sceNpClans->AddFunc(0x1221a1bf, sceNpClansSearchByProfile);
+	sceNpClans->AddFunc(0xace0cfba, sceNpClansSearchByName);
+	sceNpClans->AddFunc(0x487de998, sceNpClansGetClanInfo);
+	sceNpClans->AddFunc(0x09f9e1a9, sceNpClansUpdateClanInfo);
+	sceNpClans->AddFunc(0x856ff5c0, sceNpClansGetMemberList);
+	sceNpClans->AddFunc(0x20472da0, sceNpClansGetMemberInfo);
+	sceNpClans->AddFunc(0xf4a2d52b, sceNpClansUpdateMemberInfo);
+	sceNpClans->AddFunc(0x9cac2085, sceNpClansChangeMemberRole);
+	sceNpClans->AddFunc(0x38dadf1f, sceNpClansGetAutoAcceptStatus);
+	sceNpClans->AddFunc(0x5da94854, sceNpClansUpdateAutoAcceptStatus);
+	sceNpClans->AddFunc(0xdbf300ca, sceNpClansJoinClan);
+	sceNpClans->AddFunc(0x560f717b, sceNpClansLeaveClan);
+	sceNpClans->AddFunc(0xaa7912b5, sceNpClansKickMember);
+	sceNpClans->AddFunc(0xbc05ef31, sceNpClansSendInvitation);
+	sceNpClans->AddFunc(0x726dffd5, sceNpClansCancelInvitation);
+	sceNpClans->AddFunc(0x095e12c6, sceNpClansSendInvitationResponse);
+	sceNpClans->AddFunc(0x59743b2b, sceNpClansSendMembershipRequest);
+	sceNpClans->AddFunc(0x299ccc9b, sceNpClansCancelMembershipRequest);
+	sceNpClans->AddFunc(0x942dbdc4, sceNpClansSendMembershipResponse);
+	sceNpClans->AddFunc(0x56bc5a7c, sceNpClansGetBlacklist);
+	sceNpClans->AddFunc(0x4d06aef7, sceNpClansAddBlacklistEntry);
+	sceNpClans->AddFunc(0x5bff9da1, sceNpClansRemoveBlacklistEntry);
+	sceNpClans->AddFunc(0x727aa7f8, sceNpClansRetrieveAnnouncements);
+	sceNpClans->AddFunc(0xada45b84, sceNpClansPostAnnouncement);
+	sceNpClans->AddFunc(0xe2590f60, sceNpClansRemoveAnnouncement);
+	sceNpClans->AddFunc(0x83d65529, sceNpClansPostChallenge);
+	sceNpClans->AddFunc(0x8e785b97, sceNpClansRetrievePostedChallenges);
+	sceNpClans->AddFunc(0xd3346dc4, sceNpClansRemovePostedChallenge);
+	sceNpClans->AddFunc(0x0df25834, sceNpClansRetrieveChallenges);
+	sceNpClans->AddFunc(0xce6dc0f0, sceNpClansRemoveChallenge);
+}
\ No newline at end of file
diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpClans.h b/rpcs3/Emu/SysCalls/Modules/sceNpClans.h
new file mode 100644
index 0000000000..faf47e3062
--- /dev/null
+++ b/rpcs3/Emu/SysCalls/Modules/sceNpClans.h
@@ -0,0 +1,253 @@
+#pragma once
+
+// Return codes
+enum
+{
+	SCE_NP_CLANS_ERROR_ALREADY_INITIALIZED                  = 0x80022701,
+	SCE_NP_CLANS_ERROR_NOT_INITIALIZED                      = 0x80022702,
+	SCE_NP_CLANS_ERROR_NOT_SUPPORTED                        = 0x80022703,
+	SCE_NP_CLANS_ERROR_OUT_OF_MEMORY                        = 0x80022704,
+	SCE_NP_CLANS_ERROR_INVALID_ARGUMENT                     = 0x80022705,
+	SCE_NP_CLANS_ERROR_EXCEEDS_MAX                          = 0x80022706,
+	SCE_NP_CLANS_ERROR_BAD_RESPONSE                         = 0x80022707,
+	SCE_NP_CLANS_ERROR_BAD_DATA                             = 0x80022708,
+	SCE_NP_CLANS_ERROR_BAD_REQUEST                          = 0x80022709,
+	SCE_NP_CLANS_ERROR_INVALID_SIGNATURE                    = 0x8002270a,
+	SCE_NP_CLANS_ERROR_INSUFFICIENT                         = 0x8002270b,
+	SCE_NP_CLANS_ERROR_INTERNAL_BUFFER                      = 0x8002270c,
+	SCE_NP_CLANS_ERROR_SERVER_MAINTENANCE                   = 0x8002270d,
+	SCE_NP_CLANS_ERROR_SERVER_END_OF_SERVICE                = 0x8002270e,
+	SCE_NP_CLANS_ERROR_SERVER_BEFORE_START_OF_SERVICE       = 0x8002270f,
+	SCE_NP_CLANS_ERROR_ABORTED                              = 0x80022710,
+	SCE_NP_CLANS_ERROR_SERVICE_UNAVAILABLE                  = 0x80022711,
+	SCE_NP_CLANS_SERVER_ERROR_BAD_REQUEST                   = 0x80022801,
+	SCE_NP_CLANS_SERVER_ERROR_INVALID_TICKET                = 0x80022802,
+	SCE_NP_CLANS_SERVER_ERROR_INVALID_SIGNATURE             = 0x80022803,
+	SCE_NP_CLANS_SERVER_ERROR_TICKET_EXPIRED                = 0x80022804,
+	SCE_NP_CLANS_SERVER_ERROR_INVALID_NPID                  = 0x80022805,
+	SCE_NP_CLANS_SERVER_ERROR_FORBIDDEN                     = 0x80022806,
+	SCE_NP_CLANS_SERVER_ERROR_INTERNAL_SERVER_ERROR         = 0x80022807,
+	SCE_NP_CLANS_SERVER_ERROR_BANNED                        = 0x8002280a,
+	SCE_NP_CLANS_SERVER_ERROR_BLACKLISTED                   = 0x80022811,
+	SCE_NP_CLANS_SERVER_ERROR_INVALID_ENVIRONMENT           = 0x8002281d,
+	SCE_NP_CLANS_SERVER_ERROR_NO_SUCH_CLAN_SERVICE          = 0x8002282f,
+	SCE_NP_CLANS_SERVER_ERROR_NO_SUCH_CLAN                  = 0x80022830,
+	SCE_NP_CLANS_SERVER_ERROR_NO_SUCH_CLAN_MEMBER           = 0x80022831,
+	SCE_NP_CLANS_SERVER_ERROR_BEFORE_HOURS                  = 0x80022832,
+	SCE_NP_CLANS_SERVER_ERROR_CLOSED_SERVICE                = 0x80022833,
+	SCE_NP_CLANS_SERVER_ERROR_PERMISSION_DENIED             = 0x80022834,
+	SCE_NP_CLANS_SERVER_ERROR_CLAN_LIMIT_REACHED            = 0x80022835,
+	SCE_NP_CLANS_SERVER_ERROR_CLAN_LEADER_LIMIT_REACHED     = 0x80022836,
+	SCE_NP_CLANS_SERVER_ERROR_CLAN_MEMBER_LIMIT_REACHED     = 0x80022837,
+	SCE_NP_CLANS_SERVER_ERROR_CLAN_JOINED_LIMIT_REACHED     = 0x80022838,
+	SCE_NP_CLANS_SERVER_ERROR_MEMBER_STATUS_INVALID         = 0x80022839,
+	SCE_NP_CLANS_SERVER_ERROR_DUPLICATED_CLAN_NAME          = 0x8002283a,
+	SCE_NP_CLANS_SERVER_ERROR_CLAN_LEADER_CANNOT_LEAVE      = 0x8002283b,
+	SCE_NP_CLANS_SERVER_ERROR_INVALID_ROLE_PRIORITY         = 0x8002283c,
+	SCE_NP_CLANS_SERVER_ERROR_ANNOUNCEMENT_LIMIT_REACHED    = 0x8002283d,
+	SCE_NP_CLANS_SERVER_ERROR_CLAN_CONFIG_MASTER_NOT_FOUND  = 0x8002283e,
+	SCE_NP_CLANS_SERVER_ERROR_DUPLICATED_CLAN_TAG           = 0x8002283f,
+	SCE_NP_CLANS_SERVER_ERROR_EXCEEDS_CREATE_CLAN_FREQUENCY = 0x80022840,
+	SCE_NP_CLANS_SERVER_ERROR_CLAN_PASSPHRASE_INCORRECT     = 0x80022841,
+	SCE_NP_CLANS_SERVER_ERROR_CANNOT_RECORD_BLACKLIST_ENTRY = 0x80022842,
+	SCE_NP_CLANS_SERVER_ERROR_NO_SUCH_CLAN_ANNOUNCEMENT     = 0x80022843,
+	SCE_NP_CLANS_SERVER_ERROR_VULGAR_WORDS_POSTED           = 0x80022844,
+	SCE_NP_CLANS_SERVER_ERROR_BLACKLIST_LIMIT_REACHED       = 0x80022845,
+	SCE_NP_CLANS_SERVER_ERROR_NO_SUCH_BLACKLIST_ENTRY       = 0x80022846,
+	SCE_NP_CLANS_SERVER_ERROR_INVALID_NP_MESSAGE_FORMAT     = 0x8002284b,
+	SCE_NP_CLANS_SERVER_ERROR_FAILED_TO_SEND_NP_MESSAGE     = 0x8002284c,
+};
+
+// Clan roles
+enum
+{
+	SCE_NP_CLANS_ROLE_UNKNOWN    = 0,
+	SCE_NP_CLANS_ROLE_NON_MEMBER = 1,
+	SCE_NP_CLANS_ROLE_MEMBER     = 2,
+	SCE_NP_CLANS_ROLE_SUB_LEADER = 3,
+	SCE_NP_CLANS_ROLE_LEADER     = 4,
+};
+
+// Clan member status
+enum
+{
+	SCE_NP_CLANS_MEMBER_STATUS_UNKNOWN = 0,
+	SCE_NP_CLANS_MEMBER_STATUS_NORMAL  = 1,
+	SCE_NP_CLANS_MEMBER_STATUS_INVITED = 2,
+	SCE_NP_CLANS_MEMBER_STATUS_PENDING = 3,
+};
+
+// Clan search operators
+enum
+{
+	SCE_NP_CLANS_SEARCH_OPERATOR_EQUAL_TO                 = 0,
+	SCE_NP_CLANS_SEARCH_OPERATOR_NOT_EQUAL_TO             = 1,
+	SCE_NP_CLANS_SEARCH_OPERATOR_GREATER_THAN             = 2,
+	SCE_NP_CLANS_SEARCH_OPERATOR_GREATER_THAN_OR_EQUAL_TO = 3,
+	SCE_NP_CLANS_SEARCH_OPERATOR_LESS_THAN                = 4,
+	SCE_NP_CLANS_SEARCH_OPERATOR_LESS_THAN_OR_EQUAL_TO    = 5,
+	SCE_NP_CLANS_SEARCH_OPERATOR_SIMILAR_TO               = 6,
+};
+
+// Constants for clan functions and structures
+enum
+{
+	SCE_NP_CLANS_ANNOUNCEMENT_MESSAGE_BODY_MAX_LENGTH = 1536,
+	SCE_NP_CLANS_CLAN_BINARY_ATTRIBUTE1_MAX_SIZE      = 190,
+	SCE_NP_CLANS_CLAN_BINARY_DATA_MAX_SIZE            = 10240,
+	SCE_NP_CLANS_MEMBER_BINARY_ATTRIBUTE1_MAX_SIZE    = 16,
+	SCE_NP_CLANS_MEMBER_DESCRIPTION_MAX_LENGTH        = 255,
+	SCE_NP_CLANS_MEMBER_BINARY_DATA_MAX_SIZE          = 1024,
+	SCE_NP_CLANS_MESSAGE_BODY_MAX_LENGTH              = 1536,
+	SCE_NP_CLANS_MESSAGE_SUBJECT_MAX_LENGTH           = 54,
+	SCE_NP_CLANS_MESSAGE_BODY_CHARACTER_MAX           = 512,
+	SCE_NP_CLANS_MESSAGE_SUBJECT_CHARACTER_MAX        = 18,
+	SCE_NP_CLANS_MESSAGE_BINARY_DATA_MAX_SIZE         = 1024,
+	SCE_NP_CLANS_PAGING_REQUEST_START_POSITION_MAX    = 1000000,
+	SCE_NP_CLANS_PAGING_REQUEST_PAGE_MAX              = 100,
+};
+
+// Request handle for clan API
+struct SceNpClansRequest;
+typedef SceNpClansRequest* SceNpClansRequestHandle;
+
+// Paging request structure
+struct SceNpClansPagingRequest
+{
+	be_t<u32> startPos;
+	be_t<u32> max;
+};
+
+// Paging result structure
+struct SceNpClansPagingResult
+{
+	be_t<u32> count;
+	be_t<u32> total;
+};
+
+// Basic clan information
+struct SceNpClansClanBasicInfo
+{
+	be_t<u32> clanId;
+	be_t<u32> numMembers;
+	s8 name[SCE_NP_CLANS_CLAN_NAME_MAX_LENGTH + 1];
+	s8 tag[SCE_NP_CLANS_CLAN_TAG_MAX_LENGTH + 1];
+	//u8 reserved[2];
+};
+
+// Clan entry structure
+struct SceNpClansEntry
+{
+	SceNpClansClanBasicInfo info;
+	be_t<u32> role;
+	be_t<s32> status;
+	bool allowMsg;
+	//u8 reserved[3];
+};
+
+// Clan search attribute structure
+struct SceNpClansSearchableAttr
+{
+	be_t<u32> fields;
+	be_t<u32> intAttr1;
+	be_t<u32> intAttr2;
+	be_t<u32> intAttr3;
+	u8 binAttr1[SCE_NP_CLANS_CLAN_BINARY_ATTRIBUTE1_MAX_SIZE];
+	//u8 reserved[2];
+};
+
+// Clan search profile structure
+struct SceNpClansSearchableProfile
+{
+	SceNpClansSearchableAttr attr;
+	be_t<u32> fields;
+	be_t<u32> numMembers;
+	be_t<s32> tagSearchOp;
+	be_t<s32> numMemberSearchOp;
+	be_t<s32> intAttr1SearchOp;
+	be_t<s32> intAttr2SearchOp;
+	be_t<s32> intAttr3SearchOp;
+	be_t<s32> binAttr1SearchOp;
+	s8 tag[SCE_NP_CLANS_CLAN_TAG_MAX_LENGTH + 1];
+	//u8 reserved[3];
+};
+
+// Clan search name structure
+struct SceNpClansSearchableName
+{
+	be_t<s32> nameSearchOp;
+	s8 name[SCE_NP_CLANS_CLAN_NAME_MAX_LENGTH + 1];
+	//u8 reserved[3];
+};
+
+// Updatable clan information structure
+struct SceNpClansUpdatableClanInfo
+{
+	be_t<u32> fields;
+	s8 description[SCE_NP_CLANS_CLAN_DESCRIPTION_MAX_LENGTH + 1];
+	SceNpClansSearchableAttr attr;
+	u8 binData1;
+	be_t<u32> binData1Size;
+};
+
+// Clan information structure
+struct SceNpClansClanInfo
+{
+	CellRtcTick dateCreated;
+	SceNpClansClanBasicInfo info;
+	SceNpClansUpdatableClanInfo updatable;
+};
+
+// Updatable member information structure
+struct SceNpClansUpdatableMemberInfo
+{
+	be_t<u32> fields;
+	u8 binData1;
+	be_t<u32> binData1Size;
+	u8 binAttr1[SCE_NP_CLANS_CLAN_BINARY_ATTRIBUTE1_MAX_SIZE + 1];
+	s8 description[SCE_NP_CLANS_MEMBER_DESCRIPTION_MAX_LENGTH + 1];
+	bool allowMsg;
+	//u8 reserved[3];
+};
+
+// Member entry structure
+struct SceNpClansMemberEntry
+{
+	SceNpId npid;
+	be_t<u32> role;
+	be_t<s32> status;
+	SceNpClansUpdatableMemberInfo updatable;
+};
+
+// Clan message structure
+struct SceNpClansMessage
+{
+	s8 subject[SCE_NP_CLANS_MESSAGE_SUBJECT_MAX_LENGTH + 1];
+	s8 body[SCE_NP_CLANS_MESSAGE_BODY_MAX_LENGTH + 1];
+	be_t<u32> options;
+};
+
+// Clan message data structure
+struct SceNpClansMessageData
+{
+	u8 binData1;
+	be_t<u32> binData1Size;
+};
+
+// Clan message entry structure
+struct SceNpClansMessageEntry
+{
+	CellRtcTick postDate;
+	be_t<u32> mId;
+	SceNpClansMessage message;
+	SceNpClansMessageData data;
+	SceNpId npid;
+	u8 reserved[4];
+};
+
+// Blacklist entry structure
+struct SceNpClansBlacklistEntry
+{
+	SceNpId entry;
+	SceNpId registeredBy;
+};
\ No newline at end of file
diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpCommerce2.cpp b/rpcs3/Emu/SysCalls/Modules/sceNpCommerce2.cpp
new file mode 100644
index 0000000000..2e0777cdfd
--- /dev/null
+++ b/rpcs3/Emu/SysCalls/Modules/sceNpCommerce2.cpp
@@ -0,0 +1,347 @@
+#include "stdafx.h"
+#include "Emu/SysCalls/Modules.h"
+#include "cellRtc.h"
+#include "sceNpCommerce2.h"
+
+//void sceNpCommerce2_unload();
+//void sceNpCommerce2_init();
+//Module sceNpCommerce2(0x0044, sceNpCommerce2_init, nullptr, sceNpCommerce2_unload);
+Module *sceNpCommerce2 = nullptr;
+
+int sceNpCommerce2ExecuteStoreBrowse()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2GetStoreBrowseUserdata()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2Init()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2Term()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2CreateCtx()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2DestroyCtx()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2CreateSessionStart()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2CreateSessionAbort()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2CreateSessionFinish()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2GetCategoryContentsCreateReq()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2GetCategoryContentsStart()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2GetCategoryContentsGetResult()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2InitGetCategoryContentsResult()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2GetCategoryInfo()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2GetContentInfo()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2GetCategoryInfoFromContentInfo()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2GetGameProductInfoFromContentInfo()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2DestroyGetCategoryContentsResult()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2GetProductInfoCreateReq()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2GetProductInfoStart()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2GetProductInfoGetResult()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2InitGetProductInfoResult()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2GetGameProductInfo()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2DestroyGetProductInfoResult()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2GetProductInfoListCreateReq()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2GetProductInfoListStart()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2GetProductInfoListGetResult()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2InitGetProductInfoListResult()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2GetGameProductInfoFromGetProductInfoListResult()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2DestroyGetProductInfoListResult()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2GetContentRatingInfoFromGameProductInfo()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2GetContentRatingInfoFromCategoryInfo()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2GetContentRatingDescriptor()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2GetGameSkuInfoFromGameProductInfo()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2GetPrice()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2DoCheckoutStartAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2DoCheckoutFinishAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2DoProductBrowseStartAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2DoProductBrowseFinishAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2DoDlListStartAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2DoDlListFinishAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2DoProductCodeStartAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2DoProductCodeFinishAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2GetBGDLAvailability()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2SetBGDLAvailability()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2AbortReq()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+int sceNpCommerce2DestroyReq()
+{
+	UNIMPLEMENTED_FUNC(sceNpCommerce2);
+	return CELL_OK;
+}
+
+void sceNpCommerce2_unload()
+{
+	// TODO: Unload SNS module
+}
+
+void sceNpCommerce2_init()
+{
+	sceNpCommerce2->AddFunc(0xeef51be0, sceNpCommerce2ExecuteStoreBrowse);
+	sceNpCommerce2->AddFunc(0x1fa1b312, sceNpCommerce2GetStoreBrowseUserdata);
+	sceNpCommerce2->AddFunc(0x3539d233, sceNpCommerce2Init);
+	sceNpCommerce2->AddFunc(0x4d4a094c, sceNpCommerce2Term);
+	sceNpCommerce2->AddFunc(0xd9fdcec2, sceNpCommerce2CreateCtx);
+	sceNpCommerce2->AddFunc(0x6f67ea80, sceNpCommerce2DestroyCtx);
+	sceNpCommerce2->AddFunc(0xcc18cd2c, sceNpCommerce2CreateSessionStart);
+	sceNpCommerce2->AddFunc(0x62023e98, sceNpCommerce2CreateSessionAbort);
+	sceNpCommerce2->AddFunc(0x91f8843d, sceNpCommerce2CreateSessionFinish);
+	sceNpCommerce2->AddFunc(0x7370d8d0, sceNpCommerce2GetCategoryContentsCreateReq);
+	sceNpCommerce2->AddFunc(0x371a2edd, sceNpCommerce2GetCategoryContentsStart);
+	sceNpCommerce2->AddFunc(0xca0ea996, sceNpCommerce2GetCategoryContentsGetResult);
+	sceNpCommerce2->AddFunc(0xd8a473a3, sceNpCommerce2InitGetCategoryContentsResult);
+	sceNpCommerce2->AddFunc(0xbd49eab2, sceNpCommerce2GetCategoryInfo);
+	sceNpCommerce2->AddFunc(0x972ab46c, sceNpCommerce2GetContentInfo);
+	sceNpCommerce2->AddFunc(0xfc216890, sceNpCommerce2GetCategoryInfoFromContentInfo);
+	sceNpCommerce2->AddFunc(0xe51a4944, sceNpCommerce2GetGameProductInfoFromContentInfo);
+	sceNpCommerce2->AddFunc(0x9d9cb96b, sceNpCommerce2DestroyGetCategoryContentsResult);
+	sceNpCommerce2->AddFunc(0xa975ebb4, sceNpCommerce2GetProductInfoCreateReq);
+	sceNpCommerce2->AddFunc(0x8f46325b, sceNpCommerce2GetProductInfoStart);
+	sceNpCommerce2->AddFunc(0xbf5f58ea, sceNpCommerce2GetProductInfoGetResult);
+	sceNpCommerce2->AddFunc(0xf798f5e3, sceNpCommerce2InitGetProductInfoResult);
+	sceNpCommerce2->AddFunc(0xef645654, sceNpCommerce2GetGameProductInfo);
+	sceNpCommerce2->AddFunc(0xef8eafcd, sceNpCommerce2DestroyGetProductInfoResult);
+	sceNpCommerce2->AddFunc(0xe1e7b5ac, sceNpCommerce2GetProductInfoListCreateReq);
+	sceNpCommerce2->AddFunc(0x9cde07cc, sceNpCommerce2GetProductInfoListStart);
+	sceNpCommerce2->AddFunc(0x146618df, sceNpCommerce2GetProductInfoListGetResult);
+	sceNpCommerce2->AddFunc(0xe0f90e44, sceNpCommerce2InitGetProductInfoListResult);
+	sceNpCommerce2->AddFunc(0xd9956ce7, sceNpCommerce2GetGameProductInfoFromGetProductInfoListResult);
+	sceNpCommerce2->AddFunc(0xf6139b58, sceNpCommerce2DestroyGetProductInfoListResult);
+	sceNpCommerce2->AddFunc(0xec324c8f, sceNpCommerce2GetContentRatingInfoFromGameProductInfo);
+	sceNpCommerce2->AddFunc(0xac78c1f3, sceNpCommerce2GetContentRatingInfoFromCategoryInfo);
+	sceNpCommerce2->AddFunc(0x150fdca3, sceNpCommerce2GetContentRatingDescriptor);
+	sceNpCommerce2->AddFunc(0xdb19194c, sceNpCommerce2GetGameSkuInfoFromGameProductInfo);
+	sceNpCommerce2->AddFunc(0xda8e322d, sceNpCommerce2GetPrice);
+	sceNpCommerce2->AddFunc(0x104551a6, sceNpCommerce2DoCheckoutStartAsync);
+	sceNpCommerce2->AddFunc(0xd43a130e, sceNpCommerce2DoCheckoutFinishAsync);
+	sceNpCommerce2->AddFunc(0x9825a0fc, sceNpCommerce2DoProductBrowseStartAsync);
+	sceNpCommerce2->AddFunc(0xb23e3bd1, sceNpCommerce2DoProductBrowseFinishAsync);
+	sceNpCommerce2->AddFunc(0x6ca9efd4, sceNpCommerce2DoDlListStartAsync);
+	sceNpCommerce2->AddFunc(0x410d42be, sceNpCommerce2DoDlListFinishAsync);
+	sceNpCommerce2->AddFunc(0xde7ab33d, sceNpCommerce2DoProductCodeStartAsync);
+	sceNpCommerce2->AddFunc(0xa9f945b3, sceNpCommerce2DoProductCodeFinishAsync);
+	sceNpCommerce2->AddFunc(0x3d627d81, sceNpCommerce2GetBGDLAvailability);
+	sceNpCommerce2->AddFunc(0xa5a863fe, sceNpCommerce2SetBGDLAvailability);
+	sceNpCommerce2->AddFunc(0x8df0057f, sceNpCommerce2AbortReq);
+	sceNpCommerce2->AddFunc(0x2a910f05, sceNpCommerce2DestroyReq);
+}
\ No newline at end of file
diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpCommerce2.h b/rpcs3/Emu/SysCalls/Modules/sceNpCommerce2.h
new file mode 100644
index 0000000000..3dd26730ef
--- /dev/null
+++ b/rpcs3/Emu/SysCalls/Modules/sceNpCommerce2.h
@@ -0,0 +1,275 @@
+#pragma once
+
+// Return codes
+enum
+{
+	SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED                      = 0x80023001,
+	SCE_NP_COMMERCE2_ERROR_ALREADY_INITIALIZED                  = 0x80023002,
+	SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT                     = 0x80023003,
+	SCE_NP_COMMERCE2_ERROR_UNSUPPORTED_VERSION                  = 0x80023004,
+	SCE_NP_COMMERCE2_ERROR_CTX_MAX                              = 0x80023005,
+	SCE_NP_COMMERCE2_ERROR_INVALID_INDEX                        = 0x80023006,
+	SCE_NP_COMMERCE2_ERROR_INVALID_SKUID                        = 0x80023007,
+	SCE_NP_COMMERCE2_ERROR_INVALID_SKU_NUM                      = 0x80023008,
+	SCE_NP_COMMERCE2_ERROR_INVALID_MEMORY_CONTAINER             = 0x80023009,
+	SCE_NP_COMMERCE2_ERROR_INSUFFICIENT_MEMORY_CONTAINER        = 0x8002300a,
+	SCE_NP_COMMERCE2_ERROR_OUT_OF_MEMORY                        = 0x8002300b,
+	SCE_NP_COMMERCE2_ERROR_CTX_NOT_FOUND                        = 0x8002300c,
+	SCE_NP_COMMERCE2_ERROR_CTXID_NOT_AVAILABLE                  = 0x8002300d,
+	SCE_NP_COMMERCE2_ERROR_REQ_NOT_FOUND                        = 0x8002300e,
+	SCE_NP_COMMERCE2_ERROR_REQID_NOT_AVAILABLE                  = 0x8002300f,
+	SCE_NP_COMMERCE2_ERROR_ABORTED                              = 0x80023010,
+	SCE_NP_COMMERCE2_ERROR_RESPONSE_BUF_TOO_SMALL               = 0x80023012,
+	SCE_NP_COMMERCE2_ERROR_COULD_NOT_RECV_WHOLE_RESPONSE_DATA   = 0x80023013,
+	SCE_NP_COMMERCE2_ERROR_INVALID_RESULT_DATA                  = 0x80023014,
+	SCE_NP_COMMERCE2_ERROR_UNKNOWN                              = 0x80023015,
+	SCE_NP_COMMERCE2_ERROR_SERVER_MAINTENANCE                   = 0x80023016,
+	SCE_NP_COMMERCE2_ERROR_SERVER_UNKNOWN                       = 0x80023017,
+	SCE_NP_COMMERCE2_ERROR_INSUFFICIENT_BUF_SIZE                = 0x80023018,
+	SCE_NP_COMMERCE2_ERROR_REQ_MAX                              = 0x80023019,
+	SCE_NP_COMMERCE2_ERROR_INVALID_TARGET_TYPE                  = 0x8002301a,
+	SCE_NP_COMMERCE2_ERROR_INVALID_TARGET_ID                    = 0x8002301b,
+	SCE_NP_COMMERCE2_ERROR_INVALID_SIZE                         = 0x8002301c,
+	SCE_NP_COMMERCE2_ERROR_DATA_NOT_FOUND                       = 0x80023087,
+	SCE_NP_COMMERCE2_SERVER_ERROR_BAD_REQUEST                   = 0x80023101,
+	SCE_NP_COMMERCE2_SERVER_ERROR_UNKNOWN_ERROR                 = 0x80023102,
+	SCE_NP_COMMERCE2_SERVER_ERROR_SESSION_EXPIRED               = 0x80023105,
+	SCE_NP_COMMERCE2_SERVER_ERROR_ACCESS_PERMISSION_DENIED      = 0x80023107,
+	SCE_NP_COMMERCE2_SERVER_ERROR_NO_SUCH_CATEGORY              = 0x80023110,
+	SCE_NP_COMMERCE2_SERVER_ERROR_NO_SUCH_PRODUCT               = 0x80023111,
+	SCE_NP_COMMERCE2_SERVER_ERROR_NOT_ELIGIBILITY               = 0x80023113,
+	SCE_NP_COMMERCE2_SERVER_ERROR_INVALID_SKU                   = 0x8002311a,
+	SCE_NP_COMMERCE2_SERVER_ERROR_ACCOUNT_SUSPENDED1            = 0x8002311b,
+	SCE_NP_COMMERCE2_SERVER_ERROR_ACCOUNT_SUSPENDED2            = 0x8002311c,
+	SCE_NP_COMMERCE2_SERVER_ERROR_OVER_SPENDING_LIMIT           = 0x80023120,
+	SCE_NP_COMMERCE2_SERVER_ERROR_INVALID_VOUCHER               = 0x8002312f,
+	SCE_NP_COMMERCE2_SERVER_ERROR_VOUCHER_ALREADY_CONSUMED      = 0x80023130,
+	SCE_NP_COMMERCE2_SERVER_ERROR_EXCEEDS_AGE_LIMIT_IN_BROWSING = 0x80023139,
+	SCE_NP_COMMERCE2_SYSTEM_UTIL_ERROR_INVALID_VOUCHER          = 0x80024002,
+	SCE_NP_COMMERCE_ERROR_REQ_BUSY                              = 0x8002940d,
+};
+
+// Event types
+enum
+{
+	SCE_NP_COMMERCE2_EVENT_REQUEST_ERROR            = 0x0001,
+	SCE_NP_COMMERCE2_EVENT_CREATE_SESSION_DONE      = 0x0011,
+	SCE_NP_COMMERCE2_EVENT_CREATE_SESSION_ABORT     = 0x0012,
+	SCE_NP_COMMERCE2_EVENT_DO_CHECKOUT_STARTED      = 0x0021,
+	SCE_NP_COMMERCE2_EVENT_DO_CHECKOUT_SUCCESS      = 0x0022,
+	SCE_NP_COMMERCE2_EVENT_DO_CHECKOUT_BACK         = 0x0023,
+	SCE_NP_COMMERCE2_EVENT_DO_CHECKOUT_FINISHED     = 0x0024,
+	SCE_NP_COMMERCE2_EVENT_DO_DL_LIST_STARTED       = 0x0031,
+	SCE_NP_COMMERCE2_EVENT_DO_DL_LIST_SUCCESS       = 0x0032,
+	SCE_NP_COMMERCE2_EVENT_DO_DL_LIST_FINISHED      = 0x0034,
+	SCE_NP_COMMERCE2_EVENT_DO_PROD_BROWSE_STARTED   = 0x0041,
+	SCE_NP_COMMERCE2_EVENT_DO_PROD_BROWSE_SUCCESS   = 0x0042,
+	SCE_NP_COMMERCE2_EVENT_DO_PROD_BROWSE_BACK      = 0x0043,
+	SCE_NP_COMMERCE2_EVENT_DO_PROD_BROWSE_FINISHED  = 0x0044,
+	SCE_NP_COMMERCE2_EVENT_DO_PROD_BROWSE_OPENED    = 0x0045,
+	SCE_NP_COMMERCE2_EVENT_DO_PRODUCT_CODE_STARTED  = 0x0051,
+	SCE_NP_COMMERCE2_EVENT_DO_PRODUCT_CODE_SUCCESS  = 0x0052,
+	SCE_NP_COMMERCE2_EVENT_DO_PRODUCT_CODE_BACK     = 0x0053,
+	SCE_NP_COMMERCE2_EVENT_DO_PRODUCT_CODE_FINISHED = 0x0054,
+	SCE_NP_COMMERCE2_EVENT_EMPTY_STORE_CHECK_DONE   = 0x0061,
+	SCE_NP_COMMERCE2_EVENT_EMPTY_STORE_CHECK_ABORT  = 0x0062,
+};
+
+// Category data type
+enum SceNpCommerce2CategoryDataType
+{
+	SCE_NP_COMMERCE2_CAT_DATA_TYPE_THIN = 0,
+	SCE_NP_COMMERCE2_CAT_DATA_TYPE_NORMAL,
+	SCE_NP_COMMERCE2_CAT_DATA_TYPE_MAX
+};
+
+// Game product data type
+enum SceNpCommerce2GameProductDataType
+{
+	SCE_NP_COMMERCE2_GAME_PRODUCT_DATA_TYPE_THIN = 0,
+	SCE_NP_COMMERCE2_GAME_PRODUCT_DATA_TYPE_NORMAL,
+	SCE_NP_COMMERCE2_GAME_PRODUCT_DATA_TYPE_MAX
+};
+
+// SKU data type
+enum SceNpCommerce2GameSkuDataType
+{
+	SCE_NP_COMMERCE2_GAME_SKU_DATA_TYPE_THIN = 0,
+	SCE_NP_COMMERCE2_GAME_SKU_DATA_TYPE_NORMAL,
+	SCE_NP_COMMERCE2_GAME_SKU_DATA_TYPE_MAX
+};
+
+// Constanc for commerce functions and structures
+enum
+{
+	SCE_NP_COMMERCE2_CURRENCY_CODE_LEN                     = 3,
+	SCE_NP_COMMERCE2_CURRENCY_SYMBOL_LEN                   = 3,
+	SCE_NP_COMMERCE2_THOUSAND_SEPARATOR_LEN                = 4,
+	SCE_NP_COMMERCE2_DECIMAL_LETTER_LEN                    = 4,
+	SCE_NP_COMMERCE2_SP_NAME_LEN                           = 256,
+	SCE_NP_COMMERCE2_CATEGORY_ID_LEN                       = 56,
+	SCE_NP_COMMERCE2_CATEGORY_NAME_LEN                     = 256,
+	SCE_NP_COMMERCE2_CATEGORY_DESCRIPTION_LEN              = 1024,
+	SCE_NP_COMMERCE2_PRODUCT_ID_LEN                        = 48,
+	SCE_NP_COMMERCE2_PRODUCT_NAME_LEN                      = 256,
+	SCE_NP_COMMERCE2_PRODUCT_SHORT_DESCRIPTION_LEN         = 1024,
+	SCE_NP_COMMERCE2_PRODUCT_LONG_DESCRIPTION_LEN          = 4000,
+	SCE_NP_COMMERCE2_SKU_ID_LEN                            = 56,
+	SCE_NP_COMMERCE2_SKU_NAME_LEN                          = 180,
+	SCE_NP_COMMERCE2_URL_LEN                               = 256,
+	SCE_NP_COMMERCE2_RATING_SYSTEM_ID_LEN                  = 16,
+	SCE_NP_COMMERCE2_RATING_DESCRIPTION_LEN                = 60,
+	SCE_NP_COMMERCE2_RECV_BUF_SIZE                         = 262144,
+	SCE_NP_COMMERCE2_PRODUCT_CODE_BLOCK_LEN                = 4,
+	SCE_NP_COMMERCE2_GETCAT_MAX_COUNT                      = 60,
+	SCE_NP_COMMERCE2_DO_CHECKOUT_MEMORY_CONTAINER_SIZE     = 10485760,
+	SCE_NP_COMMERCE2_DO_PROD_BROWSE_MEMORY_CONTAINER_SIZE  = 16777216,
+	SCE_NP_COMMERCE2_DO_DL_LIST_MEMORY_CONTAINER_SIZE      = 10485760,
+	SCE_NP_COMMERCE2_DO_PRODUCT_CODE_MEMORY_CONTAINER_SIZE = 16777216,
+};
+
+// Common structure used when receiving data
+struct SceNpCommerce2CommonData
+{
+	be_t<u32> version;
+	be_t<u32> buf_head;
+	be_t<u32> buf_size;
+	be_t<u32> data;
+	be_t<u32> data_size;
+	be_t<u32> data2;
+	//be_t<u32> reserved[4];
+};
+
+// Structure indicating the range of results obtained
+struct SceNpCommerce2Range
+{
+	be_t<u32> startPosition;
+	be_t<u32> count;
+	be_t<u32> totalCountOfResults;
+};
+
+// Structure for session information
+struct SceNpCommerce2SessionInfo
+{
+	s8 currencyCode[SCE_NP_COMMERCE2_CURRENCY_CODE_LEN + 1];
+	be_t<u32> decimals;
+	s8 currencySymbol[SCE_NP_COMMERCE2_CURRENCY_SYMBOL_LEN + 1];
+	be_t<u32> symbolPosition;
+	bool symbolWithSpace;
+	u8 padding1[3];
+	s8 thousandSeparator[SCE_NP_COMMERCE2_THOUSAND_SEPARATOR_LEN + 1];
+	s8 decimalLetter[SCE_NP_COMMERCE2_DECIMAL_LETTER_LEN + 1];
+	u8 padding2[1];
+	//be_t<u32> reserved[4];
+};
+
+// Structure for category information
+struct SceNpCommerce2CategoryInfo
+{
+	SceNpCommerce2CommonData commonData;
+	SceNpCommerce2CategoryDataType dataType;
+	s8 categoryId;
+	CellRtcTick releaseDate;
+	s8 categoryName;
+	s8 categoryDescription;
+	s8 imageUrl;
+	s8 spName;
+	be_t<u32> countOfSubCategory;
+	be_t<u32> countOfProduct;
+};
+
+// Structure for content information within the category
+struct SceNpCommerce2ContentInfo
+{
+	SceNpCommerce2CommonData commonData;
+	be_t<u32> contentType;
+};
+
+// Structure for initialized product data
+struct SceNpCommerce2GetProductInfoResult
+{
+	SceNpCommerce2CommonData commonData;
+};
+
+// Structure for game product information
+struct SceNpCommerce2GameProductInfo
+{
+	SceNpCommerce2CommonData commonData;
+	SceNpCommerce2GameProductDataType dataType;
+	s8 productId;
+	be_t<u32> countOfSku;
+	u8 padding[4];
+	CellRtcTick releaseDate;
+	s8 productName;
+	s8 productShortDescription;
+	s8 imageUrl;
+	s8 spName;
+	s8 productLongDescription;
+	s8 legalDescription;
+};
+
+// Structure for initialized product info list
+struct SceNpCommerce2GetProductInfoListResult
+{
+	SceNpCommerce2CommonData commonData;
+};
+
+// Structure for rating information
+struct SceNpCommerce2ContentRatingInfo
+{
+	SceNpCommerce2CommonData commonData;
+	s8 ratingSystemId;
+	s8 imageUrl;
+	be_t<u32> countOfContentRatingDescriptor;
+};
+
+// Structure for a rating descriptor
+struct SceNpCommerce2ContentRatingDescriptor
+{
+	SceNpCommerce2CommonData commonData;
+	be_t<u32> descriptorType;
+	s8 imageUrl;
+	s8 contentRatingDescription;
+};
+
+// Structure for SKU information
+struct SceNpCommerce2GameSkuInfo
+{
+	SceNpCommerce2CommonData commonData;
+	SceNpCommerce2GameSkuDataType dataType;
+	s8 skuId;
+	be_t<u32> skuType;
+	be_t<u32> countUntilExpiration;
+	be_t<u32> timeUntilExpiration;
+	be_t<u32> purchasabilityFlag;
+	be_t<u32> annotation;
+	bool downloadable;
+	u8 padding[3];
+	be_t<u32> price;
+	s8 skuName;
+	s8 productId;
+	s8 contentLinkUrl;
+	be_t<u32> countOfRewardInfo;
+	//be_t<u32> reserved[8];
+};
+
+// Structure of parameters for in-game product browsing
+struct SceNpCommerce2ProductBrowseParam
+{
+	be_t<u32> size;
+};
+
+// Structure of parameters for promotion code input
+struct SceNpCommerce2ProductCodeParam
+{
+	be_t<u32> size;
+	be_t<u32> inputMode; // Unsigned ints go into be_t<u32>, right?
+	s8 code1[SCE_NP_COMMERCE2_PRODUCT_CODE_BLOCK_LEN + 1];
+	//s8 padding1[3];
+	s8 code2[SCE_NP_COMMERCE2_PRODUCT_CODE_BLOCK_LEN + 1];
+	//s8 padding2[3];
+	s8 code3[SCE_NP_COMMERCE2_PRODUCT_CODE_BLOCK_LEN + 1];
+	//s8 padding3[3];
+};
+
+typedef void(*SceNpCommerce2Handler)(u32 ctx_id, u32 subject_id, s32 event, s32 error_code, u32 arg);
\ No newline at end of file
diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpSns.cpp b/rpcs3/Emu/SysCalls/Modules/sceNpSns.cpp
new file mode 100644
index 0000000000..a5930c192d
--- /dev/null
+++ b/rpcs3/Emu/SysCalls/Modules/sceNpSns.cpp
@@ -0,0 +1,18 @@
+#include "stdafx.h"
+#include "Emu/SysCalls/Modules.h"
+#include "sceNpSns.h"
+
+//void sceNpSns_unload();
+//void sceNpSns_init();
+//Module sceNpSns(0x0059, sceNpSns_init, nullptr, sceNpSns_unload);
+Module *sceNpSns = nullptr;
+
+void sceNpSns_unload()
+{
+	// TODO: Unload SNS module
+}
+
+void sceNpSns_init()
+{
+	// TODO: Register SNS module functions here
+}
\ No newline at end of file
diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpSns.h b/rpcs3/Emu/SysCalls/Modules/sceNpSns.h
new file mode 100644
index 0000000000..874ea96be1
--- /dev/null
+++ b/rpcs3/Emu/SysCalls/Modules/sceNpSns.h
@@ -0,0 +1,38 @@
+#pragma once
+
+// Return codes
+enum
+{
+	SCE_NP_SNS_ERROR_UNKNOWN = 0x80024501,
+	SCE_NP_SNS_ERROR_NOT_SIGN_IN = 0x80024502,
+	SCE_NP_SNS_ERROR_INVALID_ARGUMENT = 0x80024503,
+	SCE_NP_SNS_ERROR_OUT_OF_MEMORY = 0x80024504,
+	SCE_NP_SNS_ERROR_SHUTDOWN = 0x80024505,
+	SCE_NP_SNS_ERROR_BUSY = 0x80024506,
+	SCE_NP_SNS_FB_ERROR_ALREADY_INITIALIZED = 0x80024511,
+	SCE_NP_SNS_FB_ERROR_NOT_INITIALIZED = 0x80024512,
+	SCE_NP_SNS_FB_ERROR_EXCEEDS_MAX = 0x80024513,
+	SCE_NP_SNS_FB_ERROR_UNKNOWN_HANDLE = 0x80024514,
+	SCE_NP_SNS_FB_ERROR_ABORTED = 0x80024515,
+	SCE_NP_SNS_FB_ERROR_ALREADY_ABORTED = 0x80024516,
+	SCE_NP_SNS_FB_ERROR_CONFIG_DISABLED = 0x80024517,
+	SCE_NP_SNS_FB_ERROR_FBSERVER_ERROR_RESPONSE = 0x80024518,
+	SCE_NP_SNS_FB_ERROR_THROTTLE_CLOSED = 0x80024519,
+	SCE_NP_SNS_FB_ERROR_OPERATION_INTERVAL_VIOLATION = 0x8002451a,
+	SCE_NP_SNS_FB_ERROR_UNLOADED_THROTTLE = 0x8002451b,
+	SCE_NP_SNS_FB_ERROR_ACCESS_NOT_ALLOWED = 0x8002451c,
+};
+
+// Constants for SNS functions
+enum
+{
+	SCE_NP_SNS_FB_INVALID_HANDLE = 0,
+	SCE_NP_SNS_FB_HANDLE_SLOT_MAX = 4,
+};
+
+// Intilization parameters for functionalities coordinated with Facebook
+struct SceNpSnsFbInitParams
+{
+	be_t<u32> pool;
+	be_t<u32> poolSize;
+};
\ No newline at end of file
diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp b/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp
index bcefea5a49..d71ee19a14 100644
--- a/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp
@@ -8,6 +8,7 @@
 #include "Emu/SysCalls/Modules.h"
 #include "Emu/FS/vfsDir.h"
 
+#include "cellRtc.h"
 #include "sceNp.h"
 #include "sceNpTrophy.h"
 
diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.h b/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.h
index 2c9b448127..4fee4d990c 100644
--- a/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.h
+++ b/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "cellRtc.h"
 
+// Error codes
 enum
 {
 	SCE_NP_TROPHY_ERROR_ALREADY_INITIALIZED          = 0x80022901,
diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpTus.cpp b/rpcs3/Emu/SysCalls/Modules/sceNpTus.cpp
new file mode 100644
index 0000000000..ddd66df6c9
--- /dev/null
+++ b/rpcs3/Emu/SysCalls/Modules/sceNpTus.cpp
@@ -0,0 +1,397 @@
+#include "stdafx.h"
+#include "Emu/SysCalls/Modules.h"
+#include "cellRtc.h"
+#include "sceNp.h"
+#include "sceNpTus.h"
+
+//void sceNpTus_unload();
+//void sceNpTus_init();
+//Module sceNpTus(0x0045, sceNpTus_init, nullptr, sceNpTus_unload);
+Module *sceNpTus = nullptr;
+
+int sceNpTusInit()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusTerm()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusCreateTitleCtx()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusDestroyTitleCtx()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusCreateTransactionCtx()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusDestroyTransactionCtx()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusSetTimeout()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusAbortTransaction()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusWaitAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusPollAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusSetMultiSlotVariable()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusSetMultiSlotVariableVUser()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusSetMultiSlotVariableAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusSetMultiSlotVariableVUserAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusGetMultiSlotVariable()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusGetMultiSlotVariableVUser()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusGetMultiSlotVariableAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusGetMultiSlotVariableVUserAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusGetMultiUserVariable()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusGetMultiUserVariableVUser()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusGetMultiUserVariableAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusGetMultiUserVariableVUserAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusAddAndGetVariable()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusAddAndGetVariableVUser()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusAddAndGetVariableAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusAddAndGetVariableVUserAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusTryAndSetVariable()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusTryAndSetVariableVUser()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusTryAndSetVariableAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusTryAndSetVariableVUserAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusDeleteMultiSlotVariable()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusDeleteMultiSlotVariableVUser()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusDeleteMultiSlotVariableAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusDeleteMultiSlotVariableVUserAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusSetData()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusSetDataVUser()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusSetDataAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusSetDataVUserAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusGetData()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusGetDataVUser()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusGetDataAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusGetDataVUserAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusGetMultiSlotDataStatus()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusGetMultiSlotDataStatusVUser()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusGetMultiSlotDataStatusAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusGetMultiSlotDataStatusVUserAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusGetMultiUserDataStatus()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusGetMultiUserDataStatusVUser()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusGetMultiUserDataStatusAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusGetMultiUserDataStatusVUserAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusDeleteMultiSlotData()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusDeleteMultiSlotDataVUser()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusDeleteMultiSlotDataAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+int sceNpTusDeleteMultiSlotDataVUserAsync()
+{
+	UNIMPLEMENTED_FUNC(sceNpTus);
+	return CELL_OK;
+}
+
+void sceNpTus_unload()
+{
+	// TODO: Unload Tus module
+}
+
+void sceNpTus_init()
+{
+	sceNpTus->AddFunc(0x8f87a06b, sceNpTusInit);
+	sceNpTus->AddFunc(0x225aed26, sceNpTusTerm);
+	sceNpTus->AddFunc(0x7caf58ee, sceNpTusCreateTitleCtx);
+	sceNpTus->AddFunc(0x2e162a62, sceNpTusDestroyTitleCtx);
+	sceNpTus->AddFunc(0x1904435e, sceNpTusCreateTransactionCtx);
+	sceNpTus->AddFunc(0x44eca8b4, sceNpTusDestroyTransactionCtx);
+	sceNpTus->AddFunc(0x59432970, sceNpTusSetTimeout);
+	sceNpTus->AddFunc(0x325c6284, sceNpTusAbortTransaction);
+	sceNpTus->AddFunc(0xb8e8ff22, sceNpTusWaitAsync);
+	sceNpTus->AddFunc(0x19bce18c, sceNpTusPollAsync);
+	sceNpTus->AddFunc(0xcc86a8f6, sceNpTusSetMultiSlotVariable);
+	sceNpTus->AddFunc(0xf819be91, sceNpTusSetMultiSlotVariableVUser);
+	sceNpTus->AddFunc(0x065b610d, sceNpTusSetMultiSlotVariableAsync);
+	sceNpTus->AddFunc(0x96a06212, sceNpTusSetMultiSlotVariableVUserAsync);
+	sceNpTus->AddFunc(0x0423e622, sceNpTusGetMultiSlotVariable);
+	sceNpTus->AddFunc(0x2357ba9e, sceNpTusGetMultiSlotVariableVUser);
+	sceNpTus->AddFunc(0xbb2877f2, sceNpTusGetMultiSlotVariableAsync);
+	sceNpTus->AddFunc(0xfc7d346e, sceNpTusGetMultiSlotVariableVUserAsync);
+	sceNpTus->AddFunc(0x0d15043b, sceNpTusGetMultiUserVariable);
+	sceNpTus->AddFunc(0x6c511024, sceNpTusGetMultiUserVariableVUser);
+	sceNpTus->AddFunc(0xcc7a31cd, sceNpTusGetMultiUserVariableAsync);
+	sceNpTus->AddFunc(0x9549d22c, sceNpTusGetMultiUserVariableVUserAsync);
+	sceNpTus->AddFunc(0x94989003, sceNpTusAddAndGetVariable);
+	sceNpTus->AddFunc(0xf60be06f, sceNpTusAddAndGetVariableVUser);
+	sceNpTus->AddFunc(0x1fa5c87d, sceNpTusAddAndGetVariableAsync);
+	sceNpTus->AddFunc(0xa7993bf3, sceNpTusAddAndGetVariableVUserAsync);
+	sceNpTus->AddFunc(0x47e9424a, sceNpTusTryAndSetVariable);
+	sceNpTus->AddFunc(0x3602bc80, sceNpTusTryAndSetVariableVUser);
+	sceNpTus->AddFunc(0xbbb244b7, sceNpTusTryAndSetVariableAsync);
+	sceNpTus->AddFunc(0x17db7aa7, sceNpTusTryAndSetVariableVUserAsync);
+	sceNpTus->AddFunc(0xaf985783, sceNpTusDeleteMultiSlotVariable);
+	sceNpTus->AddFunc(0xc4e51fbf, sceNpTusDeleteMultiSlotVariableVUser);
+	sceNpTus->AddFunc(0xf5363608, sceNpTusDeleteMultiSlotVariableAsync);
+	sceNpTus->AddFunc(0xc2e18da8, sceNpTusDeleteMultiSlotVariableVUserAsync);
+	sceNpTus->AddFunc(0x7d5f0f0e, sceNpTusSetData);
+	sceNpTus->AddFunc(0x0835deb2, sceNpTusSetDataVUser);
+	sceNpTus->AddFunc(0xe847341f, sceNpTusSetDataAsync);
+	sceNpTus->AddFunc(0x9cc0cf44, sceNpTusSetDataVUserAsync);
+	sceNpTus->AddFunc(0x8ddd0d85, sceNpTusGetData);
+	sceNpTus->AddFunc(0xae4e590e, sceNpTusGetDataVUser);
+	sceNpTus->AddFunc(0x5175abb9, sceNpTusGetDataAsync);
+	sceNpTus->AddFunc(0x38f364b0, sceNpTusGetDataVUserAsync);
+	sceNpTus->AddFunc(0xc848d425, sceNpTusGetMultiSlotDataStatus);
+	sceNpTus->AddFunc(0xa3abfadb, sceNpTusGetMultiSlotDataStatusVUser);
+	sceNpTus->AddFunc(0x651fd79f, sceNpTusGetMultiSlotDataStatusAsync);
+	sceNpTus->AddFunc(0x2ab21ea9, sceNpTusGetMultiSlotDataStatusVUserAsync);
+	sceNpTus->AddFunc(0x348dbcb4, sceNpTusGetMultiUserDataStatus);
+	sceNpTus->AddFunc(0x2d1b9f1a, sceNpTusGetMultiUserDataStatusVUser);
+	sceNpTus->AddFunc(0xc66ba67e, sceNpTusGetMultiUserDataStatusAsync);
+	sceNpTus->AddFunc(0x368fec59, sceNpTusGetMultiUserDataStatusVUserAsync);
+	sceNpTus->AddFunc(0xe0719847, sceNpTusDeleteMultiSlotData);
+	sceNpTus->AddFunc(0x01711e81, sceNpTusDeleteMultiSlotDataVUser);
+	sceNpTus->AddFunc(0x3175af23, sceNpTusDeleteMultiSlotDataAsync);
+	sceNpTus->AddFunc(0xc815b219, sceNpTusDeleteMultiSlotDataVUserAsync);
+}
\ No newline at end of file
diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpTus.h b/rpcs3/Emu/SysCalls/Modules/sceNpTus.h
new file mode 100644
index 0000000000..941e9d92b3
--- /dev/null
+++ b/rpcs3/Emu/SysCalls/Modules/sceNpTus.h
@@ -0,0 +1,46 @@
+#pragma once
+
+// Constants for TUS functions and structures
+enum
+{
+	SCE_NP_TUS_DATA_INFO_MAX_SIZE = 384,
+	SCE_NP_TUS_MAX_CTX_NUM = 32,
+	SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS = 64,
+	SCE_NP_TUS_MAX_USER_NUM_PER_TRANS = 101,
+};
+
+SceNpOnlineId SceNpTusVirtualUserId;
+
+// Structure for representing a TUS variable
+struct SceNpTusVariable
+{
+	SceNpId ownerId;
+	be_t<s32> hasData;
+	//u8 pad[4];
+	CellRtcTick lastChangedDate;
+	SceNpId lastChangedAuthorId;
+	be_t<s64> variable;
+	be_t<s64> oldVariable;
+	//u8 reserved[16];
+};
+
+// Structure for representing the accessory information of a TUS data
+struct SceNpTusDataInfo
+{
+	be_t<u32> infoSize;
+	//u8 pad[4];
+	u8 data[SCE_NP_TUS_DATA_INFO_MAX_SIZE];
+};
+
+// Structure for respreseting the status of TUS data
+struct SceNpTusDataStatus
+{
+	SceNpId ownerId;
+	be_t<s32> hasData;
+	CellRtcTick lastChangedDate;
+	SceNpId lastChangedAuthorId;
+	be_t<u32> data;
+	be_t<u32> dataSize;
+	//u8 pad[4];
+	SceNpTusDataInfo info;
+};
\ No newline at end of file
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index 81ff0fdffb..a714d2e80c 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -180,7 +180,11 @@
     <ClCompile Include="Emu\SysCalls\Modules\libsnd3.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\libsynth2.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\sceNp.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\sceNpClans.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\sceNpCommerce2.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\sceNpSns.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\sceNpTrophy.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\sceNpTus.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\SC_Keyboard.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\SC_Mouse.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\SC_Pad.cpp" />
@@ -372,7 +376,11 @@
     <ClInclude Include="Emu\SysCalls\Modules\libsnd3.h" />
     <ClInclude Include="Emu\SysCalls\Modules\libsynth2.h" />
     <ClInclude Include="Emu\SysCalls\Modules\sceNp.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\sceNpClans.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\sceNpCommerce2.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\sceNpSns.h" />
     <ClInclude Include="Emu\SysCalls\Modules\sceNpTrophy.h" />
+    <ClInclude Include="Emu\SysCalls\Modules\sceNpTus.h" />
     <ClInclude Include="Emu\SysCalls\Modules\sysPrxForUser.h" />
     <ClInclude Include="Emu\SysCalls\Modules\sys_net.h" />
     <ClInclude Include="Emu\SysCalls\SC_FUNC.h" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index 034c7a7020..ec32261038 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -212,9 +212,21 @@
     <ClCompile Include="Emu\SysCalls\Modules\sceNp.cpp">
       <Filter>Emu\SysCalls\Modules</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\sceNpClans.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\sceNpCommerce2.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\sceNpSns.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
     <ClCompile Include="Emu\SysCalls\Modules\sceNpTrophy.cpp">
       <Filter>Emu\SysCalls\Modules</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\sceNpTus.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
     <ClCompile Include="Emu\SysCalls\Modules\sysPrxForUser.cpp">
       <Filter>Emu\SysCalls\Modules</Filter>
     </ClCompile>
@@ -700,9 +712,21 @@
     <ClInclude Include="Emu\SysCalls\Modules\sceNp.h">
       <Filter>Emu\SysCalls\Modules</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\sceNpClans.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\sceNpCommerce2.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\sceNpSns.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
     <ClInclude Include="Emu\SysCalls\Modules\sceNpTrophy.h">
       <Filter>Emu\SysCalls\Modules</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\SysCalls\Modules\sceNpTus.h">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClInclude>
     <ClInclude Include="Emu\SysCalls\Modules\sys_net.h">
       <Filter>Emu\SysCalls\Modules</Filter>
     </ClInclude>