diff --git a/lib/NGCP/Panel/Controller/API/ApplyRewrites.pm b/lib/NGCP/Panel/Controller/API/ApplyRewrites.pm
index 1feb5a9b5d..7d272ddffb 100644
--- a/lib/NGCP/Panel/Controller/API/ApplyRewrites.pm
+++ b/lib/NGCP/Panel/Controller/API/ApplyRewrites.pm
@@ -18,7 +18,7 @@ sub allowed_methods{
     return [qw/POST OPTIONS/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::ApplyRewrites/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::ApplyRewrites/;
 
 sub api_description {
     return 'Applies rewrite rules to a given number according to the given direction. It can for example be used to normalize user input to E164 using callee_in direction, or to denormalize E164 to user output using caller_out.';
diff --git a/lib/NGCP/Panel/Controller/API/AutoAttendants.pm b/lib/NGCP/Panel/Controller/API/AutoAttendants.pm
index ac923d7bf9..90e3dfa1a1 100644
--- a/lib/NGCP/Panel/Controller/API/AutoAttendants.pm
+++ b/lib/NGCP/Panel/Controller/API/AutoAttendants.pm
@@ -30,7 +30,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::AutoAttendants/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::AutoAttendants/;
 
 sub resource_name{
     return 'autoattendants';
diff --git a/lib/NGCP/Panel/Controller/API/AutoAttendantsItem.pm b/lib/NGCP/Panel/Controller/API/AutoAttendantsItem.pm
index 224bc3fba0..3e78014ce5 100644
--- a/lib/NGCP/Panel/Controller/API/AutoAttendantsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/AutoAttendantsItem.pm
@@ -18,7 +18,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::AutoAttendants/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::AutoAttendants/;
 
 sub resource_name{
     return 'autoattendants';
diff --git a/lib/NGCP/Panel/Controller/API/BalanceIntervals.pm b/lib/NGCP/Panel/Controller/API/BalanceIntervals.pm
index ca05bee047..8650b6a322 100644
--- a/lib/NGCP/Panel/Controller/API/BalanceIntervals.pm
+++ b/lib/NGCP/Panel/Controller/API/BalanceIntervals.pm
@@ -74,7 +74,7 @@ sub query_params {
         },    ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::BalanceIntervals/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::BalanceIntervals/;
 
 sub resource_name{
     return 'balanceintervals';
diff --git a/lib/NGCP/Panel/Controller/API/BalanceIntervalsItem.pm b/lib/NGCP/Panel/Controller/API/BalanceIntervalsItem.pm
index 0739b45fde..7437b331ef 100644
--- a/lib/NGCP/Panel/Controller/API/BalanceIntervalsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/BalanceIntervalsItem.pm
@@ -17,7 +17,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::BalanceIntervals/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::BalanceIntervals/;
 
 sub resource_name{
     return 'balanceintervals';
diff --git a/lib/NGCP/Panel/Controller/API/BillingFees.pm b/lib/NGCP/Panel/Controller/API/BillingFees.pm
index 02ab475d83..82372c2040 100644
--- a/lib/NGCP/Panel/Controller/API/BillingFees.pm
+++ b/lib/NGCP/Panel/Controller/API/BillingFees.pm
@@ -39,7 +39,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::BillingFees/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::BillingFees/;
 
 sub resource_name{
     return 'billingfees';
diff --git a/lib/NGCP/Panel/Controller/API/BillingFeesItem.pm b/lib/NGCP/Panel/Controller/API/BillingFeesItem.pm
index 3ab6a325e5..10ba73e6da 100644
--- a/lib/NGCP/Panel/Controller/API/BillingFeesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/BillingFeesItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::BillingFees/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::BillingFees/;
 
 sub resource_name{
     return 'billingfees';
diff --git a/lib/NGCP/Panel/Controller/API/BillingNetworks.pm b/lib/NGCP/Panel/Controller/API/BillingNetworks.pm
index 350695e7a3..fa252f4b6d 100644
--- a/lib/NGCP/Panel/Controller/API/BillingNetworks.pm
+++ b/lib/NGCP/Panel/Controller/API/BillingNetworks.pm
@@ -64,7 +64,7 @@ sub query_params {
 }
 
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::BillingNetworks/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::BillingNetworks/;
 
 sub resource_name{
     return 'billingnetworks';
diff --git a/lib/NGCP/Panel/Controller/API/BillingNetworksItem.pm b/lib/NGCP/Panel/Controller/API/BillingNetworksItem.pm
index d9e5ddba7a..1c519ee565 100644
--- a/lib/NGCP/Panel/Controller/API/BillingNetworksItem.pm
+++ b/lib/NGCP/Panel/Controller/API/BillingNetworksItem.pm
@@ -19,7 +19,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::BillingNetworks/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::BillingNetworks/;
 
 sub resource_name{
     return 'billingnetworks';
diff --git a/lib/NGCP/Panel/Controller/API/BillingProfiles.pm b/lib/NGCP/Panel/Controller/API/BillingProfiles.pm
index bb540a7755..6c3fe1902d 100644
--- a/lib/NGCP/Panel/Controller/API/BillingProfiles.pm
+++ b/lib/NGCP/Panel/Controller/API/BillingProfiles.pm
@@ -51,7 +51,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::BillingProfiles/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::BillingProfiles/;
 
 sub resource_name{
     return 'billingprofiles';
diff --git a/lib/NGCP/Panel/Controller/API/BillingProfilesItem.pm b/lib/NGCP/Panel/Controller/API/BillingProfilesItem.pm
index 063e836793..96e025cfd7 100644
--- a/lib/NGCP/Panel/Controller/API/BillingProfilesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/BillingProfilesItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::BillingProfiles/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::BillingProfiles/;
 
 sub resource_name{
     return 'billingprofiles';
diff --git a/lib/NGCP/Panel/Controller/API/BillingZones.pm b/lib/NGCP/Panel/Controller/API/BillingZones.pm
index 7fe60614b9..a94fd0c65b 100644
--- a/lib/NGCP/Panel/Controller/API/BillingZones.pm
+++ b/lib/NGCP/Panel/Controller/API/BillingZones.pm
@@ -49,7 +49,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::BillingZones/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::BillingZones/;
 
 sub resource_name{
     return 'billingzones';
diff --git a/lib/NGCP/Panel/Controller/API/BillingZonesItem.pm b/lib/NGCP/Panel/Controller/API/BillingZonesItem.pm
index adaf8532f0..dcac2140c9 100644
--- a/lib/NGCP/Panel/Controller/API/BillingZonesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/BillingZonesItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::BillingZones/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::BillingZones/;
 
 sub resource_name{
     return 'billingzones';
diff --git a/lib/NGCP/Panel/Controller/API/CCMapEntries.pm b/lib/NGCP/Panel/Controller/API/CCMapEntries.pm
index 38aba736dc..4c50bce8ea 100644
--- a/lib/NGCP/Panel/Controller/API/CCMapEntries.pm
+++ b/lib/NGCP/Panel/Controller/API/CCMapEntries.pm
@@ -28,7 +28,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CCMapEntries/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::CCMapEntries/;
 
 sub resource_name{
     return 'ccmapentries';
diff --git a/lib/NGCP/Panel/Controller/API/CCMapEntriesItem.pm b/lib/NGCP/Panel/Controller/API/CCMapEntriesItem.pm
index 7364bf59be..b93efca372 100644
--- a/lib/NGCP/Panel/Controller/API/CCMapEntriesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CCMapEntriesItem.pm
@@ -18,7 +18,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CCMapEntries/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::CCMapEntries/;
 
 sub resource_name{
     return 'ccmapentries';
diff --git a/lib/NGCP/Panel/Controller/API/CFDestinationSets.pm b/lib/NGCP/Panel/Controller/API/CFDestinationSets.pm
index f76b44d9e7..7a62505684 100644
--- a/lib/NGCP/Panel/Controller/API/CFDestinationSets.pm
+++ b/lib/NGCP/Panel/Controller/API/CFDestinationSets.pm
@@ -53,7 +53,7 @@ sub query_params {
 }
 
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CFDestinationSets/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::CFDestinationSets/;
 
 sub resource_name{
     return 'cfdestinationsets';
diff --git a/lib/NGCP/Panel/Controller/API/CFDestinationSetsItem.pm b/lib/NGCP/Panel/Controller/API/CFDestinationSetsItem.pm
index f91fec3475..a65c1eacf6 100644
--- a/lib/NGCP/Panel/Controller/API/CFDestinationSetsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CFDestinationSetsItem.pm
@@ -18,7 +18,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CFDestinationSets/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::CFDestinationSets/;
 
 sub resource_name{
     return 'cfdestinationsets';
diff --git a/lib/NGCP/Panel/Controller/API/CFMappings.pm b/lib/NGCP/Panel/Controller/API/CFMappings.pm
index 2cea1a4f1e..1191d47f23 100644
--- a/lib/NGCP/Panel/Controller/API/CFMappings.pm
+++ b/lib/NGCP/Panel/Controller/API/CFMappings.pm
@@ -44,7 +44,7 @@ sub documentation_sample {
     } ;
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CFMappings/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::CFMappings/;
 
 sub resource_name{
     return 'cfmappings';
diff --git a/lib/NGCP/Panel/Controller/API/CFMappingsItem.pm b/lib/NGCP/Panel/Controller/API/CFMappingsItem.pm
index 21eb5393e5..905660cee0 100644
--- a/lib/NGCP/Panel/Controller/API/CFMappingsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CFMappingsItem.pm
@@ -18,7 +18,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CFMappings/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::CFMappings/;
 
 sub resource_name{
     return 'cfmappings';
diff --git a/lib/NGCP/Panel/Controller/API/CFSourceSets.pm b/lib/NGCP/Panel/Controller/API/CFSourceSets.pm
index 7fecb1884f..6ad5510cdb 100644
--- a/lib/NGCP/Panel/Controller/API/CFSourceSets.pm
+++ b/lib/NGCP/Panel/Controller/API/CFSourceSets.pm
@@ -60,7 +60,7 @@ sub documentation_sample {
     };
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CFSourceSets/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::CFSourceSets/;
 
 sub resource_name{
     return 'cfsourcesets';
diff --git a/lib/NGCP/Panel/Controller/API/CFSourceSetsItem.pm b/lib/NGCP/Panel/Controller/API/CFSourceSetsItem.pm
index a28336929c..218f2514c1 100644
--- a/lib/NGCP/Panel/Controller/API/CFSourceSetsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CFSourceSetsItem.pm
@@ -18,7 +18,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CFSourceSets/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::CFSourceSets/;
 
 sub resource_name{
     return 'cfsourcesets';
diff --git a/lib/NGCP/Panel/Controller/API/CFTimeSets.pm b/lib/NGCP/Panel/Controller/API/CFTimeSets.pm
index fc4b5f784b..92628e1c03 100644
--- a/lib/NGCP/Panel/Controller/API/CFTimeSets.pm
+++ b/lib/NGCP/Panel/Controller/API/CFTimeSets.pm
@@ -53,7 +53,7 @@ sub query_params {
 }
 
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CFTimeSets/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::CFTimeSets/;
 
 sub resource_name{
     return 'cftimesets';
diff --git a/lib/NGCP/Panel/Controller/API/CFTimeSetsItem.pm b/lib/NGCP/Panel/Controller/API/CFTimeSetsItem.pm
index 64ae556f88..e2108fce90 100644
--- a/lib/NGCP/Panel/Controller/API/CFTimeSetsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CFTimeSetsItem.pm
@@ -18,7 +18,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CFTimeSets/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::CFTimeSets/;
 
 sub resource_name{
     return 'cftimesets';
diff --git a/lib/NGCP/Panel/Controller/API/CallControls.pm b/lib/NGCP/Panel/Controller/API/CallControls.pm
index 9a1b7ba018..0c9549b086 100644
--- a/lib/NGCP/Panel/Controller/API/CallControls.pm
+++ b/lib/NGCP/Panel/Controller/API/CallControls.pm
@@ -30,7 +30,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CallControls/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::CallControls/;
 
 sub resource_name{
     return 'callcontrols';
diff --git a/lib/NGCP/Panel/Controller/API/CallForwards.pm b/lib/NGCP/Panel/Controller/API/CallForwards.pm
index c574b26c32..e05a53bf28 100644
--- a/lib/NGCP/Panel/Controller/API/CallForwards.pm
+++ b/lib/NGCP/Panel/Controller/API/CallForwards.pm
@@ -46,7 +46,7 @@ sub documentation_sample {
     };
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CallForwards/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::CallForwards/;
 
 sub resource_name{
     return 'callforwards';
diff --git a/lib/NGCP/Panel/Controller/API/CallForwardsItem.pm b/lib/NGCP/Panel/Controller/API/CallForwardsItem.pm
index 2d01d82642..7c8565b311 100644
--- a/lib/NGCP/Panel/Controller/API/CallForwardsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CallForwardsItem.pm
@@ -18,7 +18,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CallForwards/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::CallForwards/;
 
 sub resource_name{
     return 'callforwards';
diff --git a/lib/NGCP/Panel/Controller/API/CallLists.pm b/lib/NGCP/Panel/Controller/API/CallLists.pm
index 7cb4121614..066316ed5a 100644
--- a/lib/NGCP/Panel/Controller/API/CallLists.pm
+++ b/lib/NGCP/Panel/Controller/API/CallLists.pm
@@ -264,7 +264,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CallLists/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::CallLists/;
 
 sub resource_name{
     return 'calllists';
diff --git a/lib/NGCP/Panel/Controller/API/CallListsItem.pm b/lib/NGCP/Panel/Controller/API/CallListsItem.pm
index 7ef5ad7ff3..ed88b297d9 100644
--- a/lib/NGCP/Panel/Controller/API/CallListsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CallListsItem.pm
@@ -17,7 +17,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CallLists/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::CallLists/;
 
 sub resource_name{
     return 'calllists';
diff --git a/lib/NGCP/Panel/Controller/API/CallRecordingFiles.pm b/lib/NGCP/Panel/Controller/API/CallRecordingFiles.pm
index c52c788a2a..31a18ebc83 100644
--- a/lib/NGCP/Panel/Controller/API/CallRecordingFiles.pm
+++ b/lib/NGCP/Panel/Controller/API/CallRecordingFiles.pm
@@ -22,7 +22,7 @@ sub api_description {
     return 'Defines the actual recording of a recorded call stream. It is referred to by the <a href="#callrecordingstreams">CallRecordingStreams</a> relation. A GET on an item returns the binary blob of the recording with the content type depending on the output format given in the related stream.';
 };
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CallRecordingStreams/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::CallRecordingStreams/;
 
 sub resource_name{
     return 'callrecordingfiles';
diff --git a/lib/NGCP/Panel/Controller/API/CallRecordingFilesItem.pm b/lib/NGCP/Panel/Controller/API/CallRecordingFilesItem.pm
index 87c24d089d..2bb2f70045 100644
--- a/lib/NGCP/Panel/Controller/API/CallRecordingFilesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CallRecordingFilesItem.pm
@@ -17,7 +17,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CallRecordingStreams/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::CallRecordingStreams/;
 
 sub resource_name{
     return 'callrecordingfiles';
diff --git a/lib/NGCP/Panel/Controller/API/CallRecordingStreams.pm b/lib/NGCP/Panel/Controller/API/CallRecordingStreams.pm
index a970c460b8..323839bc4c 100644
--- a/lib/NGCP/Panel/Controller/API/CallRecordingStreams.pm
+++ b/lib/NGCP/Panel/Controller/API/CallRecordingStreams.pm
@@ -55,7 +55,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CallRecordingStreams/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::CallRecordingStreams/;
 
 sub resource_name{
     return 'callrecordingstreams';
diff --git a/lib/NGCP/Panel/Controller/API/CallRecordingStreamsItem.pm b/lib/NGCP/Panel/Controller/API/CallRecordingStreamsItem.pm
index e5a0f03434..7246022793 100644
--- a/lib/NGCP/Panel/Controller/API/CallRecordingStreamsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CallRecordingStreamsItem.pm
@@ -18,7 +18,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CallRecordingStreams/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::CallRecordingStreams/;
 
 sub resource_name{
     return 'callrecordingstreams';
diff --git a/lib/NGCP/Panel/Controller/API/CallRecordings.pm b/lib/NGCP/Panel/Controller/API/CallRecordings.pm
index 4877c83a86..193b51fbbe 100644
--- a/lib/NGCP/Panel/Controller/API/CallRecordings.pm
+++ b/lib/NGCP/Panel/Controller/API/CallRecordings.pm
@@ -62,7 +62,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CallRecordings/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::CallRecordings/;
 
 sub resource_name{
     return 'callrecordings';
diff --git a/lib/NGCP/Panel/Controller/API/CallRecordingsItem.pm b/lib/NGCP/Panel/Controller/API/CallRecordingsItem.pm
index 1c97879b23..8614d268ad 100644
--- a/lib/NGCP/Panel/Controller/API/CallRecordingsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CallRecordingsItem.pm
@@ -16,7 +16,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CallRecordings/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::CallRecordings/;
 
 sub resource_name{
     return 'callrecordings';
diff --git a/lib/NGCP/Panel/Controller/API/Calls.pm b/lib/NGCP/Panel/Controller/API/Calls.pm
index a16a609425..11513ffaed 100644
--- a/lib/NGCP/Panel/Controller/API/Calls.pm
+++ b/lib/NGCP/Panel/Controller/API/Calls.pm
@@ -63,7 +63,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Calls/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::Calls/;
 
 sub resource_name{
     return 'calls';
diff --git a/lib/NGCP/Panel/Controller/API/CallsItem.pm b/lib/NGCP/Panel/Controller/API/CallsItem.pm
index 42a7e45ec8..43d3f02780 100644
--- a/lib/NGCP/Panel/Controller/API/CallsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CallsItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Calls/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::Calls/;
 
 sub resource_name{
     return 'calls';
diff --git a/lib/NGCP/Panel/Controller/API/Capabilities.pm b/lib/NGCP/Panel/Controller/API/Capabilities.pm
index e5169fcfa8..6afd3786f2 100644
--- a/lib/NGCP/Panel/Controller/API/Capabilities.pm
+++ b/lib/NGCP/Panel/Controller/API/Capabilities.pm
@@ -34,7 +34,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Capabilities/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::Capabilities/;
 
 sub resource_name{
     return 'capabilities';
diff --git a/lib/NGCP/Panel/Controller/API/CapabilitiesItem.pm b/lib/NGCP/Panel/Controller/API/CapabilitiesItem.pm
index 911a127989..7a7b2fdf24 100644
--- a/lib/NGCP/Panel/Controller/API/CapabilitiesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CapabilitiesItem.pm
@@ -17,7 +17,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Capabilities/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::Capabilities/;
 
 sub resource_name{
     return 'capabilities';
diff --git a/lib/NGCP/Panel/Controller/API/Contracts.pm b/lib/NGCP/Panel/Controller/API/Contracts.pm
index c0e0f8655c..1a0b43d4c8 100644
--- a/lib/NGCP/Panel/Controller/API/Contracts.pm
+++ b/lib/NGCP/Panel/Controller/API/Contracts.pm
@@ -63,7 +63,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Contracts/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::Contracts/;
 
 sub resource_name{
     return 'contracts';
diff --git a/lib/NGCP/Panel/Controller/API/ContractsItem.pm b/lib/NGCP/Panel/Controller/API/ContractsItem.pm
index 631a11fc70..f14b350d14 100644
--- a/lib/NGCP/Panel/Controller/API/ContractsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/ContractsItem.pm
@@ -20,7 +20,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Contracts/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::Contracts/;
 
 sub resource_name{
     return 'contracts';
diff --git a/lib/NGCP/Panel/Controller/API/CustomerBalances.pm b/lib/NGCP/Panel/Controller/API/CustomerBalances.pm
index fe96669b8e..31afa46b8c 100644
--- a/lib/NGCP/Panel/Controller/API/CustomerBalances.pm
+++ b/lib/NGCP/Panel/Controller/API/CustomerBalances.pm
@@ -106,7 +106,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CustomerBalances/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::CustomerBalances/;
 
 sub resource_name{
     return 'customerbalances';
diff --git a/lib/NGCP/Panel/Controller/API/CustomerBalancesItem.pm b/lib/NGCP/Panel/Controller/API/CustomerBalancesItem.pm
index f7ff77f178..b51ffbd276 100644
--- a/lib/NGCP/Panel/Controller/API/CustomerBalancesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CustomerBalancesItem.pm
@@ -16,7 +16,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CustomerBalances/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::CustomerBalances/;
 
 sub resource_name{
     return 'customerbalances';
diff --git a/lib/NGCP/Panel/Controller/API/CustomerContacts.pm b/lib/NGCP/Panel/Controller/API/CustomerContacts.pm
index a5a3f9a7d6..e47ab92f99 100644
--- a/lib/NGCP/Panel/Controller/API/CustomerContacts.pm
+++ b/lib/NGCP/Panel/Controller/API/CustomerContacts.pm
@@ -50,7 +50,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CustomerContacts/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::CustomerContacts/;
 
 sub resource_name{
     return 'customercontacts';
diff --git a/lib/NGCP/Panel/Controller/API/CustomerContactsItem.pm b/lib/NGCP/Panel/Controller/API/CustomerContactsItem.pm
index afad2c63f5..48ad212d3e 100644
--- a/lib/NGCP/Panel/Controller/API/CustomerContactsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CustomerContactsItem.pm
@@ -16,7 +16,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CustomerContacts/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::CustomerContacts/;
 
 sub resource_name{
     return 'customercontacts';
diff --git a/lib/NGCP/Panel/Controller/API/CustomerFraudEvents.pm b/lib/NGCP/Panel/Controller/API/CustomerFraudEvents.pm
index 07affdf814..73d1902087 100644
--- a/lib/NGCP/Panel/Controller/API/CustomerFraudEvents.pm
+++ b/lib/NGCP/Panel/Controller/API/CustomerFraudEvents.pm
@@ -41,7 +41,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CustomerFraudEvents/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::CustomerFraudEvents/;
 
 sub resource_name{
     return 'customerfraudevents';
diff --git a/lib/NGCP/Panel/Controller/API/CustomerFraudEventsItem.pm b/lib/NGCP/Panel/Controller/API/CustomerFraudEventsItem.pm
index 91835cd298..160f69417c 100644
--- a/lib/NGCP/Panel/Controller/API/CustomerFraudEventsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CustomerFraudEventsItem.pm
@@ -13,7 +13,7 @@ require Catalyst::ActionRole::RequireSSL;
 sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CustomerFraudEvents/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::CustomerFraudEvents/;
 
 sub resource_name{
     return 'customerfraudevents';
diff --git a/lib/NGCP/Panel/Controller/API/CustomerFraudPreferences.pm b/lib/NGCP/Panel/Controller/API/CustomerFraudPreferences.pm
index 45eadd7dca..542234ad24 100644
--- a/lib/NGCP/Panel/Controller/API/CustomerFraudPreferences.pm
+++ b/lib/NGCP/Panel/Controller/API/CustomerFraudPreferences.pm
@@ -65,7 +65,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CustomerFraudPreferences/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::CustomerFraudPreferences/;
 
 sub resource_name{
     return 'customerfraudpreferences';
diff --git a/lib/NGCP/Panel/Controller/API/CustomerFraudPreferencesItem.pm b/lib/NGCP/Panel/Controller/API/CustomerFraudPreferencesItem.pm
index 95061e46c8..bbc70670dd 100644
--- a/lib/NGCP/Panel/Controller/API/CustomerFraudPreferencesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CustomerFraudPreferencesItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CustomerFraudPreferences/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::CustomerFraudPreferences/;
 
 sub resource_name{
     return 'customerfraudpreferences';
diff --git a/lib/NGCP/Panel/Controller/API/CustomerLocations.pm b/lib/NGCP/Panel/Controller/API/CustomerLocations.pm
index 6738e1e556..702ee0296e 100644
--- a/lib/NGCP/Panel/Controller/API/CustomerLocations.pm
+++ b/lib/NGCP/Panel/Controller/API/CustomerLocations.pm
@@ -52,7 +52,7 @@ sub query_params {
 }
 
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CustomerLocations/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::CustomerLocations/;
 
 sub resource_name{
     return 'customerlocations';
diff --git a/lib/NGCP/Panel/Controller/API/CustomerLocationsItem.pm b/lib/NGCP/Panel/Controller/API/CustomerLocationsItem.pm
index 103879b84b..696ba14dc6 100644
--- a/lib/NGCP/Panel/Controller/API/CustomerLocationsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CustomerLocationsItem.pm
@@ -19,7 +19,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CustomerLocations/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::CustomerLocations/;
 
 sub resource_name{
     return 'customerlocations';
diff --git a/lib/NGCP/Panel/Controller/API/CustomerPreferenceDefs.pm b/lib/NGCP/Panel/Controller/API/CustomerPreferenceDefs.pm
index 24ec1e3ee7..dbc551be0c 100644
--- a/lib/NGCP/Panel/Controller/API/CustomerPreferenceDefs.pm
+++ b/lib/NGCP/Panel/Controller/API/CustomerPreferenceDefs.pm
@@ -20,7 +20,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API/;
+use parent qw/NGCP::Panel::Role::Entities/;
 
 sub resource_name{
     return 'customerpreferencedefs';
diff --git a/lib/NGCP/Panel/Controller/API/CustomerPreferences.pm b/lib/NGCP/Panel/Controller/API/CustomerPreferences.pm
index bc3bedfc37..c52fa2e862 100644
--- a/lib/NGCP/Panel/Controller/API/CustomerPreferences.pm
+++ b/lib/NGCP/Panel/Controller/API/CustomerPreferences.pm
@@ -40,7 +40,7 @@ sub documentation_sample {
     };
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Preferences/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::Preferences/;
 
 sub resource_name{
     return 'customerpreferences';
diff --git a/lib/NGCP/Panel/Controller/API/CustomerPreferencesItem.pm b/lib/NGCP/Panel/Controller/API/CustomerPreferencesItem.pm
index 5941571d4b..edf72725c4 100644
--- a/lib/NGCP/Panel/Controller/API/CustomerPreferencesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CustomerPreferencesItem.pm
@@ -18,7 +18,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Preferences/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::Preferences/;
 
 sub resource_name{
     return 'customerpreferences';
diff --git a/lib/NGCP/Panel/Controller/API/CustomerZoneCosts.pm b/lib/NGCP/Panel/Controller/API/CustomerZoneCosts.pm
index 94969f012e..65715746d5 100644
--- a/lib/NGCP/Panel/Controller/API/CustomerZoneCosts.pm
+++ b/lib/NGCP/Panel/Controller/API/CustomerZoneCosts.pm
@@ -49,7 +49,7 @@ sub query_params {
 }
 
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CustomerZoneCosts/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::CustomerZoneCosts/;
 
 sub resource_name{
     return 'customerzonecosts';
diff --git a/lib/NGCP/Panel/Controller/API/CustomerZoneCostsItem.pm b/lib/NGCP/Panel/Controller/API/CustomerZoneCostsItem.pm
index e4fa073bdc..38f7fc59a8 100644
--- a/lib/NGCP/Panel/Controller/API/CustomerZoneCostsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CustomerZoneCostsItem.pm
@@ -18,7 +18,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::CustomerZoneCosts/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::CustomerZoneCosts/;
 
 sub resource_name{
     return 'customerzonecosts';
diff --git a/lib/NGCP/Panel/Controller/API/Customers.pm b/lib/NGCP/Panel/Controller/API/Customers.pm
index 1e944c68c4..4e69d7ec1a 100644
--- a/lib/NGCP/Panel/Controller/API/Customers.pm
+++ b/lib/NGCP/Panel/Controller/API/Customers.pm
@@ -135,7 +135,7 @@ sub query_params {
     return $params;
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Customers/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::Customers/;
 
 sub resource_name{
     return 'customers';
diff --git a/lib/NGCP/Panel/Controller/API/CustomersItem.pm b/lib/NGCP/Panel/Controller/API/CustomersItem.pm
index 9046bb19af..b77381f130 100644
--- a/lib/NGCP/Panel/Controller/API/CustomersItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CustomersItem.pm
@@ -20,7 +20,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Customers/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::Customers/;
 
 sub resource_name{
     return 'customers';
diff --git a/lib/NGCP/Panel/Controller/API/DomainPreferenceDefs.pm b/lib/NGCP/Panel/Controller/API/DomainPreferenceDefs.pm
index 8f0f005a10..229aad47e4 100644
--- a/lib/NGCP/Panel/Controller/API/DomainPreferenceDefs.pm
+++ b/lib/NGCP/Panel/Controller/API/DomainPreferenceDefs.pm
@@ -20,7 +20,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API/;
+use parent qw/NGCP::Panel::Role::Entities/;
 
 sub resource_name{
     return 'domainpreferencedefs';
diff --git a/lib/NGCP/Panel/Controller/API/DomainPreferences.pm b/lib/NGCP/Panel/Controller/API/DomainPreferences.pm
index 1c696d7936..ef79861de7 100644
--- a/lib/NGCP/Panel/Controller/API/DomainPreferences.pm
+++ b/lib/NGCP/Panel/Controller/API/DomainPreferences.pm
@@ -31,7 +31,7 @@ sub documentation_sample {
     };
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Preferences/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::Preferences/;
 
 sub resource_name{
     return 'domainpreferences';
diff --git a/lib/NGCP/Panel/Controller/API/DomainPreferencesItem.pm b/lib/NGCP/Panel/Controller/API/DomainPreferencesItem.pm
index 53b57cc5b2..f5fcce84df 100644
--- a/lib/NGCP/Panel/Controller/API/DomainPreferencesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/DomainPreferencesItem.pm
@@ -18,7 +18,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Preferences/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::Preferences/;
 
 sub resource_name{
     return 'domainpreferences';
diff --git a/lib/NGCP/Panel/Controller/API/Domains.pm b/lib/NGCP/Panel/Controller/API/Domains.pm
index ab9ad809e6..3622258a39 100644
--- a/lib/NGCP/Panel/Controller/API/Domains.pm
+++ b/lib/NGCP/Panel/Controller/API/Domains.pm
@@ -52,7 +52,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Domains/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::Domains/;
 
 sub resource_name{
     return 'domains';
diff --git a/lib/NGCP/Panel/Controller/API/DomainsItem.pm b/lib/NGCP/Panel/Controller/API/DomainsItem.pm
index 8037614658..792af0c85e 100644
--- a/lib/NGCP/Panel/Controller/API/DomainsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/DomainsItem.pm
@@ -19,7 +19,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Domains/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::Domains/;
 
 sub resource_name{
     return 'domains';
diff --git a/lib/NGCP/Panel/Controller/API/EmailTemplates.pm b/lib/NGCP/Panel/Controller/API/EmailTemplates.pm
index 86ee2e82ab..a3320339d7 100644
--- a/lib/NGCP/Panel/Controller/API/EmailTemplates.pm
+++ b/lib/NGCP/Panel/Controller/API/EmailTemplates.pm
@@ -49,7 +49,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::EmailTemplates/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::EmailTemplates/;
 
 sub resource_name{
     return 'emailtemplates';
diff --git a/lib/NGCP/Panel/Controller/API/EmailTemplatesItem.pm b/lib/NGCP/Panel/Controller/API/EmailTemplatesItem.pm
index f43d7e385d..8b4432d448 100644
--- a/lib/NGCP/Panel/Controller/API/EmailTemplatesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/EmailTemplatesItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::EmailTemplates/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::EmailTemplates/;
 
 sub resource_name{
     return 'emailtemplates';
diff --git a/lib/NGCP/Panel/Controller/API/EmergencyMappingContainers.pm b/lib/NGCP/Panel/Controller/API/EmergencyMappingContainers.pm
index eafc634507..d29ae4df33 100644
--- a/lib/NGCP/Panel/Controller/API/EmergencyMappingContainers.pm
+++ b/lib/NGCP/Panel/Controller/API/EmergencyMappingContainers.pm
@@ -50,7 +50,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::EmergencyMappingContainers/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::EmergencyMappingContainers/;
 
 sub resource_name{
     return 'emergencymappingcontainers';
diff --git a/lib/NGCP/Panel/Controller/API/EmergencyMappingContainersItem.pm b/lib/NGCP/Panel/Controller/API/EmergencyMappingContainersItem.pm
index 6356b008ab..1b548be175 100644
--- a/lib/NGCP/Panel/Controller/API/EmergencyMappingContainersItem.pm
+++ b/lib/NGCP/Panel/Controller/API/EmergencyMappingContainersItem.pm
@@ -16,7 +16,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::EmergencyMappingContainers/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::EmergencyMappingContainers/;
 
 sub resource_name{
     return 'emergencymappingcontainers';
diff --git a/lib/NGCP/Panel/Controller/API/EmergencyMappings.pm b/lib/NGCP/Panel/Controller/API/EmergencyMappings.pm
index 61823553a7..537f9455ba 100644
--- a/lib/NGCP/Panel/Controller/API/EmergencyMappings.pm
+++ b/lib/NGCP/Panel/Controller/API/EmergencyMappings.pm
@@ -68,7 +68,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::EmergencyMappings/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::EmergencyMappings/;
 
 sub resource_name{
     return 'emergencymappings';
diff --git a/lib/NGCP/Panel/Controller/API/EmergencyMappingsItem.pm b/lib/NGCP/Panel/Controller/API/EmergencyMappingsItem.pm
index ebd1428168..c5432b5178 100644
--- a/lib/NGCP/Panel/Controller/API/EmergencyMappingsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/EmergencyMappingsItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::EmergencyMappings/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::EmergencyMappings/;
 
 sub resource_name{
     return 'emergencymappings';
diff --git a/lib/NGCP/Panel/Controller/API/Events.pm b/lib/NGCP/Panel/Controller/API/Events.pm
index ffff6fee69..c9961eb507 100644
--- a/lib/NGCP/Panel/Controller/API/Events.pm
+++ b/lib/NGCP/Panel/Controller/API/Events.pm
@@ -85,7 +85,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Events/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::Events/;
 
 sub resource_name{
     return 'events';
diff --git a/lib/NGCP/Panel/Controller/API/EventsItem.pm b/lib/NGCP/Panel/Controller/API/EventsItem.pm
index 5d161723e4..9deb8d834a 100644
--- a/lib/NGCP/Panel/Controller/API/EventsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/EventsItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Events/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::Events/;
 
 sub resource_name{
     return 'events';
diff --git a/lib/NGCP/Panel/Controller/API/FaxRecordings.pm b/lib/NGCP/Panel/Controller/API/FaxRecordings.pm
index 3a506ae8ec..6c8c27f80f 100644
--- a/lib/NGCP/Panel/Controller/API/FaxRecordings.pm
+++ b/lib/NGCP/Panel/Controller/API/FaxRecordings.pm
@@ -22,7 +22,7 @@ sub api_description {
     return 'Defines the actual recording of fax messages. It is referred to by the <a href="#faxes">Faxes</a> relation. A GET on an item returns the fax in the binary format as image/tif. Additional formats are also supported for download (see: the query_params option).';
 };
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::FaxRecordings/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::FaxRecordings/;
 
 sub resource_name{
     return 'faxrecordings';
diff --git a/lib/NGCP/Panel/Controller/API/FaxRecordingsItem.pm b/lib/NGCP/Panel/Controller/API/FaxRecordingsItem.pm
index d9851ca767..b9bfa55547 100644
--- a/lib/NGCP/Panel/Controller/API/FaxRecordingsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/FaxRecordingsItem.pm
@@ -18,7 +18,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::FaxRecordings/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::FaxRecordings/;
 
 sub resource_name{
     return 'faxrecordings';
diff --git a/lib/NGCP/Panel/Controller/API/Faxes.pm b/lib/NGCP/Panel/Controller/API/Faxes.pm
index 2a5b051e56..c03d19c525 100644
--- a/lib/NGCP/Panel/Controller/API/Faxes.pm
+++ b/lib/NGCP/Panel/Controller/API/Faxes.pm
@@ -89,7 +89,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Faxes/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::Faxes/;
 
 sub resource_name{
     return 'faxes';
diff --git a/lib/NGCP/Panel/Controller/API/FaxesItem.pm b/lib/NGCP/Panel/Controller/API/FaxesItem.pm
index 9e414234aa..e35d887d28 100644
--- a/lib/NGCP/Panel/Controller/API/FaxesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/FaxesItem.pm
@@ -16,7 +16,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Faxes/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::Faxes/;
 
 sub resource_name{
     return 'faxes';
diff --git a/lib/NGCP/Panel/Controller/API/FaxserverSettings.pm b/lib/NGCP/Panel/Controller/API/FaxserverSettings.pm
index 56c45fec6b..b78f6545b4 100644
--- a/lib/NGCP/Panel/Controller/API/FaxserverSettings.pm
+++ b/lib/NGCP/Panel/Controller/API/FaxserverSettings.pm
@@ -60,7 +60,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::FaxserverSettings/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::FaxserverSettings/;
 
 sub resource_name{
     return 'faxserversettings';
diff --git a/lib/NGCP/Panel/Controller/API/FaxserverSettingsItem.pm b/lib/NGCP/Panel/Controller/API/FaxserverSettingsItem.pm
index 3c564cbb37..cf5b74c44a 100644
--- a/lib/NGCP/Panel/Controller/API/FaxserverSettingsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/FaxserverSettingsItem.pm
@@ -19,7 +19,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::FaxserverSettings/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::FaxserverSettings/;
 
 sub resource_name{
     return 'faxserversettings';
diff --git a/lib/NGCP/Panel/Controller/API/Interceptions.pm b/lib/NGCP/Panel/Controller/API/Interceptions.pm
index c83b08e45f..b79e540465 100644
--- a/lib/NGCP/Panel/Controller/API/Interceptions.pm
+++ b/lib/NGCP/Panel/Controller/API/Interceptions.pm
@@ -50,7 +50,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Interceptions/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::Interceptions/;
 
 sub resource_name{
     return 'interceptions';
diff --git a/lib/NGCP/Panel/Controller/API/InterceptionsItem.pm b/lib/NGCP/Panel/Controller/API/InterceptionsItem.pm
index 40760111f6..7fe53983fc 100644
--- a/lib/NGCP/Panel/Controller/API/InterceptionsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/InterceptionsItem.pm
@@ -16,7 +16,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Interceptions/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::Interceptions/;
 
 sub resource_name{
     return 'interceptions';
diff --git a/lib/NGCP/Panel/Controller/API/InvoiceTemplates.pm b/lib/NGCP/Panel/Controller/API/InvoiceTemplates.pm
index eac8dcaf00..36e093236e 100644
--- a/lib/NGCP/Panel/Controller/API/InvoiceTemplates.pm
+++ b/lib/NGCP/Panel/Controller/API/InvoiceTemplates.pm
@@ -49,7 +49,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::InvoiceTemplates/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::InvoiceTemplates/;
 
 sub resource_name{
     return 'invoicetemplates';
diff --git a/lib/NGCP/Panel/Controller/API/InvoiceTemplatesItem.pm b/lib/NGCP/Panel/Controller/API/InvoiceTemplatesItem.pm
index 6230399738..218718680a 100644
--- a/lib/NGCP/Panel/Controller/API/InvoiceTemplatesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/InvoiceTemplatesItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::InvoiceTemplates/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::InvoiceTemplates/;
 
 sub resource_name{
     return 'invoicetemplates';
diff --git a/lib/NGCP/Panel/Controller/API/LnpCarriers.pm b/lib/NGCP/Panel/Controller/API/LnpCarriers.pm
index 9eddbfa35f..317cab3e0c 100644
--- a/lib/NGCP/Panel/Controller/API/LnpCarriers.pm
+++ b/lib/NGCP/Panel/Controller/API/LnpCarriers.pm
@@ -50,7 +50,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::LnpCarriers/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::LnpCarriers/;
 
 sub resource_name{
     return 'lnpcarriers';
diff --git a/lib/NGCP/Panel/Controller/API/LnpCarriersItem.pm b/lib/NGCP/Panel/Controller/API/LnpCarriersItem.pm
index 2d9d6c5d84..9b4658ca4e 100644
--- a/lib/NGCP/Panel/Controller/API/LnpCarriersItem.pm
+++ b/lib/NGCP/Panel/Controller/API/LnpCarriersItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::LnpCarriers/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::LnpCarriers/;
 
 sub resource_name{
     return 'lnpcarriers';
diff --git a/lib/NGCP/Panel/Controller/API/LnpNumbers.pm b/lib/NGCP/Panel/Controller/API/LnpNumbers.pm
index 7ad8fbee8f..5c1c59becc 100644
--- a/lib/NGCP/Panel/Controller/API/LnpNumbers.pm
+++ b/lib/NGCP/Panel/Controller/API/LnpNumbers.pm
@@ -59,7 +59,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::LnpNumbers/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::LnpNumbers/;
 
 sub resource_name{
     return 'lnpnumbers';
diff --git a/lib/NGCP/Panel/Controller/API/LnpNumbersItem.pm b/lib/NGCP/Panel/Controller/API/LnpNumbersItem.pm
index 8d932c8f58..b71e49bc42 100644
--- a/lib/NGCP/Panel/Controller/API/LnpNumbersItem.pm
+++ b/lib/NGCP/Panel/Controller/API/LnpNumbersItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::LnpNumbers/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::LnpNumbers/;
 
 sub resource_name{
     return 'lnpnumbers';
diff --git a/lib/NGCP/Panel/Controller/API/MailToFaxSettings.pm b/lib/NGCP/Panel/Controller/API/MailToFaxSettings.pm
index 9358a2a2a1..113b3cfae9 100644
--- a/lib/NGCP/Panel/Controller/API/MailToFaxSettings.pm
+++ b/lib/NGCP/Panel/Controller/API/MailToFaxSettings.pm
@@ -60,7 +60,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::MailToFaxSettings/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::MailToFaxSettings/;
 
 sub resource_name{
     return 'mailtofaxsettings';
diff --git a/lib/NGCP/Panel/Controller/API/MailToFaxSettingsItem.pm b/lib/NGCP/Panel/Controller/API/MailToFaxSettingsItem.pm
index 589dbaf16c..50e6b366aa 100644
--- a/lib/NGCP/Panel/Controller/API/MailToFaxSettingsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/MailToFaxSettingsItem.pm
@@ -13,7 +13,7 @@ require Catalyst::ActionRole::ACL;
 require NGCP::Panel::Role::HTTPMethods;
 require Catalyst::ActionRole::RequireSSL;
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::MailToFaxSettings/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::MailToFaxSettings/;
 sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT/];
 }
diff --git a/lib/NGCP/Panel/Controller/API/MaliciousCalls.pm b/lib/NGCP/Panel/Controller/API/MaliciousCalls.pm
index a52ed5c655..f681addd56 100644
--- a/lib/NGCP/Panel/Controller/API/MaliciousCalls.pm
+++ b/lib/NGCP/Panel/Controller/API/MaliciousCalls.pm
@@ -107,7 +107,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::MaliciousCalls/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::MaliciousCalls/;
 
 sub resource_name{
     return 'maliciouscalls';
diff --git a/lib/NGCP/Panel/Controller/API/MaliciousCallsItem.pm b/lib/NGCP/Panel/Controller/API/MaliciousCallsItem.pm
index d2592e11a3..676bc5bbf3 100644
--- a/lib/NGCP/Panel/Controller/API/MaliciousCallsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/MaliciousCallsItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::MaliciousCalls/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::MaliciousCalls/;
 
 sub resource_name{
     return 'maliciouscalls';
diff --git a/lib/NGCP/Panel/Controller/API/ManagerSecretary.pm b/lib/NGCP/Panel/Controller/API/ManagerSecretary.pm
index 930625363e..f3aff66ec7 100644
--- a/lib/NGCP/Panel/Controller/API/ManagerSecretary.pm
+++ b/lib/NGCP/Panel/Controller/API/ManagerSecretary.pm
@@ -33,7 +33,7 @@ sub documentation_sample {
     };
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::ManagerSecretary/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::ManagerSecretary/;
 
 sub resource_name{
     return 'managersecretary';
diff --git a/lib/NGCP/Panel/Controller/API/ManagerSecretaryItem.pm b/lib/NGCP/Panel/Controller/API/ManagerSecretaryItem.pm
index 8fa6ecd7a1..b02832da4d 100644
--- a/lib/NGCP/Panel/Controller/API/ManagerSecretaryItem.pm
+++ b/lib/NGCP/Panel/Controller/API/ManagerSecretaryItem.pm
@@ -18,7 +18,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::ManagerSecretary/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::ManagerSecretary/;
 
 sub resource_name{
     return 'managersecretary';
diff --git a/lib/NGCP/Panel/Controller/API/MetaConfigDefs.pm b/lib/NGCP/Panel/Controller/API/MetaConfigDefs.pm
index a5bb8d343a..32860ae4d2 100644
--- a/lib/NGCP/Panel/Controller/API/MetaConfigDefs.pm
+++ b/lib/NGCP/Panel/Controller/API/MetaConfigDefs.pm
@@ -18,7 +18,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use base qw/Catalyst::Controller NGCP::Panel::Role::API/;
+use base qw/NGCP::Panel::Role::API NGCP::Panel::Role::Entities/;
 
 sub resource_name{
     return 'metaconfigdefs';
diff --git a/lib/NGCP/Panel/Controller/API/NcosLevels.pm b/lib/NGCP/Panel/Controller/API/NcosLevels.pm
index 527b62905d..07ade3ab45 100644
--- a/lib/NGCP/Panel/Controller/API/NcosLevels.pm
+++ b/lib/NGCP/Panel/Controller/API/NcosLevels.pm
@@ -49,7 +49,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::NcosLevels/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::NcosLevels/;
 
 sub resource_name{
     return 'ncoslevels';
diff --git a/lib/NGCP/Panel/Controller/API/NcosLevelsItem.pm b/lib/NGCP/Panel/Controller/API/NcosLevelsItem.pm
index dc47d84bc3..6147514b84 100644
--- a/lib/NGCP/Panel/Controller/API/NcosLevelsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/NcosLevelsItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::NcosLevels/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::NcosLevels/;
 
 sub resource_name{
     return 'ncoslevels';
diff --git a/lib/NGCP/Panel/Controller/API/NcosLnpCarriers.pm b/lib/NGCP/Panel/Controller/API/NcosLnpCarriers.pm
index 1c18b8fd32..fffbc6855b 100644
--- a/lib/NGCP/Panel/Controller/API/NcosLnpCarriers.pm
+++ b/lib/NGCP/Panel/Controller/API/NcosLnpCarriers.pm
@@ -49,7 +49,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::NcosLnpCarriers/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::NcosLnpCarriers/;
 
 sub resource_name{
     return 'ncoslnpcarriers';
diff --git a/lib/NGCP/Panel/Controller/API/NcosLnpCarriersItem.pm b/lib/NGCP/Panel/Controller/API/NcosLnpCarriersItem.pm
index 57e38044d2..8c099ce00f 100644
--- a/lib/NGCP/Panel/Controller/API/NcosLnpCarriersItem.pm
+++ b/lib/NGCP/Panel/Controller/API/NcosLnpCarriersItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::NcosLnpCarriers/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::NcosLnpCarriers/;
 
 sub resource_name{
     return 'ncoslnpcarriers';
diff --git a/lib/NGCP/Panel/Controller/API/NcosPatterns.pm b/lib/NGCP/Panel/Controller/API/NcosPatterns.pm
index 0e0ed3d9a2..dc4f40d69b 100644
--- a/lib/NGCP/Panel/Controller/API/NcosPatterns.pm
+++ b/lib/NGCP/Panel/Controller/API/NcosPatterns.pm
@@ -38,7 +38,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::NcosPatterns/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::NcosPatterns/;
 
 sub resource_name{
     return 'ncospatterns';
diff --git a/lib/NGCP/Panel/Controller/API/NcosPatternsItem.pm b/lib/NGCP/Panel/Controller/API/NcosPatternsItem.pm
index ad2a348b56..ae728f9c36 100644
--- a/lib/NGCP/Panel/Controller/API/NcosPatternsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/NcosPatternsItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::NcosPatterns/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::NcosPatterns/;
 
 sub resource_name{
     return 'ncospatterns';
diff --git a/lib/NGCP/Panel/Controller/API/Numbers.pm b/lib/NGCP/Panel/Controller/API/Numbers.pm
index ecf5547348..815ee3c5bd 100644
--- a/lib/NGCP/Panel/Controller/API/Numbers.pm
+++ b/lib/NGCP/Panel/Controller/API/Numbers.pm
@@ -74,7 +74,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Numbers/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::Numbers/;
 
 sub resource_name{
     return 'numbers';
diff --git a/lib/NGCP/Panel/Controller/API/NumbersItem.pm b/lib/NGCP/Panel/Controller/API/NumbersItem.pm
index a6082ea429..b864f9b5b6 100644
--- a/lib/NGCP/Panel/Controller/API/NumbersItem.pm
+++ b/lib/NGCP/Panel/Controller/API/NumbersItem.pm
@@ -21,7 +21,7 @@ sub allowed_methods{
     return [qw/GET PUT PATCH OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Numbers/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::Numbers/;
 
 sub resource_name{
     return 'numbers';
diff --git a/lib/NGCP/Panel/Controller/API/PartyCallControls.pm b/lib/NGCP/Panel/Controller/API/PartyCallControls.pm
index fe0ba16708..dd2aaf4c11 100644
--- a/lib/NGCP/Panel/Controller/API/PartyCallControls.pm
+++ b/lib/NGCP/Panel/Controller/API/PartyCallControls.pm
@@ -31,7 +31,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PartyCallControls/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::PartyCallControls/;
 
 sub resource_name{
     return 'partycallcontrols';
diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFiles.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFiles.pm
index b9248007e8..ca549c0e59 100644
--- a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFiles.pm
+++ b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFiles.pm
@@ -27,7 +27,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PbxDeviceFirmwares/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::PbxDeviceFirmwares/;
 
 sub resource_name{
     return 'pbxdeviceconfigfiles';
diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFilesItem.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFilesItem.pm
index 46ade17c25..fda40e1344 100644
--- a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFilesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigFilesItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PbxDeviceConfigs/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::PbxDeviceConfigs/;
 
 sub resource_name{
     return 'pbxdeviceconfigfiles';
diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigs.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigs.pm
index 675fcc77b9..6387fc39b3 100644
--- a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigs.pm
+++ b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigs.pm
@@ -60,7 +60,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PbxDeviceConfigs/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::PbxDeviceConfigs/;
 
 sub resource_name{
     return 'pbxdeviceconfigs';
diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigsItem.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigsItem.pm
index 20cd2a423c..f250068436 100644
--- a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigsItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PUT/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PbxDeviceConfigs/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::PbxDeviceConfigs/;
 
 sub resource_name{
     return 'pbxdeviceconfigs';
diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinaries.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinaries.pm
index 883e61e37f..9c77bdcc40 100644
--- a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinaries.pm
+++ b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinaries.pm
@@ -27,7 +27,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PbxDeviceFirmwares/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::PbxDeviceFirmwares/;
 
 sub resource_name{
     return 'pbxdevicefirmwarebinaries';
diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinariesItem.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinariesItem.pm
index f1f0d43e16..c9ace6298d 100644
--- a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinariesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwareBinariesItem.pm
@@ -16,7 +16,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PbxDeviceFirmwares/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::PbxDeviceFirmwares/;
 
 sub resource_name{
     return 'pbxdevicefirmwarebinaries';
diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwares.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwares.pm
index b1ee963b88..996d38aea5 100644
--- a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwares.pm
+++ b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwares.pm
@@ -61,7 +61,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PbxDeviceFirmwares/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::PbxDeviceFirmwares/;
 
 sub resource_name{
     return 'pbxdevicefirmwares';
diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwaresItem.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwaresItem.pm
index 8ec4e15c71..3d67029362 100644
--- a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwaresItem.pm
+++ b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwaresItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PUT/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PbxDeviceFirmwares/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::PbxDeviceFirmwares/;
 
 sub resource_name{
     return 'pbxdevicefirmwares';
diff --git a/lib/NGCP/Panel/Controller/API/PbxDevicePreferenceDefs.pm b/lib/NGCP/Panel/Controller/API/PbxDevicePreferenceDefs.pm
index c82b1b32d3..1d19150f98 100644
--- a/lib/NGCP/Panel/Controller/API/PbxDevicePreferenceDefs.pm
+++ b/lib/NGCP/Panel/Controller/API/PbxDevicePreferenceDefs.pm
@@ -20,7 +20,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API/;
+use parent qw/NGCP::Panel::Role::Entities/;
 
 sub resource_name{
     return 'pbxdevicepreferencedefs';
diff --git a/lib/NGCP/Panel/Controller/API/PbxDevicePreferences.pm b/lib/NGCP/Panel/Controller/API/PbxDevicePreferences.pm
index 9bee1c03e4..c8f3e53e11 100644
--- a/lib/NGCP/Panel/Controller/API/PbxDevicePreferences.pm
+++ b/lib/NGCP/Panel/Controller/API/PbxDevicePreferences.pm
@@ -22,7 +22,7 @@ sub api_description {
     return 'Specifies certain properties (preferences) for a <a href="#pbxdevicemodels">PBX Device Models</a>. The full list of properties can be obtained via <a href="/api/pbxdevicepreferencedefs/">PbxDevicePreferenceDefs</a>.';
 };
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Preferences/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::Preferences/;
 
 sub resource_name{
     return 'pbxdevicepreferences';
diff --git a/lib/NGCP/Panel/Controller/API/PbxDevicePreferencesItem.pm b/lib/NGCP/Panel/Controller/API/PbxDevicePreferencesItem.pm
index a7c1c6da60..11cd506665 100644
--- a/lib/NGCP/Panel/Controller/API/PbxDevicePreferencesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/PbxDevicePreferencesItem.pm
@@ -18,7 +18,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Preferences/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::Preferences/;
 
 sub resource_name{
     return 'pbxdevicepreferences';
diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceProfilePreferenceDefs.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceProfilePreferenceDefs.pm
index cfc17e692c..7f6bdf5e2e 100644
--- a/lib/NGCP/Panel/Controller/API/PbxDeviceProfilePreferenceDefs.pm
+++ b/lib/NGCP/Panel/Controller/API/PbxDeviceProfilePreferenceDefs.pm
@@ -20,7 +20,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API/;
+use parent qw/NGCP::Panel::Role::Entities/;
 
 sub resource_name{
     return 'pbxdeviceprofilepreferencedefs';
diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceProfilePreferences.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceProfilePreferences.pm
index 7b9223cdfd..2a2b38bc68 100644
--- a/lib/NGCP/Panel/Controller/API/PbxDeviceProfilePreferences.pm
+++ b/lib/NGCP/Panel/Controller/API/PbxDeviceProfilePreferences.pm
@@ -22,7 +22,7 @@ sub api_description {
     return 'Specifies certain properties (preferences) for a <a href="#pbxdeviceprofiles">PBX Device Profiles</a>. The full list of properties can be obtained via <a href="/api/pbxdeviceprofilepreferencedefs/">PbxDeviceProfilePreferenceDefs</a>.';
 };
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Preferences/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::Preferences/;
 
 sub resource_name{
     return 'pbxdeviceprofilepreferences';
diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceProfilePreferencesItem.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceProfilePreferencesItem.pm
index db78de5146..1757865188 100644
--- a/lib/NGCP/Panel/Controller/API/PbxDeviceProfilePreferencesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/PbxDeviceProfilePreferencesItem.pm
@@ -18,7 +18,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Preferences/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::Preferences/;
 
 sub resource_name{
     return 'pbxdeviceprofilepreferences';
diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceProfiles.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceProfiles.pm
index 0f10cb37cc..1234b495e0 100644
--- a/lib/NGCP/Panel/Controller/API/PbxDeviceProfiles.pm
+++ b/lib/NGCP/Panel/Controller/API/PbxDeviceProfiles.pm
@@ -50,7 +50,7 @@ sub query_params {
 }
 
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PbxDeviceProfiles/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::PbxDeviceProfiles/;
 
 sub resource_name{
     return 'pbxdeviceprofiles';
diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceProfilesItem.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceProfilesItem.pm
index bb9c29a428..26580041a5 100644
--- a/lib/NGCP/Panel/Controller/API/PbxDeviceProfilesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/PbxDeviceProfilesItem.pm
@@ -18,7 +18,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PbxDeviceProfiles/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::PbxDeviceProfiles/;
 
 sub resource_name{
     return 'pbxdeviceprofiles';
diff --git a/lib/NGCP/Panel/Controller/API/PbxDevices.pm b/lib/NGCP/Panel/Controller/API/PbxDevices.pm
index 5abdde3eac..c7cc235348 100644
--- a/lib/NGCP/Panel/Controller/API/PbxDevices.pm
+++ b/lib/NGCP/Panel/Controller/API/PbxDevices.pm
@@ -62,7 +62,7 @@ sub query_params {
 }
 
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PbxDevices/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::PbxDevices/;
 
 sub resource_name{
     return 'pbxdevices';
diff --git a/lib/NGCP/Panel/Controller/API/PbxDevicesItem.pm b/lib/NGCP/Panel/Controller/API/PbxDevicesItem.pm
index 06d5e7cb43..e4fc496d81 100644
--- a/lib/NGCP/Panel/Controller/API/PbxDevicesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/PbxDevicesItem.pm
@@ -18,7 +18,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PbxDevices/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::PbxDevices/;
 
 sub resource_name{
     return 'pbxdevices';
diff --git a/lib/NGCP/Panel/Controller/API/PeeringGroups.pm b/lib/NGCP/Panel/Controller/API/PeeringGroups.pm
index fd44ac6da6..2a4a8cb2d9 100644
--- a/lib/NGCP/Panel/Controller/API/PeeringGroups.pm
+++ b/lib/NGCP/Panel/Controller/API/PeeringGroups.pm
@@ -10,7 +10,7 @@ use HTTP::Headers qw();
 use HTTP::Status qw(:constants);
 #
 use NGCP::Panel::Utils::Peering;
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PeeringGroups/;#Catalyst::Controller
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::PeeringGroups/;#Catalyst::Controller
 require Catalyst::ActionRole::ACL;
 require Catalyst::ActionRole::CheckTrailingSlash;
 require NGCP::Panel::Role::HTTPMethods;
diff --git a/lib/NGCP/Panel/Controller/API/PeeringGroupsItem.pm b/lib/NGCP/Panel/Controller/API/PeeringGroupsItem.pm
index f0fa537fdf..b19188de0b 100644
--- a/lib/NGCP/Panel/Controller/API/PeeringGroupsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/PeeringGroupsItem.pm
@@ -8,7 +8,7 @@ use HTTP::Headers qw();
 use HTTP::Status qw(:constants);
 
 use NGCP::Panel::Utils::ValidateJSON qw();
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PeeringGroups/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::PeeringGroups/;
 require Catalyst::ActionRole::ACL;
 require NGCP::Panel::Role::HTTPMethods;
 require Catalyst::ActionRole::RequireSSL;
diff --git a/lib/NGCP/Panel/Controller/API/PeeringInboundRules.pm b/lib/NGCP/Panel/Controller/API/PeeringInboundRules.pm
index 283c052e90..8dee94a833 100644
--- a/lib/NGCP/Panel/Controller/API/PeeringInboundRules.pm
+++ b/lib/NGCP/Panel/Controller/API/PeeringInboundRules.pm
@@ -61,7 +61,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PeeringInboundRules/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::PeeringInboundRules/;
 
 sub resource_name{
     return 'peeringinboundrules';
diff --git a/lib/NGCP/Panel/Controller/API/PeeringInboundRulesItem.pm b/lib/NGCP/Panel/Controller/API/PeeringInboundRulesItem.pm
index 95254004fa..edbbb0b968 100644
--- a/lib/NGCP/Panel/Controller/API/PeeringInboundRulesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/PeeringInboundRulesItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PeeringInboundRules/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::PeeringInboundRules/;
 
 sub resource_name{
     return 'peeringinboundrules';
diff --git a/lib/NGCP/Panel/Controller/API/PeeringRules.pm b/lib/NGCP/Panel/Controller/API/PeeringRules.pm
index 31d6694989..567eab38a5 100644
--- a/lib/NGCP/Panel/Controller/API/PeeringRules.pm
+++ b/lib/NGCP/Panel/Controller/API/PeeringRules.pm
@@ -61,7 +61,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PeeringRules/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::PeeringRules/;
 
 sub resource_name{
     return 'peeringrules';
diff --git a/lib/NGCP/Panel/Controller/API/PeeringRulesItem.pm b/lib/NGCP/Panel/Controller/API/PeeringRulesItem.pm
index 2ae6fbcf61..4fb314dd84 100644
--- a/lib/NGCP/Panel/Controller/API/PeeringRulesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/PeeringRulesItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PeeringRules/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::PeeringRules/;
 
 sub resource_name{
     return 'peeringrules';
diff --git a/lib/NGCP/Panel/Controller/API/PeeringServerPreferenceDefs.pm b/lib/NGCP/Panel/Controller/API/PeeringServerPreferenceDefs.pm
index 734aa0efab..e2fd1a4f61 100644
--- a/lib/NGCP/Panel/Controller/API/PeeringServerPreferenceDefs.pm
+++ b/lib/NGCP/Panel/Controller/API/PeeringServerPreferenceDefs.pm
@@ -20,7 +20,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API/;
+use parent qw/NGCP::Panel::Role::Entities/;
 
 sub resource_name{
     return 'peeringserverpreferencedefs';
diff --git a/lib/NGCP/Panel/Controller/API/PeeringServerPreferences.pm b/lib/NGCP/Panel/Controller/API/PeeringServerPreferences.pm
index 4487bc29e9..b11ea04180 100644
--- a/lib/NGCP/Panel/Controller/API/PeeringServerPreferences.pm
+++ b/lib/NGCP/Panel/Controller/API/PeeringServerPreferences.pm
@@ -30,7 +30,7 @@ sub documentation_sample {
     };
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Preferences/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::Preferences/;
 
 sub resource_name{
     return 'peeringserverpreferences';
diff --git a/lib/NGCP/Panel/Controller/API/PeeringServerPreferencesItem.pm b/lib/NGCP/Panel/Controller/API/PeeringServerPreferencesItem.pm
index 29830310db..3a7c5faf80 100644
--- a/lib/NGCP/Panel/Controller/API/PeeringServerPreferencesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/PeeringServerPreferencesItem.pm
@@ -18,7 +18,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Preferences/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::Preferences/;
 
 sub resource_name{
     return 'peeringserverpreferences';
diff --git a/lib/NGCP/Panel/Controller/API/PeeringServers.pm b/lib/NGCP/Panel/Controller/API/PeeringServers.pm
index fd34ddc843..db334d7e93 100644
--- a/lib/NGCP/Panel/Controller/API/PeeringServers.pm
+++ b/lib/NGCP/Panel/Controller/API/PeeringServers.pm
@@ -82,7 +82,7 @@ sub query_params {
         },    ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PeeringServers/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::PeeringServers/;
 
 sub resource_name{
     return 'peeringservers';
diff --git a/lib/NGCP/Panel/Controller/API/PeeringServersItem.pm b/lib/NGCP/Panel/Controller/API/PeeringServersItem.pm
index c6885e256b..344711c181 100644
--- a/lib/NGCP/Panel/Controller/API/PeeringServersItem.pm
+++ b/lib/NGCP/Panel/Controller/API/PeeringServersItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::PeeringServers/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::PeeringServers/;
 
 sub resource_name{
     return 'peeringservers';
diff --git a/lib/NGCP/Panel/Controller/API/ProfilePackages.pm b/lib/NGCP/Panel/Controller/API/ProfilePackages.pm
index 898ce86193..ae0f6a364e 100644
--- a/lib/NGCP/Panel/Controller/API/ProfilePackages.pm
+++ b/lib/NGCP/Panel/Controller/API/ProfilePackages.pm
@@ -78,7 +78,7 @@ sub query_params {
         },    ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::ProfilePackages/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::ProfilePackages/;
 
 sub resource_name{
     return 'profilepackages';
diff --git a/lib/NGCP/Panel/Controller/API/ProfilePackagesItem.pm b/lib/NGCP/Panel/Controller/API/ProfilePackagesItem.pm
index 8f77a20999..50ea1f96da 100644
--- a/lib/NGCP/Panel/Controller/API/ProfilePackagesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/ProfilePackagesItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::ProfilePackages/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::ProfilePackages/;
 
 sub resource_name{
     return 'profilepackages';
diff --git a/lib/NGCP/Panel/Controller/API/ProfilePreferenceDefs.pm b/lib/NGCP/Panel/Controller/API/ProfilePreferenceDefs.pm
index 86e40de584..b12e60cd02 100644
--- a/lib/NGCP/Panel/Controller/API/ProfilePreferenceDefs.pm
+++ b/lib/NGCP/Panel/Controller/API/ProfilePreferenceDefs.pm
@@ -20,7 +20,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API/;
+use parent qw/NGCP::Panel::Role::Entities/;
 
 sub resource_name{
     return 'profilepreferencedefs';
diff --git a/lib/NGCP/Panel/Controller/API/ProfilePreferences.pm b/lib/NGCP/Panel/Controller/API/ProfilePreferences.pm
index 128d6adf41..d509846059 100644
--- a/lib/NGCP/Panel/Controller/API/ProfilePreferences.pm
+++ b/lib/NGCP/Panel/Controller/API/ProfilePreferences.pm
@@ -22,7 +22,7 @@ sub api_description {
     return 'Specifies certain properties (preferences) for a <a href="#subscriberprofiles">Subscriber Profile</a>. The full list of properties can be obtained via <a href="/api/profilepreferencedefs/">ProfilePreferenceDefs</a>.';
 };
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Preferences/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::Preferences/;
 
 sub resource_name{
     return 'profilepreferences';
diff --git a/lib/NGCP/Panel/Controller/API/ProfilePreferencesItem.pm b/lib/NGCP/Panel/Controller/API/ProfilePreferencesItem.pm
index fa385f7cad..ba065bd4be 100644
--- a/lib/NGCP/Panel/Controller/API/ProfilePreferencesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/ProfilePreferencesItem.pm
@@ -18,7 +18,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Preferences/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::Preferences/;
 
 sub resource_name{
     return 'profilepreferences';
diff --git a/lib/NGCP/Panel/Controller/API/Reminders.pm b/lib/NGCP/Panel/Controller/API/Reminders.pm
index ee7f3a81df..6bf229472b 100644
--- a/lib/NGCP/Panel/Controller/API/Reminders.pm
+++ b/lib/NGCP/Panel/Controller/API/Reminders.pm
@@ -55,7 +55,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Reminders/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::Reminders/;
 
 sub resource_name{
     return 'reminders';
diff --git a/lib/NGCP/Panel/Controller/API/RemindersItem.pm b/lib/NGCP/Panel/Controller/API/RemindersItem.pm
index a74cfab4ba..b49332b3d5 100644
--- a/lib/NGCP/Panel/Controller/API/RemindersItem.pm
+++ b/lib/NGCP/Panel/Controller/API/RemindersItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Reminders/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::Reminders/;
 
 sub resource_name{
     return 'reminders';
diff --git a/lib/NGCP/Panel/Controller/API/Resellers.pm b/lib/NGCP/Panel/Controller/API/Resellers.pm
index ea24ef10b6..1481df85ad 100644
--- a/lib/NGCP/Panel/Controller/API/Resellers.pm
+++ b/lib/NGCP/Panel/Controller/API/Resellers.pm
@@ -41,7 +41,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Resellers/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::Resellers/;
 
 sub resource_name{
     return 'resellers';
diff --git a/lib/NGCP/Panel/Controller/API/ResellersItem.pm b/lib/NGCP/Panel/Controller/API/ResellersItem.pm
index a9329e6a34..5d753b5390 100644
--- a/lib/NGCP/Panel/Controller/API/ResellersItem.pm
+++ b/lib/NGCP/Panel/Controller/API/ResellersItem.pm
@@ -16,7 +16,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Resellers/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::Resellers/;
 
 sub resource_name{
     return 'resellers';
diff --git a/lib/NGCP/Panel/Controller/API/RtcApps.pm b/lib/NGCP/Panel/Controller/API/RtcApps.pm
index b1ffc8052e..f68ed038f0 100644
--- a/lib/NGCP/Panel/Controller/API/RtcApps.pm
+++ b/lib/NGCP/Panel/Controller/API/RtcApps.pm
@@ -26,7 +26,7 @@ sub query_params {
     return [];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::RtcApps/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::RtcApps/;
 
 sub resource_name{
     return 'rtcapps';
diff --git a/lib/NGCP/Panel/Controller/API/RtcAppsItem.pm b/lib/NGCP/Panel/Controller/API/RtcAppsItem.pm
index eb80ab950b..4f40472ff5 100644
--- a/lib/NGCP/Panel/Controller/API/RtcAppsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/RtcAppsItem.pm
@@ -14,7 +14,7 @@ require Catalyst::ActionRole::RequireSSL;
 sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT/];
 }
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::RtcApps/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::RtcApps/;
 
 sub resource_name{
     return 'rtcapps';
diff --git a/lib/NGCP/Panel/Controller/API/RtcNetworks.pm b/lib/NGCP/Panel/Controller/API/RtcNetworks.pm
index 80ccfcfe62..14b5754e23 100644
--- a/lib/NGCP/Panel/Controller/API/RtcNetworks.pm
+++ b/lib/NGCP/Panel/Controller/API/RtcNetworks.pm
@@ -26,7 +26,7 @@ sub query_params {
     return [];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::RtcNetworks/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::RtcNetworks/;
 
 sub resource_name{
     return 'rtcnetworks';
diff --git a/lib/NGCP/Panel/Controller/API/RtcNetworksItem.pm b/lib/NGCP/Panel/Controller/API/RtcNetworksItem.pm
index bf6e7d07ad..4387a401e0 100644
--- a/lib/NGCP/Panel/Controller/API/RtcNetworksItem.pm
+++ b/lib/NGCP/Panel/Controller/API/RtcNetworksItem.pm
@@ -14,7 +14,7 @@ require Catalyst::ActionRole::RequireSSL;
 sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT/];
 }
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::RtcNetworks/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::RtcNetworks/;
 
 sub resource_name{
     return 'rtcnetworks';
diff --git a/lib/NGCP/Panel/Controller/API/RtcSessions.pm b/lib/NGCP/Panel/Controller/API/RtcSessions.pm
index 11b397c85c..71d2382160 100644
--- a/lib/NGCP/Panel/Controller/API/RtcSessions.pm
+++ b/lib/NGCP/Panel/Controller/API/RtcSessions.pm
@@ -28,7 +28,7 @@ sub query_params {
     return [];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::RtcSessions/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::RtcSessions/;
 
 sub resource_name{
     return 'rtcsessions';
diff --git a/lib/NGCP/Panel/Controller/API/RtcSessionsItem.pm b/lib/NGCP/Panel/Controller/API/RtcSessionsItem.pm
index 5c6f7b2633..c5e68291f8 100644
--- a/lib/NGCP/Panel/Controller/API/RtcSessionsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/RtcSessionsItem.pm
@@ -13,7 +13,7 @@ require Catalyst::ActionRole::ACL;
 require NGCP::Panel::Role::HTTPMethods;
 require Catalyst::ActionRole::RequireSSL;
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::RtcSessions/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::RtcSessions/;
 
 sub resource_name{
     return 'rtcsessions';
diff --git a/lib/NGCP/Panel/Controller/API/SoundFileRecordings.pm b/lib/NGCP/Panel/Controller/API/SoundFileRecordings.pm
index a9d3ffd5b9..79350a54ff 100644
--- a/lib/NGCP/Panel/Controller/API/SoundFileRecordings.pm
+++ b/lib/NGCP/Panel/Controller/API/SoundFileRecordings.pm
@@ -27,7 +27,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::SoundFiles/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::SoundFiles/;
 
 sub resource_name{
     return 'soundfilerecordings';
diff --git a/lib/NGCP/Panel/Controller/API/SoundFileRecordingsItem.pm b/lib/NGCP/Panel/Controller/API/SoundFileRecordingsItem.pm
index 576c485cd4..593e4185ac 100644
--- a/lib/NGCP/Panel/Controller/API/SoundFileRecordingsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/SoundFileRecordingsItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::SoundFiles/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::SoundFiles/;
 
 sub resource_name{
     return 'soundfilerecordings';
diff --git a/lib/NGCP/Panel/Controller/API/SoundFiles.pm b/lib/NGCP/Panel/Controller/API/SoundFiles.pm
index 7880ef6ac2..be6c124654 100644
--- a/lib/NGCP/Panel/Controller/API/SoundFiles.pm
+++ b/lib/NGCP/Panel/Controller/API/SoundFiles.pm
@@ -39,7 +39,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::SoundFiles/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::SoundFiles/;
 
 sub resource_name{
     return 'soundfiles';
diff --git a/lib/NGCP/Panel/Controller/API/SoundFilesItem.pm b/lib/NGCP/Panel/Controller/API/SoundFilesItem.pm
index f199bf924b..2f6a731c66 100644
--- a/lib/NGCP/Panel/Controller/API/SoundFilesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/SoundFilesItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::SoundFiles/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::SoundFiles/;
 
 sub resource_name{
     return 'soundfiles';
diff --git a/lib/NGCP/Panel/Controller/API/SoundHandles.pm b/lib/NGCP/Panel/Controller/API/SoundHandles.pm
index f43338c089..8f4c88556b 100644
--- a/lib/NGCP/Panel/Controller/API/SoundHandles.pm
+++ b/lib/NGCP/Panel/Controller/API/SoundHandles.pm
@@ -40,7 +40,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::SoundHandles/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::SoundHandles/;
 
 sub resource_name{
     return 'soundhandles';
diff --git a/lib/NGCP/Panel/Controller/API/SoundHandlesItem.pm b/lib/NGCP/Panel/Controller/API/SoundHandlesItem.pm
index e3301ab770..6e646c430a 100644
--- a/lib/NGCP/Panel/Controller/API/SoundHandlesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/SoundHandlesItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::SoundHandles/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::SoundHandles/;
 
 sub resource_name{
     return 'soundhandles';
diff --git a/lib/NGCP/Panel/Controller/API/SoundSets.pm b/lib/NGCP/Panel/Controller/API/SoundSets.pm
index 10ce5a3b94..d2af0bb488 100644
--- a/lib/NGCP/Panel/Controller/API/SoundSets.pm
+++ b/lib/NGCP/Panel/Controller/API/SoundSets.pm
@@ -60,7 +60,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::SoundSets/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::SoundSets/;
 
 sub resource_name{
     return 'soundsets';
diff --git a/lib/NGCP/Panel/Controller/API/SoundSetsItem.pm b/lib/NGCP/Panel/Controller/API/SoundSetsItem.pm
index 857139931b..2d0a37e8ee 100644
--- a/lib/NGCP/Panel/Controller/API/SoundSetsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/SoundSetsItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::SoundSets/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::SoundSets/;
 
 sub resource_name{
     return 'soundsets';
diff --git a/lib/NGCP/Panel/Controller/API/SpeedDials.pm b/lib/NGCP/Panel/Controller/API/SpeedDials.pm
index c9a6a623a0..11312c24d0 100644
--- a/lib/NGCP/Panel/Controller/API/SpeedDials.pm
+++ b/lib/NGCP/Panel/Controller/API/SpeedDials.pm
@@ -44,7 +44,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::SpeedDials/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::SpeedDials/;
 
 sub resource_name{
     return 'speeddials';
diff --git a/lib/NGCP/Panel/Controller/API/SpeedDialsItem.pm b/lib/NGCP/Panel/Controller/API/SpeedDialsItem.pm
index 743d79f393..9abd4fb3aa 100644
--- a/lib/NGCP/Panel/Controller/API/SpeedDialsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/SpeedDialsItem.pm
@@ -18,7 +18,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PUT PATCH/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::SpeedDials/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::SpeedDials/;
 
 sub resource_name{
     return 'speeddials';
diff --git a/lib/NGCP/Panel/Controller/API/SubscriberPreferenceDefs.pm b/lib/NGCP/Panel/Controller/API/SubscriberPreferenceDefs.pm
index e720d7d265..fab2c6c0dc 100644
--- a/lib/NGCP/Panel/Controller/API/SubscriberPreferenceDefs.pm
+++ b/lib/NGCP/Panel/Controller/API/SubscriberPreferenceDefs.pm
@@ -20,7 +20,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API/;
+use parent qw/NGCP::Panel::Role::Entities/;
 
 sub resource_name{
     return 'subscriberpreferencedefs';
diff --git a/lib/NGCP/Panel/Controller/API/SubscriberPreferences.pm b/lib/NGCP/Panel/Controller/API/SubscriberPreferences.pm
index 4459595881..62446d980b 100644
--- a/lib/NGCP/Panel/Controller/API/SubscriberPreferences.pm
+++ b/lib/NGCP/Panel/Controller/API/SubscriberPreferences.pm
@@ -64,7 +64,7 @@ sub documentation_sample {
     };
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Preferences/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::Preferences/;
 
 sub resource_name{
     return 'subscriberpreferences';
diff --git a/lib/NGCP/Panel/Controller/API/SubscriberPreferencesItem.pm b/lib/NGCP/Panel/Controller/API/SubscriberPreferencesItem.pm
index d870959aed..bc001b8eae 100644
--- a/lib/NGCP/Panel/Controller/API/SubscriberPreferencesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/SubscriberPreferencesItem.pm
@@ -19,7 +19,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Preferences/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::Preferences/;
 
 sub resource_name{
     return 'subscriberpreferences';
diff --git a/lib/NGCP/Panel/Controller/API/SubscriberProfileSets.pm b/lib/NGCP/Panel/Controller/API/SubscriberProfileSets.pm
index 551ef76c13..e17d2ac7d6 100644
--- a/lib/NGCP/Panel/Controller/API/SubscriberProfileSets.pm
+++ b/lib/NGCP/Panel/Controller/API/SubscriberProfileSets.pm
@@ -49,7 +49,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::SubscriberProfileSets/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::SubscriberProfileSets/;
 
 sub resource_name{
     return 'subscriberprofilesets';
diff --git a/lib/NGCP/Panel/Controller/API/SubscriberProfileSetsItem.pm b/lib/NGCP/Panel/Controller/API/SubscriberProfileSetsItem.pm
index ee3bca8a31..9306b06b28 100644
--- a/lib/NGCP/Panel/Controller/API/SubscriberProfileSetsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/SubscriberProfileSetsItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::SubscriberProfileSets/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::SubscriberProfileSets/;
 
 sub resource_name{
     return 'subscriberprofilesets';
diff --git a/lib/NGCP/Panel/Controller/API/SubscriberProfiles.pm b/lib/NGCP/Panel/Controller/API/SubscriberProfiles.pm
index a8ca198707..1cb8daed30 100644
--- a/lib/NGCP/Panel/Controller/API/SubscriberProfiles.pm
+++ b/lib/NGCP/Panel/Controller/API/SubscriberProfiles.pm
@@ -49,7 +49,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::SubscriberProfiles/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::SubscriberProfiles/;
 
 sub resource_name{
     return 'subscriberprofiles';
diff --git a/lib/NGCP/Panel/Controller/API/SubscriberProfilesItem.pm b/lib/NGCP/Panel/Controller/API/SubscriberProfilesItem.pm
index 2f6f3d9210..d40df8266e 100644
--- a/lib/NGCP/Panel/Controller/API/SubscriberProfilesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/SubscriberProfilesItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::SubscriberProfiles/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::SubscriberProfiles/;
 
 sub resource_name{
     return 'subscriberprofiles';
diff --git a/lib/NGCP/Panel/Controller/API/SubscriberRegistrations.pm b/lib/NGCP/Panel/Controller/API/SubscriberRegistrations.pm
index 6a59d728f5..ddf7f1bed2 100644
--- a/lib/NGCP/Panel/Controller/API/SubscriberRegistrations.pm
+++ b/lib/NGCP/Panel/Controller/API/SubscriberRegistrations.pm
@@ -58,7 +58,7 @@ sub query_params {
     ];
 };
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::SubscriberRegistrations/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::SubscriberRegistrations/;
 
 sub resource_name{
     return 'subscriberregistrations';
diff --git a/lib/NGCP/Panel/Controller/API/SubscriberRegistrationsItem.pm b/lib/NGCP/Panel/Controller/API/SubscriberRegistrationsItem.pm
index 28a4d74db3..3bd4957b31 100644
--- a/lib/NGCP/Panel/Controller/API/SubscriberRegistrationsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/SubscriberRegistrationsItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::SubscriberRegistrations/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::SubscriberRegistrations/;
 
 sub resource_name{
     return 'subscriberregistrations';
@@ -228,12 +228,18 @@ sub DELETE :Allow {
     return;
 }
 
-sub end : Private {
-    my ($self, $c) = @_;
+sub delete_item {
+    my ($self, $c, $item) = @_;
 
-    $self->log_response($c);
+    my $sub = $self->subscriber_from_item($c, $item);
+    return unless($sub);
+    NGCP::Panel::Utils::Kamailio::delete_location_contact($c,
+        $sub, $item->contact);
+    NGCP::Panel::Utils::Kamailio::flush($c);
+    return 1;
 }
 
+
 1;
 
 # vim: set tabstop=4 expandtab:
diff --git a/lib/NGCP/Panel/Controller/API/Subscribers.pm b/lib/NGCP/Panel/Controller/API/Subscribers.pm
index 4b5bcf12d8..ca02a7daf1 100644
--- a/lib/NGCP/Panel/Controller/API/Subscribers.pm
+++ b/lib/NGCP/Panel/Controller/API/Subscribers.pm
@@ -261,7 +261,7 @@ sub query_params {
     return $params;
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Subscribers/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::Subscribers/;
 
 sub resource_name{
     return 'subscribers';
diff --git a/lib/NGCP/Panel/Controller/API/SubscribersItem.pm b/lib/NGCP/Panel/Controller/API/SubscribersItem.pm
index d95e1dc13f..2c5c927609 100644
--- a/lib/NGCP/Panel/Controller/API/SubscribersItem.pm
+++ b/lib/NGCP/Panel/Controller/API/SubscribersItem.pm
@@ -19,7 +19,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Subscribers/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::Subscribers/;
 
 sub resource_name{
     return 'subscribers';
diff --git a/lib/NGCP/Panel/Controller/API/SystemContacts.pm b/lib/NGCP/Panel/Controller/API/SystemContacts.pm
index 2bbb654c3b..4769542316 100644
--- a/lib/NGCP/Panel/Controller/API/SystemContacts.pm
+++ b/lib/NGCP/Panel/Controller/API/SystemContacts.pm
@@ -39,7 +39,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::SystemContacts/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::SystemContacts/;
 
 sub resource_name{
     return 'systemcontacts';
diff --git a/lib/NGCP/Panel/Controller/API/SystemContactsItem.pm b/lib/NGCP/Panel/Controller/API/SystemContactsItem.pm
index 52b9203e0b..e7ff00e53f 100644
--- a/lib/NGCP/Panel/Controller/API/SystemContactsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/SystemContactsItem.pm
@@ -16,7 +16,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::SystemContacts/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::SystemContacts/;
 
 sub resource_name{
     return 'systemcontacts';
diff --git a/lib/NGCP/Panel/Controller/API/TopupCash.pm b/lib/NGCP/Panel/Controller/API/TopupCash.pm
index b769883b1d..780e5295a7 100644
--- a/lib/NGCP/Panel/Controller/API/TopupCash.pm
+++ b/lib/NGCP/Panel/Controller/API/TopupCash.pm
@@ -23,7 +23,7 @@ sub allowed_methods{
 
 use NGCP::Panel::Form;
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API/;
 
 sub api_description {
     return 'Defines topup via voucher codes.';
diff --git a/lib/NGCP/Panel/Controller/API/TopupLogs.pm b/lib/NGCP/Panel/Controller/API/TopupLogs.pm
index 83a5ac74d5..586678dacb 100644
--- a/lib/NGCP/Panel/Controller/API/TopupLogs.pm
+++ b/lib/NGCP/Panel/Controller/API/TopupLogs.pm
@@ -144,7 +144,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::TopupLogs/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::TopupLogs/;
 
 sub resource_name{
     return 'topuplogs';
diff --git a/lib/NGCP/Panel/Controller/API/TopupLogsItem.pm b/lib/NGCP/Panel/Controller/API/TopupLogsItem.pm
index 9b3a09a352..58353d7ed1 100644
--- a/lib/NGCP/Panel/Controller/API/TopupLogsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/TopupLogsItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::TopupLogs/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::TopupLogs/;
 
 sub resource_name{
     return 'topuplogs';
diff --git a/lib/NGCP/Panel/Controller/API/TopupVouchers.pm b/lib/NGCP/Panel/Controller/API/TopupVouchers.pm
index 468914d18a..403156a0eb 100644
--- a/lib/NGCP/Panel/Controller/API/TopupVouchers.pm
+++ b/lib/NGCP/Panel/Controller/API/TopupVouchers.pm
@@ -23,7 +23,7 @@ sub allowed_methods{
 
 use NGCP::Panel::Form;
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API/;
 
 sub api_description {
     return 'Defines topup via voucher codes.';
diff --git a/lib/NGCP/Panel/Controller/API/TrustedSources.pm b/lib/NGCP/Panel/Controller/API/TrustedSources.pm
index 3a3ba08623..9407452609 100644
--- a/lib/NGCP/Panel/Controller/API/TrustedSources.pm
+++ b/lib/NGCP/Panel/Controller/API/TrustedSources.pm
@@ -43,7 +43,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::TrustedSources/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::TrustedSources/;
 
 sub resource_name{
     return 'trustedsources';
diff --git a/lib/NGCP/Panel/Controller/API/TrustedSourcesItem.pm b/lib/NGCP/Panel/Controller/API/TrustedSourcesItem.pm
index 3739990793..ff4724da8a 100644
--- a/lib/NGCP/Panel/Controller/API/TrustedSourcesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/TrustedSourcesItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::TrustedSources/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::TrustedSources/;
 
 sub resource_name{
     return 'trustedsources';
diff --git a/lib/NGCP/Panel/Controller/API/UpnRewriteSets.pm b/lib/NGCP/Panel/Controller/API/UpnRewriteSets.pm
index acbd11e7b9..028fa5cdf4 100644
--- a/lib/NGCP/Panel/Controller/API/UpnRewriteSets.pm
+++ b/lib/NGCP/Panel/Controller/API/UpnRewriteSets.pm
@@ -42,7 +42,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::UpnRewriteSets/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::UpnRewriteSets/;
 
 sub resource_name{
     return 'upnrewritesets';
diff --git a/lib/NGCP/Panel/Controller/API/UpnRewriteSetsItem.pm b/lib/NGCP/Panel/Controller/API/UpnRewriteSetsItem.pm
index 99e9baf2a6..13c92f3101 100644
--- a/lib/NGCP/Panel/Controller/API/UpnRewriteSetsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/UpnRewriteSetsItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::UpnRewriteSets/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::UpnRewriteSets/;
 
 sub resource_name{
     return 'upnrewritesets';
diff --git a/lib/NGCP/Panel/Controller/API/VoicemailRecordings.pm b/lib/NGCP/Panel/Controller/API/VoicemailRecordings.pm
index c6ff16b263..8b80a855a3 100644
--- a/lib/NGCP/Panel/Controller/API/VoicemailRecordings.pm
+++ b/lib/NGCP/Panel/Controller/API/VoicemailRecordings.pm
@@ -22,7 +22,7 @@ sub api_description {
     return 'Defines the actual recording of voicemail messages. It is referred to by the <a href="#voicemails">Voicemails</a> relation. A GET on an item returns the binary blob of the recording with Content-Type "audio/x-wav".';
 };
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::VoicemailRecordings/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::VoicemailRecordings/;
 
 sub resource_name{
     return 'voicemailrecordings';
diff --git a/lib/NGCP/Panel/Controller/API/VoicemailRecordingsItem.pm b/lib/NGCP/Panel/Controller/API/VoicemailRecordingsItem.pm
index ebbbddb8b7..ea1f8b2ad2 100644
--- a/lib/NGCP/Panel/Controller/API/VoicemailRecordingsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/VoicemailRecordingsItem.pm
@@ -17,7 +17,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::VoicemailRecordings/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::VoicemailRecordings/;
 
 sub resource_name{
     return 'voicemailrecordings';
diff --git a/lib/NGCP/Panel/Controller/API/VoicemailSettings.pm b/lib/NGCP/Panel/Controller/API/VoicemailSettings.pm
index 8a3293f009..3c2bd171eb 100644
--- a/lib/NGCP/Panel/Controller/API/VoicemailSettings.pm
+++ b/lib/NGCP/Panel/Controller/API/VoicemailSettings.pm
@@ -42,7 +42,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::VoicemailSettings/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::VoicemailSettings/;
 
 sub resource_name{
     return 'voicemailsettings';
diff --git a/lib/NGCP/Panel/Controller/API/VoicemailSettingsItem.pm b/lib/NGCP/Panel/Controller/API/VoicemailSettingsItem.pm
index d5c9630f2e..212bf144f3 100644
--- a/lib/NGCP/Panel/Controller/API/VoicemailSettingsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/VoicemailSettingsItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::VoicemailSettings/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::VoicemailSettings/;
 
 sub resource_name{
     return 'voicemailsettings';
diff --git a/lib/NGCP/Panel/Controller/API/Voicemails.pm b/lib/NGCP/Panel/Controller/API/Voicemails.pm
index ae27177d5e..573f71f408 100644
--- a/lib/NGCP/Panel/Controller/API/Voicemails.pm
+++ b/lib/NGCP/Panel/Controller/API/Voicemails.pm
@@ -51,7 +51,7 @@ sub query_params {
     ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Voicemails/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::Voicemails/;
 
 sub resource_name{
     return 'voicemails';
diff --git a/lib/NGCP/Panel/Controller/API/VoicemailsItem.pm b/lib/NGCP/Panel/Controller/API/VoicemailsItem.pm
index 056625c1c7..02ae0dee3c 100644
--- a/lib/NGCP/Panel/Controller/API/VoicemailsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/VoicemailsItem.pm
@@ -16,7 +16,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Voicemails/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::Voicemails/;
 
 sub resource_name{
     return 'voicemails';
diff --git a/lib/NGCP/Panel/Controller/API/Vouchers.pm b/lib/NGCP/Panel/Controller/API/Vouchers.pm
index f0c45f57f9..9509804738 100644
--- a/lib/NGCP/Panel/Controller/API/Vouchers.pm
+++ b/lib/NGCP/Panel/Controller/API/Vouchers.pm
@@ -49,7 +49,7 @@ sub query_params {
         },    ];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Vouchers/;
+use parent qw/NGCP::Panel::Role::Entities NGCP::Panel::Role::API::Vouchers/;
 
 sub resource_name{
     return 'vouchers';
diff --git a/lib/NGCP/Panel/Controller/API/VouchersItem.pm b/lib/NGCP/Panel/Controller/API/VouchersItem.pm
index e7d3d8e840..6c21230b9d 100644
--- a/lib/NGCP/Panel/Controller/API/VouchersItem.pm
+++ b/lib/NGCP/Panel/Controller/API/VouchersItem.pm
@@ -15,7 +15,7 @@ sub allowed_methods{
     return [qw/GET OPTIONS HEAD PATCH PUT DELETE/];
 }
 
-use parent qw/Catalyst::Controller NGCP::Panel::Role::API::Vouchers/;
+use parent qw/NGCP::Panel::Role::EntitiesItem NGCP::Panel::Role::API::Vouchers/;
 
 sub resource_name{
     return 'vouchers';
diff --git a/lib/NGCP/Panel/Role/API/SubscriberRegistrations.pm b/lib/NGCP/Panel/Role/API/SubscriberRegistrations.pm
index 430cfd107b..cb2891889e 100644
--- a/lib/NGCP/Panel/Role/API/SubscriberRegistrations.pm
+++ b/lib/NGCP/Panel/Role/API/SubscriberRegistrations.pm
@@ -166,7 +166,6 @@ sub update_item {
 
     my $sub = $self->subscriber_from_id($c, $resource->{subscriber_id});
     return unless $sub;
-
     unless($create) {
         $self->delete_item($c, $item);
     }
@@ -217,16 +216,6 @@ sub fetch_item {
     return $item;
 }
 
-sub delete_item {
-    my ($self, $c, $item) = @_;
-
-    my $sub = $self->subscriber_from_item($c, $item);
-    return unless($sub);
-    NGCP::Panel::Utils::Kamailio::delete_location_contact($c,
-        $sub, $item->contact);
-    NGCP::Panel::Utils::Kamailio::flush($c);
-    return 1;
-}
 
 1;
 # vim: set tabstop=4 expandtab: