diff --git a/lib/NGCP/Panel/Controller/API/CCMapEntries.pm b/lib/NGCP/Panel/Controller/API/CCMapEntries.pm
index 8472c69632..f30b8ad412 100644
--- a/lib/NGCP/Panel/Controller/API/CCMapEntries.pm
+++ b/lib/NGCP/Panel/Controller/API/CCMapEntries.pm
@@ -69,7 +69,7 @@ sub GET :Allow {
         my (@embedded, @links);
         for my $cf ($cfs->all) {
             try {
-                push @embedded, $self->hal_from_item($c, $cf, "callforwards");
+                push @embedded, $self->hal_from_item($c, $cf, "ccmapentries");
                 push @links, Data::HAL::Link->new(
                     relation => 'ngcp:'.$self->resource_name,
                     href     => sprintf('%s%s', $self->dispatch_path, $cf->id),
diff --git a/lib/NGCP/Panel/Controller/API/CCMapEntriesItem.pm b/lib/NGCP/Panel/Controller/API/CCMapEntriesItem.pm
index dedff544db..b8168307be 100644
--- a/lib/NGCP/Panel/Controller/API/CCMapEntriesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CCMapEntriesItem.pm
@@ -22,16 +22,23 @@ class_has('resource_name', is => 'ro', default => 'ccmapentries');
 class_has('dispatch_path', is => 'ro', default => '/api/ccmapentries/');
 class_has('relation', is => 'ro', default => 'http://purl.org/sipwise/ngcp-api/#rel-ccmapentries');
 
+class_has(@{ __PACKAGE__->get_journal_query_params() });
+
 __PACKAGE__->config(
     action => {
-        map { $_ => {
+        (map { $_ => {
             ACLDetachTo => '/api/root/invalid_user',
             AllowedRole => [qw/admin reseller/],
             Args => 1,
             Does => [qw(ACL RequireSSL)],
             Method => $_,
             Path => __PACKAGE__->dispatch_path,
-        } } @{ __PACKAGE__->allowed_methods },
+        } } @{ __PACKAGE__->allowed_methods }),
+        @{ __PACKAGE__->get_journal_action_config(__PACKAGE__->resource_name,{
+            ACLDetachTo => '/api/root/invalid_user',
+            AllowedRole => [qw/admin reseller/],
+            Does => [qw(ACL RequireSSL)],
+        }) }
     },
     action_roles => [qw(HTTPMethods)],
 );
@@ -48,10 +55,10 @@ sub GET :Allow {
     my ($self, $c, $id) = @_;
     {
         last unless $self->valid_id($c, $id);
-        my $cfm = $self->item_by_id($c, $id, "callforwards");
-        last unless $self->resource_exists($c, cfm => $cfm);
+        my $item = $self->item_by_id($c, $id);
+        last unless $self->resource_exists($c, subs_for_ccmapentries => $item);
 
-        my $hal = $self->hal_from_item($c, $cfm, "callforwards");
+        my $hal = $self->hal_from_item($c, $item, "ccmapentries");
 
         my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
             (map { # XXX Data::HAL must be able to generate links with multiple relations
@@ -100,16 +107,19 @@ sub PATCH :Allow {
         );
         last unless $json;
 
-        my $callforward = $self->item_by_id($c, $id, "callforwards");
-        last unless $self->resource_exists($c, callforward => $callforward);
-        my $old_resource = $self->hal_from_item($c, $callforward, "callforwards")->resource;
+        my $item = $self->item_by_id($c, $id);
+        last unless $self->resource_exists($c, subs_for_ccmapentries => $item);
+        my $old_resource = $self->hal_from_item($c, $item, "ccmapentries")->resource;
         my $resource = $self->apply_patch($c, $old_resource, $json);
         last unless $resource;
 
         my $form = $self->get_form($c);
-        $callforward = $self->update_item($c, $callforward, $old_resource, $resource, $form);
-        last unless $callforward;
+        $item = $self->update_item($c, $item, $old_resource, $resource, $form);
+        last unless $item;
 
+        my $hal = $self->hal_from_item($c, $item, "ccmapentries");
+        last unless $self->add_update_journal_item_hal($c,{ hal => $hal, id => $item->id });
+        
         $guard->commit;
 
         if ('minimal' eq $preference) {
@@ -117,7 +127,7 @@ sub PATCH :Allow {
             $c->response->header(Preference_Applied => 'return=minimal');
             $c->response->body(q());
         } else {
-            my $hal = $self->hal_from_item($c, $callforward, "callforwards");
+            #my $hal = $self->hal_from_item($c, $ccmapentry, "ccmapentries");
             my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
                 $hal->http_headers,
             ), $hal->as_json);
@@ -136,8 +146,8 @@ sub PUT :Allow {
         my $preference = $self->require_preference($c);
         last unless $preference;
 
-        my $callforward = $self->item_by_id($c, $id);
-        last unless $self->resource_exists($c, callforward => $callforward);
+        my $item = $self->item_by_id($c, $id);
+        last unless $self->resource_exists($c, subs_for_ccmapentries => $item);
         my $resource = $self->get_valid_put_data(
             c => $c,
             id => $id,
@@ -147,8 +157,11 @@ sub PUT :Allow {
         my $old_resource = undef;
 
         my $form = $self->get_form($c);
-        $callforward = $self->update_item($c, $callforward, $old_resource, $resource, $form);
-        last unless $callforward;
+        $item = $self->update_item($c, $item, $old_resource, $resource, $form);
+        last unless $item;
+        
+        my $hal = $self->hal_from_item($c, $item, "ccmapentries");
+        last unless $self->add_update_journal_item_hal($c,{ hal => $hal, id => $item->id });
 
         $guard->commit;
 
@@ -157,7 +170,7 @@ sub PUT :Allow {
             $c->response->header(Preference_Applied => 'return=minimal');
             $c->response->body(q());
         } else {
-            my $hal = $self->hal_from_item($c, $callforward, "callforwards");
+            #my $hal = $self->hal_from_item($c, $item, "ccmapentries");
             my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
                 $hal->http_headers,
             ), $hal->as_json);
@@ -173,10 +186,17 @@ sub DELETE :Allow {
     my ($self, $c, $id) = @_;
     my $guard = $c->model('DB')->txn_scope_guard;
     {
-        my $subscriber = $self->item_by_id($c, $id);
-        last unless $self->resource_exists($c, ccmapentry => $subscriber);
-        my $prov_subs = $subscriber->provisioning_voip_subscriber;
+        my $item = $self->item_by_id($c, $id);
+        last unless $self->resource_exists($c, subs_for_ccmapentries => $item);
+        my $prov_subs = $item->provisioning_voip_subscriber;
         last unless $self->resource_exists($c, prov_subs => $prov_subs);
+        
+        last unless $self->add_delete_journal_item_hal($c,{ hal_from_item => sub {
+            my $self = shift;
+            my ($c) = @_;
+            return $self->hal_from_item($c,$item,"ccmapentries"); },
+            id => $id});        
+        
         try {
             $prov_subs->voip_cc_mappings->delete;
         } catch($e) {
@@ -192,6 +212,41 @@ sub DELETE :Allow {
     return;
 }
 
+sub item_base_journal :Journal {
+    my $self = shift @_;
+    return $self->handle_item_base_journal(@_);
+}
+    
+sub journals_get :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_get(@_);
+}
+
+sub journalsitem_get :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_get(@_);
+}
+
+sub journals_options :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_options(@_);
+}
+
+sub journalsitem_options :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_options(@_);
+}
+
+sub journals_head :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_head(@_);
+}
+
+sub journalsitem_head :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_head(@_);
+}
+
 sub end : Private {
     my ($self, $c) = @_;
 
diff --git a/lib/NGCP/Panel/Controller/API/CFDestinationSetsItem.pm b/lib/NGCP/Panel/Controller/API/CFDestinationSetsItem.pm
index 7b2e2b77b8..91b23f2070 100644
--- a/lib/NGCP/Panel/Controller/API/CFDestinationSetsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CFDestinationSetsItem.pm
@@ -56,7 +56,7 @@ sub GET :Allow {
     {
         last unless $self->valid_id($c, $id);
         my $dset = $self->item_by_id($c, $id);
-        last unless $self->resource_exists($c, dset => $dset);
+        last unless $self->resource_exists($c, destinationset => $dset);
 
         my $hal = $self->hal_from_item($c, $dset, "cfdestinationsets");
 
@@ -147,7 +147,7 @@ sub PUT :Allow {
         last unless $preference;
 
         my $dset = $self->item_by_id($c, $id);
-        last unless $self->resource_exists($c, cfdestinationset => $dset);
+        last unless $self->resource_exists($c, destinationset => $dset);
         my $resource = $self->get_valid_put_data(
             c => $c,
             id => $id,
diff --git a/lib/NGCP/Panel/Controller/API/CFMappingsItem.pm b/lib/NGCP/Panel/Controller/API/CFMappingsItem.pm
index 99696c5ec3..3a3fc3b1c7 100644
--- a/lib/NGCP/Panel/Controller/API/CFMappingsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CFMappingsItem.pm
@@ -22,16 +22,23 @@ class_has('resource_name', is => 'ro', default => 'cfmappings');
 class_has('dispatch_path', is => 'ro', default => '/api/cfmappings/');
 class_has('relation', is => 'ro', default => 'http://purl.org/sipwise/ngcp-api/#rel-cfmappings');
 
+class_has(@{ __PACKAGE__->get_journal_query_params() });
+
 __PACKAGE__->config(
     action => {
-        map { $_ => {
+        (map { $_ => {
             ACLDetachTo => '/api/root/invalid_user',
             AllowedRole => [qw/admin reseller/],
             Args => 1,
             Does => [qw(ACL RequireSSL)],
             Method => $_,
             Path => __PACKAGE__->dispatch_path,
-        } } @{ __PACKAGE__->allowed_methods },
+        } } @{ __PACKAGE__->allowed_methods }),
+        @{ __PACKAGE__->get_journal_action_config(__PACKAGE__->resource_name,{
+            ACLDetachTo => '/api/root/invalid_user',
+            AllowedRole => [qw/admin reseller/],
+            Does => [qw(ACL RequireSSL)],
+        }) }
     },
     action_roles => [qw(HTTPMethods)],
 );
@@ -48,10 +55,10 @@ sub GET :Allow {
     my ($self, $c, $id) = @_;
     {
         last unless $self->valid_id($c, $id);
-        my $dset = $self->item_by_id($c, $id);
-        last unless $self->resource_exists($c, dset => $dset);
+        my $item = $self->item_by_id($c, $id);
+        last unless $self->resource_exists($c, subscriber => $item);
 
-        my $hal = $self->hal_from_item($c, $dset, "cfdestinationsets");
+        my $hal = $self->hal_from_item($c, $item, "cfmappings");
 
         my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
             (map { # XXX Data::HAL must be able to generate links with multiple relations
@@ -110,6 +117,9 @@ sub PATCH :Allow {
         $item = $self->update_item($c, $item, $old_resource, $resource, $form);
         last unless $item;
 
+        my $hal = $self->hal_from_item($c, $item, "cfmappings");
+        last unless $self->add_update_journal_item_hal($c,{ hal => $hal, id => $item->id });
+        
         $guard->commit; 
 
         if ('minimal' eq $preference) {
@@ -117,7 +127,7 @@ sub PATCH :Allow {
             $c->response->header(Preference_Applied => 'return=minimal');
             $c->response->body(q());
         } else {
-            my $hal = $self->hal_from_item($c, $item, "cfmappings");
+            #my $hal = $self->hal_from_item($c, $item, "cfmappings");
             my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
                 $hal->http_headers,
             ), $hal->as_json);
@@ -150,6 +160,9 @@ sub PUT :Allow {
         $item = $self->update_item($c, $item, $old_resource, $resource, $form);
         last unless $item;
 
+        my $hal = $self->hal_from_item($c, $item, "cfmappings");
+        last unless $self->add_update_journal_item_hal($c,{ hal => $hal, id => $item->id });
+        
         $guard->commit;
 
         if ('minimal' eq $preference) {
@@ -157,7 +170,7 @@ sub PUT :Allow {
             $c->response->header(Preference_Applied => 'return=minimal');
             $c->response->body(q());
         } else {
-            my $hal = $self->hal_from_item($c, $item, "cfmappings");
+            #my $hal = $self->hal_from_item($c, $item, "cfmappings");
             my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
                 $hal->http_headers,
             ), $hal->as_json);
@@ -169,6 +182,41 @@ sub PUT :Allow {
     return;
 }
 
+sub item_base_journal :Journal {
+    my $self = shift @_;
+    return $self->handle_item_base_journal(@_);
+}
+    
+sub journals_get :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_get(@_);
+}
+
+sub journalsitem_get :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_get(@_);
+}
+
+sub journals_options :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_options(@_);
+}
+
+sub journalsitem_options :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_options(@_);
+}
+
+sub journals_head :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_head(@_);
+}
+
+sub journalsitem_head :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_head(@_);
+}
+
 sub end : Private {
     my ($self, $c) = @_;
 
diff --git a/lib/NGCP/Panel/Controller/API/CFTimeSetsItem.pm b/lib/NGCP/Panel/Controller/API/CFTimeSetsItem.pm
index 1b1aa1fc71..79666bc161 100644
--- a/lib/NGCP/Panel/Controller/API/CFTimeSetsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CFTimeSetsItem.pm
@@ -108,7 +108,7 @@ sub PATCH :Allow {
         last unless $json;
 
         my $tset = $self->item_by_id($c, $id);
-        last unless $self->resource_exists($c, cftimeset => $tset);
+        last unless $self->resource_exists($c, timeset => $tset);
         my $old_resource = $self->hal_from_item($c, $tset, "cftimesets")->resource;
         my $resource = $self->apply_patch($c, $old_resource, $json);
         last unless $resource;
@@ -147,7 +147,7 @@ sub PUT :Allow {
         last unless $preference;
 
         my $tset = $self->item_by_id($c, $id);
-        last unless $self->resource_exists($c, cftimeset => $tset);
+        last unless $self->resource_exists($c, timeset => $tset);
         my $resource = $self->get_valid_put_data(
             c => $c,
             id => $id,
diff --git a/lib/NGCP/Panel/Controller/API/CallForwardsItem.pm b/lib/NGCP/Panel/Controller/API/CallForwardsItem.pm
index dd4d58233f..43cf1d050b 100644
--- a/lib/NGCP/Panel/Controller/API/CallForwardsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/CallForwardsItem.pm
@@ -55,10 +55,10 @@ sub GET :Allow {
     my ($self, $c, $id) = @_;
     {
         last unless $self->valid_id($c, $id);
-        my $cfm = $self->item_by_id($c, $id, "callforwards");
-        last unless $self->resource_exists($c, cfm => $cfm);
+        my $item = $self->item_by_id($c, $id);
+        last unless $self->resource_exists($c, subscriber => $item);
 
-        my $hal = $self->hal_from_item($c, $cfm, "callforwards");
+        my $hal = $self->hal_from_item($c, $item, "callforwards");
 
         my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
             (map { # XXX Data::HAL must be able to generate links with multiple relations
@@ -107,18 +107,18 @@ sub PATCH :Allow {
         );
         last unless $json;
 
-        my $callforward = $self->item_by_id($c, $id, "callforwards");
-        last unless $self->resource_exists($c, callforward => $callforward);
-        my $old_resource = $self->hal_from_item($c, $callforward, "callforwards")->resource;
+        my $item = $self->item_by_id($c, $id);
+        last unless $self->resource_exists($c, subs_for_callforwards => $item);
+        my $old_resource = $self->hal_from_item($c, $item, "callforwards")->resource;
         my $resource = $self->apply_patch($c, $old_resource, $json);
         last unless $resource;
 
         my $form = $self->get_form($c);
-        $callforward = $self->update_item($c, $callforward, $old_resource, $resource, $form);
-        last unless $callforward;
+        $item = $self->update_item($c, $item, $old_resource, $resource, $form);
+        last unless $item;
         
-        my $hal = $self->hal_from_item($c, $callforward, "callforwards");
-        last unless $self->add_update_journal_item_hal($c,$hal);
+        my $hal = $self->hal_from_item($c, $item, "callforwards");
+        last unless $self->add_update_journal_item_hal($c,{ hal => $hal, id => $id });
 
         $guard->commit; 
 
@@ -146,8 +146,8 @@ sub PUT :Allow {
         my $preference = $self->require_preference($c);
         last unless $preference;
 
-        my $callforward = $self->item_by_id($c, $id, "callforwards");
-        last unless $self->resource_exists($c, callforward => $callforward);
+        my $item = $self->item_by_id($c, $id);
+        last unless $self->resource_exists($c, subs_for_callforward => $item);
         my $resource = $self->get_valid_put_data(
             c => $c,
             id => $id,
@@ -157,11 +157,11 @@ sub PUT :Allow {
         my $old_resource = undef;
 
         my $form = $self->get_form($c);
-        $callforward = $self->update_item($c, $callforward, $old_resource, $resource, $form);
-        last unless $callforward;
+        $item = $self->update_item($c, $item, $old_resource, $resource, $form);
+        last unless $item;
 
-        my $hal = $self->hal_from_item($c, $callforward, "callforwards");
-        last unless $self->add_update_journal_item_hal($c,$hal);
+        my $hal = $self->hal_from_item($c, $item, "callforwards");
+        last unless $self->add_update_journal_item_hal($c,{ hal => $hal, id => $id });
         
         $guard->commit; 
 
@@ -186,8 +186,8 @@ sub DELETE :Allow {
     my ($self, $c, $id) = @_;
     my $guard = $c->model('DB')->txn_scope_guard;
     {
-        my $callforward = $self->item_by_id($c, $id, "callforwards");
-        last unless $self->resource_exists($c, callforward => $callforward);
+        my $item = $self->item_by_id($c, $id);
+        last unless $self->resource_exists($c, subs_for_callforward => $item);
         my $form = $self->get_form($c);
         my $old_resource = undef;
         my $resource = $self->get_valid_put_data(
@@ -196,20 +196,22 @@ sub DELETE :Allow {
             media_type => 'application/json',
         );
         $resource //= {};
+
+        last unless $self->add_delete_journal_item_hal($c,{ hal_from_item => sub {
+            my $self = shift;
+            my ($c) = @_;
+            #my $_callforward = $self->item_by_id($c, $id, "callforwards");
+            return $self->hal_from_item($c,$item,"callforwards"); },
+            id => $id});
+
         try {
-            $callforward = $self->update_item($c, $callforward, $old_resource, $resource, $form);
+            $item = $self->update_item($c, $item, $old_resource, $resource, $form);
         } catch($e) {
             $c->log->error("Failed to delete callforward with id '$id': $e");
             $self->error($c, HTTP_INTERNAL_SERVER_ERROR, "Internal Server Error");
             last;
         }
 
-        last unless $self->add_delete_journal_item_hal($c,sub {
-            my $self = shift;
-            my ($c) = @_;
-            #my $_callforward = $self->item_by_id($c, $id, "callforwards");
-            return $self->hal_from_item($c,$callforward); });
-        
         $guard->commit;
 
         $c->response->status(HTTP_NO_CONTENT);
@@ -218,6 +220,41 @@ sub DELETE :Allow {
     return;
 }
 
+sub item_base_journal :Journal {
+    my $self = shift @_;
+    return $self->handle_item_base_journal(@_);
+}
+    
+sub journals_get :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_get(@_);
+}
+
+sub journalsitem_get :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_get(@_);
+}
+
+sub journals_options :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_options(@_);
+}
+
+sub journalsitem_options :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_options(@_);
+}
+
+sub journals_head :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_head(@_);
+}
+
+sub journalsitem_head :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_head(@_);
+}
+
 sub end : Private {
     my ($self, $c) = @_;
 
diff --git a/lib/NGCP/Panel/Controller/API/FaxserverSettingsItem.pm b/lib/NGCP/Panel/Controller/API/FaxserverSettingsItem.pm
index 7eadb363b6..d814220ae0 100644
--- a/lib/NGCP/Panel/Controller/API/FaxserverSettingsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/FaxserverSettingsItem.pm
@@ -22,16 +22,23 @@ class_has('resource_name', is => 'ro', default => 'faxserversettings');
 class_has('dispatch_path', is => 'ro', default => '/api/faxserversettings/');
 class_has('relation', is => 'ro', default => 'http://purl.org/sipwise/ngcp-api/#rel-faxserversettings');
 
+class_has(@{ __PACKAGE__->get_journal_query_params() });
+
 __PACKAGE__->config(
     action => {
-        map { $_ => {
+        (map { $_ => {
             ACLDetachTo => '/api/root/invalid_user',
             AllowedRole => [qw/admin reseller/],
             Args => 1,
             Does => [qw(ACL RequireSSL)],
             Method => $_,
             Path => __PACKAGE__->dispatch_path,
-        } } @{ __PACKAGE__->allowed_methods },
+        } } @{ __PACKAGE__->allowed_methods }),
+        @{ __PACKAGE__->get_journal_action_config(__PACKAGE__->resource_name,{
+            ACLDetachTo => '/api/root/invalid_user',
+            AllowedRole => [qw/admin reseller/],
+            Does => [qw(ACL RequireSSL)],
+        }) }
     },
     action_roles => [qw(HTTPMethods)],
 );
@@ -48,10 +55,10 @@ sub GET :Allow {
     my ($self, $c, $id) = @_;
     {
         last unless $self->valid_id($c, $id);
-        my $cfm = $self->item_by_id($c, $id);
-        last unless $self->resource_exists($c, cfm => $cfm);
+        my $subs = $self->item_by_id($c, $id);
+        last unless $self->resource_exists($c, faxserversettings => $subs);
 
-        my $hal = $self->hal_from_item($c, $cfm);
+        my $hal = $self->hal_from_item($c, $subs);
 
         my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
             (map { # XXX Data::HAL must be able to generate links with multiple relations
@@ -110,6 +117,9 @@ sub PATCH :Allow {
         $item = $self->update_item($c, $item, $old_resource, $resource, $form);
         last unless $item;
 
+        my $hal = $self->hal_from_item($c, $item);
+        last unless $self->add_update_journal_item_hal($c,{ hal => $hal, id => $item->id });
+        
         $guard->commit; 
 
         if ('minimal' eq $preference) {
@@ -117,7 +127,7 @@ sub PATCH :Allow {
             $c->response->header(Preference_Applied => 'return=minimal');
             $c->response->body(q());
         } else {
-            my $hal = $self->hal_from_item($c, $item);
+            #my $hal = $self->hal_from_item($c, $item);
             my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
                 $hal->http_headers,
             ), $hal->as_json);
@@ -149,6 +159,9 @@ sub PUT :Allow {
         my $form = $self->get_form($c);
         $item = $self->update_item($c, $item, $old_resource, $resource, $form);
         last unless $item;
+        
+        my $hal = $self->hal_from_item($c, $item);
+        last unless $self->add_update_journal_item_hal($c,{ hal => $hal, id => $item->id });
 
         $guard->commit; 
 
@@ -157,7 +170,7 @@ sub PUT :Allow {
             $c->response->header(Preference_Applied => 'return=minimal');
             $c->response->body(q());
         } else {
-            my $hal = $self->hal_from_item($c, $item);
+            #my $hal = $self->hal_from_item($c, $item);
             my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
                 $hal->http_headers,
             ), $hal->as_json);
@@ -169,6 +182,41 @@ sub PUT :Allow {
     return;
 }
 
+sub item_base_journal :Journal {
+    my $self = shift @_;
+    return $self->handle_item_base_journal(@_);
+}
+    
+sub journals_get :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_get(@_);
+}
+
+sub journalsitem_get :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_get(@_);
+}
+
+sub journals_options :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_options(@_);
+}
+
+sub journalsitem_options :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_options(@_);
+}
+
+sub journals_head :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_head(@_);
+}
+
+sub journalsitem_head :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_head(@_);
+}
+
 sub end : Private {
     my ($self, $c) = @_;
 
diff --git a/lib/NGCP/Panel/Controller/API/Reminders.pm b/lib/NGCP/Panel/Controller/API/Reminders.pm
index fc1732f4ae..7963f81b36 100644
--- a/lib/NGCP/Panel/Controller/API/Reminders.pm
+++ b/lib/NGCP/Panel/Controller/API/Reminders.pm
@@ -197,6 +197,12 @@ sub POST :Allow {
             $self->error($c, HTTP_INTERNAL_SERVER_ERROR, "Failed to create reminder.");
             last;
         }
+        
+        last unless $self->add_create_journal_item_hal($c,sub {
+            my $self = shift;
+            my ($c) = @_;
+            my $_item = $self->item_by_id($c, $item->id);
+            return $self->hal_from_item($c, $_item, $form); });
 
         $guard->commit;
 
diff --git a/lib/NGCP/Panel/Controller/API/RemindersItem.pm b/lib/NGCP/Panel/Controller/API/RemindersItem.pm
index 4c8b7c95e7..d8dfdae0a9 100644
--- a/lib/NGCP/Panel/Controller/API/RemindersItem.pm
+++ b/lib/NGCP/Panel/Controller/API/RemindersItem.pm
@@ -19,16 +19,23 @@ class_has('resource_name', is => 'ro', default => 'reminders');
 class_has('dispatch_path', is => 'ro', default => '/api/reminders/');
 class_has('relation', is => 'ro', default => 'http://purl.org/sipwise/ngcp-api/#rel-reminders');
 
+class_has(@{ __PACKAGE__->get_journal_query_params() });
+
 __PACKAGE__->config(
     action => {
-        map { $_ => {
+        (map { $_ => {
             ACLDetachTo => '/api/root/invalid_user',
             AllowedRole => [qw/admin reseller/],
             Args => 1,
             Does => [qw(ACL RequireSSL)],
             Method => $_,
             Path => __PACKAGE__->dispatch_path,
-        } } @{ __PACKAGE__->allowed_methods }
+        } } @{ __PACKAGE__->allowed_methods }),
+        @{ __PACKAGE__->get_journal_action_config(__PACKAGE__->resource_name,{
+            ACLDetachTo => '/api/root/invalid_user',
+            AllowedRole => [qw/admin reseller/],
+            Does => [qw(ACL RequireSSL)],
+        }) }
     },
     action_roles => [qw(HTTPMethods)],
 );
@@ -106,6 +113,9 @@ sub PATCH :Allow {
         $item = $self->update_item($c, $item, $old_resource, $resource, $form);
         last unless $item;
         
+        my $hal = $self->hal_from_item($c, $item, $form);
+        last unless $self->add_update_journal_item_hal($c,$hal);
+        
         $guard->commit;
 
         if ('minimal' eq $preference) {
@@ -113,7 +123,7 @@ sub PATCH :Allow {
             $c->response->header(Preference_Applied => 'return=minimal');
             $c->response->body(q());
         } else {
-            my $hal = $self->hal_from_item($c, $item, $form);
+            #my $hal = $self->hal_from_item($c, $item, $form);
             my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
                 $hal->http_headers,
             ), $hal->as_json);
@@ -146,6 +156,9 @@ sub PUT :Allow {
         $item = $self->update_item($c, $item, $old_resource, $resource, $form);
         last unless $item;
 
+        my $hal = $self->hal_from_item($c, $item, $form);
+        last unless $self->add_update_journal_item_hal($c,$hal);
+        
         $guard->commit; 
 
         if ('minimal' eq $preference) {
@@ -153,7 +166,7 @@ sub PUT :Allow {
             $c->response->header(Preference_Applied => 'return=minimal');
             $c->response->body(q());
         } else {
-            my $hal = $self->hal_from_item($c, $item, $form);
+            #my $hal = $self->hal_from_item($c, $item, $form);
             my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
                 $hal->http_headers,
             ), $hal->as_json);
@@ -172,6 +185,13 @@ sub DELETE :Allow {
     {
         my $item = $self->item_by_id($c, $id);
         last unless $self->resource_exists($c, reminder => $item);
+        
+        last unless $self->add_delete_journal_item_hal($c,sub {
+            my $self = shift;
+            my ($c) = @_;
+            my $_form = $self->get_form($c);
+            return $self->hal_from_item($c, $item, $_form); });
+        
         $item->delete;
 
         $guard->commit;
@@ -182,6 +202,41 @@ sub DELETE :Allow {
     return;
 }
 
+sub item_base_journal :Journal {
+    my $self = shift @_;
+    return $self->handle_item_base_journal(@_);
+}
+    
+sub journals_get :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_get(@_);
+}
+
+sub journalsitem_get :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_get(@_);
+}
+
+sub journals_options :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_options(@_);
+}
+
+sub journalsitem_options :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_options(@_);
+}
+
+sub journals_head :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_head(@_);
+}
+
+sub journalsitem_head :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_head(@_);
+}
+
 sub end : Private {
     my ($self, $c) = @_;
 
diff --git a/lib/NGCP/Panel/Controller/API/SpeedDialsItem.pm b/lib/NGCP/Panel/Controller/API/SpeedDialsItem.pm
index 22ac130834..290cab0da6 100644
--- a/lib/NGCP/Panel/Controller/API/SpeedDialsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/SpeedDialsItem.pm
@@ -22,16 +22,23 @@ class_has('resource_name', is => 'ro', default => 'speeddials');
 class_has('dispatch_path', is => 'ro', default => '/api/speeddials/');
 class_has('relation', is => 'ro', default => 'http://purl.org/sipwise/ngcp-api/#rel-speeddials');
 
+class_has(@{ __PACKAGE__->get_journal_query_params() });
+
 __PACKAGE__->config(
     action => {
-        map { $_ => {
+        (map { $_ => {
             ACLDetachTo => '/api/root/invalid_user',
             AllowedRole => [qw/admin reseller/],
             Args => 1,
             Does => [qw(ACL RequireSSL)],
             Method => $_,
             Path => __PACKAGE__->dispatch_path,
-        } } @{ __PACKAGE__->allowed_methods },
+        } } @{ __PACKAGE__->allowed_methods }),
+        @{ __PACKAGE__->get_journal_action_config(__PACKAGE__->resource_name,{
+            ACLDetachTo => '/api/root/invalid_user',
+            AllowedRole => [qw/admin reseller/],
+            Does => [qw(ACL RequireSSL)],
+        }) }
     },
     action_roles => [qw(HTTPMethods)],
 );
@@ -106,6 +113,9 @@ sub PUT :Allow {
         $subscriber = $self->update_item($c, $subscriber, undef, $resource, $form);
         last unless $subscriber;
 
+        my $hal = $self->hal_from_item($c, $subscriber);
+        last unless $self->add_update_journal_item_hal($c,{ hal => $hal, id => $subscriber->id });
+        
         $guard->commit;
 
         if ('minimal' eq $preference) {
@@ -113,7 +123,7 @@ sub PUT :Allow {
             $c->response->header(Preference_Applied => 'return=minimal');
             $c->response->body(q());
         } else {
-            my $hal = $self->hal_from_item($c, $subscriber);
+            #my $hal = $self->hal_from_item($c, $subscriber);
             my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
                 $hal->http_headers,
             ), $hal->as_json);
@@ -151,6 +161,9 @@ sub PATCH :Allow {
         $subscriber = $self->update_item($c, $subscriber, undef, $resource, $form);
         last unless $subscriber;
 
+        my $hal = $self->hal_from_item($c, $subscriber);
+        last unless $self->add_update_journal_item_hal($c,{ hal => $hal, id => $subscriber->id });
+        
         $guard->commit;
 
         if ('minimal' eq $preference) {
@@ -158,7 +171,7 @@ sub PATCH :Allow {
             $c->response->header(Preference_Applied => 'return=minimal');
             $c->response->body(q());
         } else {
-            my $hal = $self->hal_from_item($c, $subscriber);
+            #my $hal = $self->hal_from_item($c, $subscriber);
             my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
                 $hal->http_headers,
             ), $hal->as_json);
@@ -170,6 +183,41 @@ sub PATCH :Allow {
     return;
 }
 
+sub item_base_journal :Journal {
+    my $self = shift @_;
+    return $self->handle_item_base_journal(@_);
+}
+    
+sub journals_get :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_get(@_);
+}
+
+sub journalsitem_get :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_get(@_);
+}
+
+sub journals_options :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_options(@_);
+}
+
+sub journalsitem_options :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_options(@_);
+}
+
+sub journals_head :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_head(@_);
+}
+
+sub journalsitem_head :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_head(@_);
+}
+
 sub end : Private {
     my ($self, $c) = @_;
 
diff --git a/lib/NGCP/Panel/Controller/API/TrustedSources.pm b/lib/NGCP/Panel/Controller/API/TrustedSources.pm
index 0ceb162c06..235683fcaf 100644
--- a/lib/NGCP/Panel/Controller/API/TrustedSources.pm
+++ b/lib/NGCP/Panel/Controller/API/TrustedSources.pm
@@ -186,6 +186,12 @@ sub POST :Allow {
             last;
         }
 
+        last unless $self->add_create_journal_item_hal($c,sub {
+            my $self = shift;
+            my ($c) = @_;
+            my $_item = $self->item_by_id($c, $item->id);
+            return $self->hal_from_item($c, $_item, $form); });
+        
         $guard->commit;
 
         $c->response->status(HTTP_CREATED);
diff --git a/lib/NGCP/Panel/Controller/API/TrustedSourcesItem.pm b/lib/NGCP/Panel/Controller/API/TrustedSourcesItem.pm
index 12a9381f0d..d381ed6f45 100644
--- a/lib/NGCP/Panel/Controller/API/TrustedSourcesItem.pm
+++ b/lib/NGCP/Panel/Controller/API/TrustedSourcesItem.pm
@@ -19,16 +19,23 @@ class_has('resource_name', is => 'ro', default => 'trustedsources');
 class_has('dispatch_path', is => 'ro', default => '/api/trustedsources/');
 class_has('relation', is => 'ro', default => 'http://purl.org/sipwise/ngcp-api/#rel-trustedsources');
 
+class_has(@{ __PACKAGE__->get_journal_query_params() });
+
 __PACKAGE__->config(
     action => {
-        map { $_ => {
+        (map { $_ => {
             ACLDetachTo => '/api/root/invalid_user',
             AllowedRole => [qw/admin reseller/],
             Args => 1,
             Does => [qw(ACL RequireSSL)],
             Method => $_,
             Path => __PACKAGE__->dispatch_path,
-        } } @{ __PACKAGE__->allowed_methods }
+        } } @{ __PACKAGE__->allowed_methods }),
+        @{ __PACKAGE__->get_journal_action_config(__PACKAGE__->resource_name,{
+            ACLDetachTo => '/api/root/invalid_user',
+            AllowedRole => [qw/admin reseller/],
+            Does => [qw(ACL RequireSSL)],
+        }) }
     },
     action_roles => [qw(HTTPMethods)],
 );
@@ -106,6 +113,9 @@ sub PATCH :Allow {
         $item = $self->update_item($c, $item, $old_resource, $resource, $form);
         last unless $item;
         
+        my $hal = $self->hal_from_item($c, $item, $form);
+        last unless $self->add_update_journal_item_hal($c,$hal);
+        
         $guard->commit;
 
         if ('minimal' eq $preference) {
@@ -113,7 +123,7 @@ sub PATCH :Allow {
             $c->response->header(Preference_Applied => 'return=minimal');
             $c->response->body(q());
         } else {
-            my $hal = $self->hal_from_item($c, $item, $form);
+            #my $hal = $self->hal_from_item($c, $item, $form);
             my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
                 $hal->http_headers,
             ), $hal->as_json);
@@ -146,6 +156,9 @@ sub PUT :Allow {
         $item = $self->update_item($c, $item, $old_resource, $resource, $form);
         last unless $item;
 
+        my $hal = $self->hal_from_item($c, $item, $form);
+        last unless $self->add_update_journal_item_hal($c,$hal);
+        
         $guard->commit; 
 
         if ('minimal' eq $preference) {
@@ -153,7 +166,7 @@ sub PUT :Allow {
             $c->response->header(Preference_Applied => 'return=minimal');
             $c->response->body(q());
         } else {
-            my $hal = $self->hal_from_item($c, $item, $form);
+            #my $hal = $self->hal_from_item($c, $item, $form);
             my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
                 $hal->http_headers,
             ), $hal->as_json);
@@ -172,6 +185,13 @@ sub DELETE :Allow {
     {
         my $item = $self->item_by_id($c, $id);
         last unless $self->resource_exists($c, trustedsource => $item);
+        
+        last unless $self->add_delete_journal_item_hal($c,sub {
+            my $self = shift;
+            my ($c) = @_;
+            my $_form = $self->get_form($c);
+            return $self->hal_from_item($c, $item, $_form); });
+        
         $item->delete;
 
         $guard->commit;
@@ -182,6 +202,41 @@ sub DELETE :Allow {
     return;
 }
 
+sub item_base_journal :Journal {
+    my $self = shift @_;
+    return $self->handle_item_base_journal(@_);
+}
+    
+sub journals_get :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_get(@_);
+}
+
+sub journalsitem_get :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_get(@_);
+}
+
+sub journals_options :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_options(@_);
+}
+
+sub journalsitem_options :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_options(@_);
+}
+
+sub journals_head :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_head(@_);
+}
+
+sub journalsitem_head :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_head(@_);
+}
+
 sub end : Private {
     my ($self, $c) = @_;
 
diff --git a/lib/NGCP/Panel/Controller/API/VoicemailSettingsItem.pm b/lib/NGCP/Panel/Controller/API/VoicemailSettingsItem.pm
index f4fd94e5ae..2d95150279 100644
--- a/lib/NGCP/Panel/Controller/API/VoicemailSettingsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/VoicemailSettingsItem.pm
@@ -19,16 +19,23 @@ class_has('resource_name', is => 'ro', default => 'voicemailsettings');
 class_has('dispatch_path', is => 'ro', default => '/api/voicemailsettings/');
 class_has('relation', is => 'ro', default => 'http://purl.org/sipwise/ngcp-api/#rel-voicemailsettings');
 
+class_has(@{ __PACKAGE__->get_journal_query_params() });
+
 __PACKAGE__->config(
     action => {
-        map { $_ => {
+        (map { $_ => {
             ACLDetachTo => '/api/root/invalid_user',
             AllowedRole => [qw/admin reseller/],
             Args => 1,
             Does => [qw(ACL RequireSSL)],
             Method => $_,
             Path => __PACKAGE__->dispatch_path,
-        } } @{ __PACKAGE__->allowed_methods }
+        } } @{ __PACKAGE__->allowed_methods }),
+        @{ __PACKAGE__->get_journal_action_config(__PACKAGE__->resource_name,{
+            ACLDetachTo => '/api/root/invalid_user',
+            AllowedRole => [qw/admin reseller/],
+            Does => [qw(ACL RequireSSL)],
+        }) }
     },
     action_roles => [qw(HTTPMethods)],
 );
@@ -106,6 +113,9 @@ sub PATCH :Allow {
         $item = $self->update_item($c, $item, $old_resource, $resource, $form);
         last unless $item;
         
+        my $hal = $self->hal_from_item($c, $item, $form);
+        last unless $self->add_update_journal_item_hal($c,$hal);
+        
         $guard->commit;
 
         if ('minimal' eq $preference) {
@@ -113,7 +123,7 @@ sub PATCH :Allow {
             $c->response->header(Preference_Applied => 'return=minimal');
             $c->response->body(q());
         } else {
-            my $hal = $self->hal_from_item($c, $item, $form);
+            #my $hal = $self->hal_from_item($c, $item, $form);
             my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
                 $hal->http_headers,
             ), $hal->as_json);
@@ -145,6 +155,9 @@ sub PUT :Allow {
         $item = $self->update_item($c, $item, $old_resource, $resource, $form);
         last unless $item;
 
+        my $hal = $self->hal_from_item($c, $item, $form);
+        last unless $self->add_update_journal_item_hal($c,$hal);
+        
         $guard->commit; 
 
         if ('minimal' eq $preference) {
@@ -152,7 +165,7 @@ sub PUT :Allow {
             $c->response->header(Preference_Applied => 'return=minimal');
             $c->response->body(q());
         } else {
-            my $hal = $self->hal_from_item($c, $item, $form);
+            #my $hal = $self->hal_from_item($c, $item, $form);
             my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
                 $hal->http_headers,
             ), $hal->as_json);
@@ -164,6 +177,41 @@ sub PUT :Allow {
     return;
 }
 
+sub item_base_journal :Journal {
+    my $self = shift @_;
+    return $self->handle_item_base_journal(@_);
+}
+    
+sub journals_get :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_get(@_);
+}
+
+sub journalsitem_get :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_get(@_);
+}
+
+sub journals_options :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_options(@_);
+}
+
+sub journalsitem_options :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_options(@_);
+}
+
+sub journals_head :Journal {
+    my $self = shift @_;
+    return $self->handle_journals_head(@_);
+}
+
+sub journalsitem_head :Journal {
+    my $self = shift @_;
+    return $self->handle_journalsitem_head(@_);
+}
+
 sub end : Private {
     my ($self, $c) = @_;
 
diff --git a/lib/NGCP/Panel/Controller/Peering.pm b/lib/NGCP/Panel/Controller/Peering.pm
index 4780ac41af..a4dca92566 100644
--- a/lib/NGCP/Panel/Controller/Peering.pm
+++ b/lib/NGCP/Panel/Controller/Peering.pm
@@ -7,7 +7,7 @@ BEGIN { extends 'Catalyst::Controller'; }
 use NGCP::Panel::Form::PeeringGroup;
 use NGCP::Panel::Form::PeeringRule;
 use NGCP::Panel::Form::PeeringServer;
-#use NGCP::Panel::Utils::DialogicImg;
+use NGCP::Panel::Utils::DialogicImg;
 use NGCP::Panel::Utils::Message;
 use NGCP::Panel::Utils::Navigation;
 use NGCP::Panel::Utils::Preferences;
diff --git a/lib/NGCP/Panel/Role/API/CCMapEntries.pm b/lib/NGCP/Panel/Role/API/CCMapEntries.pm
index c1f9c6c0e5..170d557dcf 100644
--- a/lib/NGCP/Panel/Role/API/CCMapEntries.pm
+++ b/lib/NGCP/Panel/Role/API/CCMapEntries.pm
@@ -45,6 +45,7 @@ sub hal_from_item {
             Data::HAL::Link->new(relation => 'self', href => sprintf("%s%s", $self->dispatch_path, $item->id)),
             Data::HAL::Link->new(relation => "ngcp:$type", href => sprintf("/api/%s/%s", $type, $item->id)),
             Data::HAL::Link->new(relation => 'ngcp:subscribers', href => sprintf("/api/subscribers/%d", $item->id)),
+            $self->get_journal_relation_link($item->id),
         ],
         relation => 'ngcp:'.$self->resource_name,
     );
diff --git a/lib/NGCP/Panel/Role/API/CFMappings.pm b/lib/NGCP/Panel/Role/API/CFMappings.pm
index 6fb891d526..ac90f626ff 100644
--- a/lib/NGCP/Panel/Role/API/CFMappings.pm
+++ b/lib/NGCP/Panel/Role/API/CFMappings.pm
@@ -55,6 +55,7 @@ sub hal_from_item {
             Data::HAL::Link->new(relation => 'self', href => sprintf("%s%d", $self->dispatch_path, $item->id)),
             Data::HAL::Link->new(relation => "ngcp:$type", href => sprintf("/api/%s/%d", $type, $item->id)),
             Data::HAL::Link->new(relation => "ngcp:subscribers", href => sprintf("/api/subscribers/%d", $b_subs_id)),
+            $self->get_journal_relation_link($item->id),
         ],
         relation => 'ngcp:'.$self->resource_name,
     );
diff --git a/lib/NGCP/Panel/Role/API/CallForwards.pm b/lib/NGCP/Panel/Role/API/CallForwards.pm
index 756d806efc..0f4e3060f4 100644
--- a/lib/NGCP/Panel/Role/API/CallForwards.pm
+++ b/lib/NGCP/Panel/Role/API/CallForwards.pm
@@ -24,7 +24,7 @@ sub get_form {
 sub hal_from_item {
     my ($self, $c, $item, $type) = @_;
     my $form;
-    my $rwr_form = $self->get_form($c, "rules");
+    #my $rwr_form = $self->get_form($c, "rules"); #rules?
     
     my $prov_subs = $item->provisioning_voip_subscriber;
 
diff --git a/lib/NGCP/Panel/Role/API/FaxserverSettings.pm b/lib/NGCP/Panel/Role/API/FaxserverSettings.pm
index 1d32386ad7..62afb22465 100644
--- a/lib/NGCP/Panel/Role/API/FaxserverSettings.pm
+++ b/lib/NGCP/Panel/Role/API/FaxserverSettings.pm
@@ -65,6 +65,7 @@ sub hal_from_item {
             Data::HAL::Link->new(relation => 'self', href => sprintf("%s%s", $self->dispatch_path, $item->id)),
             Data::HAL::Link->new(relation => "ngcp:$type", href => sprintf("/api/%s/%s", $type, $item->id)),
             Data::HAL::Link->new(relation => 'ngcp:subscribers', href => sprintf("/api/subscribers/%d", $item->id)),
+            $self->get_journal_relation_link($item->id),
         ],
         relation => 'ngcp:'.$self->resource_name,
     );
diff --git a/lib/NGCP/Panel/Role/API/Reminders.pm b/lib/NGCP/Panel/Role/API/Reminders.pm
index 87812e5d3d..ba803142fc 100644
--- a/lib/NGCP/Panel/Role/API/Reminders.pm
+++ b/lib/NGCP/Panel/Role/API/Reminders.pm
@@ -51,6 +51,7 @@ sub hal_from_item {
             Data::HAL::Link->new(relation => 'profile', href => 'http://purl.org/sipwise/ngcp-api/'),
             Data::HAL::Link->new(relation => 'self', href => sprintf("%s%d", $self->dispatch_path, $item->id)),
             Data::HAL::Link->new(relation => 'ngcp:subscribers', href => sprintf("/api/subscribers/%d", $item->subscriber->voip_subscriber->id)),
+            $self->get_journal_relation_link($item->id),
         ],
         relation => 'ngcp:'.$self->resource_name,
     );
diff --git a/lib/NGCP/Panel/Role/API/SpeedDials.pm b/lib/NGCP/Panel/Role/API/SpeedDials.pm
index 3f21ab6b49..1666401609 100644
--- a/lib/NGCP/Panel/Role/API/SpeedDials.pm
+++ b/lib/NGCP/Panel/Role/API/SpeedDials.pm
@@ -43,6 +43,7 @@ sub hal_from_item {
             Data::HAL::Link->new(relation => 'self', href => sprintf("%s%d", $self->dispatch_path, $item->id)),
             Data::HAL::Link->new(relation => 'ngcp:speeddials', href => sprintf("/api/speeddials/%d", $item->id)),
             Data::HAL::Link->new(relation => 'ngcp:subscribers', href => sprintf("/api/subscribers/%d", $item->id)),
+            $self->get_journal_relation_link($item->id),
         ],
         relation => 'ngcp:'.$self->resource_name,
     );
diff --git a/lib/NGCP/Panel/Role/API/TrustedSources.pm b/lib/NGCP/Panel/Role/API/TrustedSources.pm
index bdb083144e..c49f5419dd 100644
--- a/lib/NGCP/Panel/Role/API/TrustedSources.pm
+++ b/lib/NGCP/Panel/Role/API/TrustedSources.pm
@@ -51,6 +51,7 @@ sub hal_from_item {
             Data::HAL::Link->new(relation => 'profile', href => 'http://purl.org/sipwise/ngcp-api/'),
             Data::HAL::Link->new(relation => 'self', href => sprintf("%s%d", $self->dispatch_path, $item->id)),
             Data::HAL::Link->new(relation => 'ngcp:subscribers', href => sprintf("/api/subscribers/%d", $item->subscriber->voip_subscriber->id)),
+            $self->get_journal_relation_link($item->id),
         ],
         relation => 'ngcp:'.$self->resource_name,
     );
diff --git a/lib/NGCP/Panel/Role/API/VoicemailSettings.pm b/lib/NGCP/Panel/Role/API/VoicemailSettings.pm
index 84cbedba46..f14765d006 100644
--- a/lib/NGCP/Panel/Role/API/VoicemailSettings.pm
+++ b/lib/NGCP/Panel/Role/API/VoicemailSettings.pm
@@ -49,6 +49,7 @@ sub hal_from_item {
             Data::HAL::Link->new(relation => 'profile', href => 'http://purl.org/sipwise/ngcp-api/'),
             Data::HAL::Link->new(relation => 'self', href => sprintf("%s%d", $self->dispatch_path, $item->provisioning_voip_subscriber->voip_subscriber->id)),
             Data::HAL::Link->new(relation => 'ngcp:subscribers', href => sprintf("/api/subscribers/%d", $item->provisioning_voip_subscriber->voip_subscriber->id)),
+            $self->get_journal_relation_link($item->provisioning_voip_subscriber->voip_subscriber->id),
         ],
         relation => 'ngcp:'.$self->resource_name,
     );
diff --git a/lib/NGCP/Panel/Utils/Journal.pm b/lib/NGCP/Panel/Utils/Journal.pm
index 04b6fc0c54..925388b7c4 100644
--- a/lib/NGCP/Panel/Utils/Journal.pm
+++ b/lib/NGCP/Panel/Utils/Journal.pm
@@ -49,6 +49,8 @@ sub add_journal_item_hal {
         my $arg = $args[0];
         my @hal_from_item = ();
         my $params;
+        my $id;
+        my $id_name = 'id';
         if (ref $arg eq 'HASH') {
             $params = $arg;
             my $h = (defined $params->{hal} ? $params->{hal} : $params->{hal_from_item});
@@ -60,6 +62,8 @@ sub add_journal_item_hal {
                     @hal_from_item = ( $h );
                 }
             }
+            $id_name = $params->{id_name} if defined $params->{id_name}; 
+            $id = $params->{id} if defined $params->{id};             
         } elsif (ref $arg eq 'ARRAY') {
             $params = {};
             @hal_from_item = @$arg;
@@ -86,11 +90,12 @@ sub add_journal_item_hal {
         if (ref $hal eq Data::HAL::) {
             $resource = $hal->resource;
         }
-        my $id;
-        if (ref $resource eq 'HASH') {
-            $id = $resource->{id};
-        } elsif ((defined blessed($resource)) && $resource->can('id')) {
-            $id = $resource->id;
+        if (!defined $id) {
+            if (ref $resource eq 'HASH') {
+                $id = $resource->{$id_name};
+            } elsif ((defined blessed($resource)) && $resource->can($id_name)) {
+                $id = $resource->$id_name;
+            }
         }
         return _create_journal($controller,$c,$id,$resource,$params);
     }
diff --git a/ngcp_panel.conf b/ngcp_panel.conf
index 15ca88dfe8..416fd2a8c9 100644
--- a/ngcp_panel.conf
+++ b/ngcp_panel.conf
@@ -259,6 +259,62 @@ log4perl.appender.Default.layout.ConversionPattern=%d{ISO8601} [%p] [%F +%L] %m{
     operations delete
     format sereal
     enabled 1
-  </cftimesets>  
+  </cftimesets>
+  <cfmappings>
+    operations create
+    operations update
+    operations delete
+    format sereal
+    enabled 1
+  </cfmappings>
+  <callforwards>
+    operations create
+    operations update
+    operations delete
+    format sereal
+    enabled 1
+  </callforwards>   
+  <ccmapentries>
+    operations create
+    operations update
+    operations delete
+    format sereal
+    enabled 1
+  </ccmapentries>
+  <faxserversettings>
+    operations create
+    operations update
+    operations delete
+    format sereal
+    enabled 1
+  </faxserversettings>
+  <reminders>
+    operations create
+    operations update
+    operations delete
+    format sereal
+    enabled 1
+  </reminders>
+  <speeddials>
+    operations create
+    operations update
+    operations delete
+    format sereal
+    enabled 1
+  </speeddials>
+  <trustedsources>
+    operations create
+    operations update
+    operations delete
+    format sereal
+    enabled 1
+  </trustedsources>
+  <voicemailsettings>
+    operations create
+    operations update
+    operations delete
+    format sereal
+    enabled 1
+  </voicemailsettings>
 
 </api_journal>
\ No newline at end of file
diff --git a/share/templates/api/root/collection.tt b/share/templates/api/root/collection.tt
index 420b4f8031..80d39db05d 100644
--- a/share/templates/api/root/collection.tt
+++ b/share/templates/api/root/collection.tt
@@ -439,7 +439,7 @@ Query parameters:
     <li><b>order_by</b>: Order collection by a specific attribute. Possible values are: <i>[% col.journal_resource_config.sorting_cols.join(', ') %]</i></li>
     <li><b>order_by_direction</b>: Direction which the collection should be ordered by. Possible values are: <i>asc (default), desc</i></li>
 </ul>
-The item's state after a completed operation is serialized and stored in [% col.journal_resource_config.format -%] format. It can be retrieved by requesting the corresponding journal record with <span>OPTIONS/GET/HEAD [% col.journal_resource_config.item_uri %]</span>.
+The item's state after a completed create or update operation/before a delete operation is serialized and stored in [% col.journal_resource_config.format -%] format. It can be retrieved by requesting the corresponding journal record with <span>OPTIONS/GET/HEAD [% col.journal_resource_config.item_uri %]</span>.
 [% IF col.journal_resource_config.recent_uri -%]
 The most recent journal record is directly accessible using <span>OPTIONS/GET/HEAD [% col.journal_resource_config.recent_uri %]</span>.
 [% END -%]
diff --git a/t/api-journals.t b/t/api-journals.t
index 0cc4d75b39..a303e102ed 100644
--- a/t/api-journals.t
+++ b/t/api-journals.t
@@ -5,6 +5,7 @@ use JSON qw();
 use Test::More;
 use Storable qw();
 
+use JSON::PP;
 use LWP::Debug;
 
 BEGIN {
@@ -12,7 +13,7 @@ BEGIN {
 }
 use NGCP::Panel::Utils::Journal qw();
 
-my $is_local_env = 1;
+my $is_local_env = 0;
 my $mysql_sqlstrict = not $is_local_env;
 my $enable_journal_tests = 1;
 
@@ -69,15 +70,32 @@ my $contract = test_contract($billingprofile,$systemcontact);
 my $domain = test_domain($t,$reseller);
 my $customercontact = test_customercontact($t,$reseller);
 my $customer = test_customer($customercontact,$billingprofile);
-#my $customerpreferences = test_customerpreferences($customer);
+my $customerpreferences = test_customerpreferences($customer);
 
-#my $subscriberprofileset = test_subscriberprofileset($t,$reseller);
-#my $subscriberprofile = test_subscriberprofile($t,$subscriberprofileset);
-#my $profilepreferences = test_profilepreferences($subscriberprofile);
+my $subscriberprofileset = test_subscriberprofileset($t,$reseller);
+my $subscriberprofile = test_subscriberprofile($t,$subscriberprofileset);
+my $profilepreferences = test_profilepreferences($subscriberprofile);
 
 my $subscriber = test_subscriber($t,$customer,$domain);
+
+my $voicemailsettings = test_voicemailsettings($t,$subscriber);
+
+my $trustedsource = test_trustedsource($subscriber);
+
+my $speeddials = test_speeddials($t,$subscriber);
+
+my $reminder = test_reminder($subscriber);
+
+my $faxserversettings = test_faxserversettings($t,$subscriber);
+
+
+my $ccmapentries = test_ccmapentries($subscriber);
+
 my $cfdestinationset = test_cfdestinationset($t,$subscriber);
 my $cftimeset = test_cftimeset($t,$subscriber);
+test_callforwards($subscriber,$cfdestinationset,$cftimeset);
+my $cfmappings = test_cfmapping($subscriber,$cfdestinationset,$cftimeset);
+
 
 my $systemsoundset = test_soundset($t,$reseller);
 my $customersoundset = test_soundset($t,$reseller,$customer);
@@ -88,6 +106,516 @@ my $subscriberpreferences = test_subscriberpreferences($subscriber,$customersoun
 
 done_testing;
 
+sub test_voicemailsettings {
+    my ($t,$subscriber) = @_;
+
+    my $voicemailsettings_uri = $uri.'/api/voicemailsettings/'.$subscriber->{id};
+    $req = HTTP::Request->new('PUT', $voicemailsettings_uri); #$customer->{id});
+    $req->header('Content-Type' => 'application/json');
+    $req->header('Prefer' => 'return=representation');    
+    $req->content(JSON::to_json({
+        attach => JSON::PP::true,
+        delete => JSON::PP::true,
+        email =>  'voicemail_email_'.$t.'@example.com',
+        pin => '1234',
+        }));
+    $res = $ua->request($req);
+    is($res->code, 200, "PUT test voicemailsettings");
+    $req = HTTP::Request->new('GET', $voicemailsettings_uri); # . '?page=1&rows=' . (scalar keys %$put_data));
+    $res = $ua->request($req);
+    is($res->code, 200, "fetch PUT test voicemailsettings");
+    my $voicemailsettings = JSON::from_json($res->decoded_content);
+    
+    _test_item_journal_link('voicemailsettings',$voicemailsettings,$subscriber->{id});
+    _test_journal_options_head('voicemailsettings',$subscriber->{id});
+    my $journals = {};
+    my $journal = _test_journal_top_journalitem('voicemailsettings',$subscriber->{id},$voicemailsettings,'update',$journals);
+    _test_journal_options_head('voicemailsettings',$subscriber->{id},$journal->{id});
+    
+    $req = HTTP::Request->new('PATCH', $voicemailsettings_uri);
+    $req->header('Content-Type' => 'application/json-patch+json');
+    $req->header('Prefer' => 'return=representation');
+    $req->content(JSON::to_json(
+        [ { op => 'replace', path => '/pin', value => '4567' } ]
+    ));
+    $res = $ua->request($req);
+    is($res->code, 200, "PATCH test voicemailsettings");
+    $req = HTTP::Request->new('GET', $voicemailsettings_uri);
+    $res = $ua->request($req);
+    is($res->code, 200, "fetch PATCHED test voicemailsettings");
+    $voicemailsettings = JSON::from_json($res->decoded_content);
+    
+    _test_item_journal_link('voicemailsettings',$voicemailsettings,$subscriber->{id});    
+    $journal = _test_journal_top_journalitem('voicemailsettings',$subscriber->{id},$voicemailsettings,'update',$journals,$journal);
+    
+    _test_journal_collection('voicemailsettings',$subscriber->{id},$journals);
+    
+    return $voicemailsettings;
+    
+}
+
+sub test_trustedsource {
+    my ($subscriber) = @_;
+    $req = HTTP::Request->new('POST', $uri.'/api/trustedsources/');
+    $req->header('Content-Type' => 'application/json');
+    $req->content(JSON::to_json({
+        #from_pattern => 
+        protocol => 'TCP', #UDP, TCP, TLS, ANY
+        src_ip => '192.168.0.1',
+        subscriber_id => $subscriber->{id},
+    }));
+    $res = $ua->request($req);
+    is($res->code, 201, "POST test trustedsource");
+    my $trustedsource_uri = $uri.'/'.$res->header('Location');
+    $req = HTTP::Request->new('GET', $trustedsource_uri);
+    $res = $ua->request($req);
+    is($res->code, 200, "fetch POSTed test trustedsource");
+    my $trustedsource = JSON::from_json($res->decoded_content);
+    
+    _test_item_journal_link('trustedsources',$trustedsource,$trustedsource->{id});
+    _test_journal_options_head('trustedsources',$trustedsource->{id});
+    my $journals = {};
+    my $journal = _test_journal_top_journalitem('trustedsources',$trustedsource->{id},$trustedsource,'create',$journals);
+    _test_journal_options_head('trustedsources',$trustedsource->{id},$journal->{id});
+    
+    $req = HTTP::Request->new('PUT', $trustedsource_uri);
+    $req->header('Content-Type' => 'application/json');
+    $req->header('Prefer' => 'return=representation');
+    $req->content(JSON::to_json({
+        #from_pattern => 
+        protocol => 'TCP', #UDP, TCP, TLS, ANY
+        src_ip => '192.168.0.2',
+        subscriber_id => $subscriber->{id},
+    }));
+    $res = $ua->request($req);
+    is($res->code, 200, "PUT test trustedsource");
+    $req = HTTP::Request->new('GET', $trustedsource_uri);
+    $res = $ua->request($req);
+    is($res->code, 200, "fetch PUT test trustedsource");
+    $trustedsource = JSON::from_json($res->decoded_content);
+    
+    _test_item_journal_link('trustedsources',$trustedsource,$trustedsource->{id});    
+    $journal = _test_journal_top_journalitem('trustedsources',$trustedsource->{id},$trustedsource,'update',$journals,$journal);
+    
+    $req = HTTP::Request->new('PATCH', $trustedsource_uri);
+    $req->header('Content-Type' => 'application/json-patch+json');
+    $req->header('Prefer' => 'return=representation');
+    $req->content(JSON::to_json(
+        [ { op => 'replace', path => '/src_ip', value => '192.168.0.3' } ]
+    ));
+    $res = $ua->request($req);
+    is($res->code, 200, "PATCH test trustedsource");
+    $req = HTTP::Request->new('GET', $trustedsource_uri);
+    $res = $ua->request($req);
+    is($res->code, 200, "fetch PATCHed test trustedsource");
+    $trustedsource = JSON::from_json($res->decoded_content);
+
+    _test_item_journal_link('trustedsources',$trustedsource,$trustedsource->{id});    
+    $journal = _test_journal_top_journalitem('trustedsources',$trustedsource->{id},$trustedsource,'update',$journals,$journal);
+    
+    $req = HTTP::Request->new('DELETE', $trustedsource_uri);
+    $res = $ua->request($req);
+    is($res->code, 204, "delete POSTed test trustedsource");
+    #$domain = JSON::from_json($res->decoded_content);
+    
+    $journal = _test_journal_top_journalitem('trustedsources',$trustedsource->{id},$trustedsource,'delete',$journals,$journal);
+    
+    _test_journal_collection('trustedsources',$trustedsource->{id},$journals);
+    
+    $req = HTTP::Request->new('POST', $uri.'/api/trustedsources/');
+    $req->header('Content-Type' => 'application/json');
+    $req->content(JSON::to_json({
+        #from_pattern => 
+        protocol => 'TCP', #UDP, TCP, TLS, ANY
+        src_ip => '192.168.0.1',
+        subscriber_id => $subscriber->{id},
+    }));
+    $res = $ua->request($req);
+    is($res->code, 201, "POST another test trustedsource");
+    $trustedsource_uri = $uri.'/'.$res->header('Location');
+    $req = HTTP::Request->new('GET', $trustedsource_uri);
+    $res = $ua->request($req);
+    is($res->code, 200, "fetch POSTed test trustedsource");
+    $trustedsource = JSON::from_json($res->decoded_content);
+    
+    return $trustedsource;
+    
+}
+
+
+
+sub test_speeddials {
+    my ($t,$subscriber) = @_;
+
+    my $speeddials_uri = $uri.'/api/speeddials/'.$subscriber->{id};
+    $req = HTTP::Request->new('PUT', $speeddials_uri); #$customer->{id});
+    $req->header('Content-Type' => 'application/json');
+    $req->header('Prefer' => 'return=representation');    
+    $req->content(JSON::to_json({
+        speeddials => [ {slot => '*1',
+                         destination => 'speed_dial_dest_'.$t.'@example.com' },
+                       {slot => '*2',
+                         destination => 'speed_dial_dest_'.$t.'@example.com' },
+                       {slot => '*3',
+                         destination => 'speed_dial_dest_'.$t.'@example.com' },],
+        }));
+    $res = $ua->request($req);
+    is($res->code, 200, "PUT test speeddials");
+    $req = HTTP::Request->new('GET', $speeddials_uri); # . '?page=1&rows=' . (scalar keys %$put_data));
+    $res = $ua->request($req);
+    is($res->code, 200, "fetch PUT test speeddials");
+    my $speeddials = JSON::from_json($res->decoded_content);
+    
+    _test_item_journal_link('speeddials',$speeddials,$subscriber->{id});
+    _test_journal_options_head('speeddials',$subscriber->{id});
+    my $journals = {};
+    my $journal = _test_journal_top_journalitem('speeddials',$subscriber->{id},$speeddials,'update',$journals);
+    _test_journal_options_head('speeddials',$subscriber->{id},$journal->{id});
+    
+    $req = HTTP::Request->new('PATCH', $speeddials_uri);
+    $req->header('Content-Type' => 'application/json-patch+json');
+    $req->header('Prefer' => 'return=representation');
+    $req->content(JSON::to_json(
+        [ { op => 'replace', path => '/speeddials', value => [ {slot => '*4',
+                         destination => 'speed_dia_dest_'.$t.'@example.com' },
+                       {slot => '*5',
+                         destination => 'speed_dia_dest_'.$t.'@example.com' },
+                       {slot => '*6',
+                         destination => 'speed_dia_dest_'.$t.'@example.com' },] } ]
+    ));
+    $res = $ua->request($req);
+    is($res->code, 200, "PATCH test speeddials");
+    $req = HTTP::Request->new('GET', $speeddials_uri);
+    $res = $ua->request($req);
+    is($res->code, 200, "fetch PATCHED test speeddials");
+    $speeddials = JSON::from_json($res->decoded_content);
+    
+    _test_item_journal_link('speeddials',$speeddials,$subscriber->{id});    
+    $journal = _test_journal_top_journalitem('speeddials',$subscriber->{id},$speeddials,'update',$journals,$journal);
+    
+    _test_journal_collection('speeddials',$subscriber->{id},$journals);
+    
+    return $speeddials;
+    
+}
+
+
+sub test_reminder {
+    my ($subscriber) = @_;
+    $req = HTTP::Request->new('POST', $uri.'/api/reminders/');
+    $req->header('Content-Type' => 'application/json');
+    $req->content(JSON::to_json({
+        recur => 'never', #, 'weekdays', 'always',
+        subscriber_id => $subscriber->{id},
+        'time' => '10:00:00',
+    }));
+    $res = $ua->request($req);
+    is($res->code, 201, "POST test reminder");
+    my $reminder_uri = $uri.'/'.$res->header('Location');
+    $req = HTTP::Request->new('GET', $reminder_uri);
+    $res = $ua->request($req);
+    is($res->code, 200, "fetch POSTed test reminder");
+    my $reminder = JSON::from_json($res->decoded_content);
+    
+    _test_item_journal_link('reminders',$reminder,$reminder->{id});
+    _test_journal_options_head('reminders',$reminder->{id});
+    my $journals = {};
+    my $journal = _test_journal_top_journalitem('reminders',$reminder->{id},$reminder,'create',$journals);
+    _test_journal_options_head('reminders',$reminder->{id},$journal->{id});
+    
+    $req = HTTP::Request->new('PUT', $reminder_uri);
+    $req->header('Content-Type' => 'application/json');
+    $req->header('Prefer' => 'return=representation');
+    $req->content(JSON::to_json({
+        recur => 'never', #, 'weekdays', 'always',
+        subscriber_id => $subscriber->{id},
+        'time' => '11:00:00',
+    }));
+    $res = $ua->request($req);
+    is($res->code, 200, "PUT test reminder");
+    $req = HTTP::Request->new('GET', $reminder_uri);
+    $res = $ua->request($req);
+    is($res->code, 200, "fetch PUT test reminder");
+    $reminder = JSON::from_json($res->decoded_content);
+    
+    _test_item_journal_link('reminders',$reminder,$reminder->{id});    
+    $journal = _test_journal_top_journalitem('reminders',$reminder->{id},$reminder,'update',$journals,$journal);
+    
+    $req = HTTP::Request->new('PATCH', $reminder_uri);
+    $req->header('Content-Type' => 'application/json-patch+json');
+    $req->header('Prefer' => 'return=representation');
+    $req->content(JSON::to_json(
+        [ { op => 'replace', path => '/recur', value => 'weekdays' } ]
+    ));
+    $res = $ua->request($req);
+    is($res->code, 200, "PATCH test reminder");
+    $req = HTTP::Request->new('GET', $reminder_uri);
+    $res = $ua->request($req);
+    is($res->code, 200, "fetch PATCHed test reminder");
+    $reminder = JSON::from_json($res->decoded_content);
+
+    _test_item_journal_link('reminders',$reminder,$reminder->{id});    
+    $journal = _test_journal_top_journalitem('reminders',$reminder->{id},$reminder,'update',$journals,$journal);
+    
+    $req = HTTP::Request->new('DELETE', $reminder_uri);
+    $res = $ua->request($req);
+    is($res->code, 204, "delete POSTed test reminder");
+    #$domain = JSON::from_json($res->decoded_content);
+    
+    $journal = _test_journal_top_journalitem('reminders',$reminder->{id},$reminder,'delete',$journals,$journal);
+    
+    _test_journal_collection('reminders',$reminder->{id},$journals);
+    
+    $req = HTTP::Request->new('POST', $uri.'/api/reminders/');
+    $req->header('Content-Type' => 'application/json');
+    $req->content(JSON::to_json({
+        recur => 'never', #, 'weekdays', 'always',
+        subscriber_id => $subscriber->{id},
+        'time' => '10:00:00',
+    }));
+    $res = $ua->request($req);
+    is($res->code, 201, "POST another test reminder");
+    $reminder_uri = $uri.'/'.$res->header('Location');
+    $req = HTTP::Request->new('GET', $reminder_uri);
+    $res = $ua->request($req);
+    is($res->code, 200, "fetch POSTed test reminder");
+    $reminder = JSON::from_json($res->decoded_content);
+    
+    return $reminder;
+    
+}
+
+
+sub test_faxserversettings {
+    my ($t,$subscriber) = @_;
+
+    my $faxserversettings_uri = $uri.'/api/faxserversettings/'.$subscriber->{id};
+    $req = HTTP::Request->new('PUT', $faxserversettings_uri); #$customer->{id});
+    $req->header('Content-Type' => 'application/json');
+    $req->header('Prefer' => 'return=representation');    
+    $req->content(JSON::to_json({
+        active => JSON::PP::true,
+        destinations => [ {destination => 'test_fax_destination_'.$t.'@example.com', #??
+                           filetype => 'TIFF',
+                           cc => JSON::PP::true,
+                           incoming => JSON::PP::true,
+                           outgoing => JSON::PP::false,
+                           status => JSON::PP::true,} ],
+        name => 'fax_server_settings_'.$t,
+        password => 'fax_server_settings_password_'.$t,
+        send_copy => JSON::PP::false,
+        send_status => JSON::PP::false,
+        }));
+    $res = $ua->request($req);
+    is($res->code, 200, "PUT test faxserversettings");
+    $req = HTTP::Request->new('GET', $faxserversettings_uri); # . '?page=1&rows=' . (scalar keys %$put_data));
+    $res = $ua->request($req);
+    is($res->code, 200, "fetch PUT test faxserversettings");
+    my $faxserversettings = JSON::from_json($res->decoded_content);
+    
+    _test_item_journal_link('faxserversettings',$faxserversettings,$subscriber->{id});
+    _test_journal_options_head('faxserversettings',$subscriber->{id});
+    my $journals = {};
+    my $journal = _test_journal_top_journalitem('faxserversettings',$subscriber->{id},$faxserversettings,'update',$journals);
+    _test_journal_options_head('faxserversettings',$subscriber->{id},$journal->{id});
+    
+    $req = HTTP::Request->new('PATCH', $faxserversettings_uri);
+    $req->header('Content-Type' => 'application/json-patch+json');
+    $req->header('Prefer' => 'return=representation');
+    $req->content(JSON::to_json(
+        [ { op => 'replace', path => '/active', value => JSON::PP::false } ]
+    ));
+    $res = $ua->request($req);
+    is($res->code, 200, "PATCH test faxserversettings");
+    $req = HTTP::Request->new('GET', $faxserversettings_uri);
+    $res = $ua->request($req);
+    is($res->code, 200, "fetch PATCHED test faxserversettings");
+    $faxserversettings = JSON::from_json($res->decoded_content);
+    
+    _test_item_journal_link('faxserversettings',$faxserversettings,$subscriber->{id});    
+    $journal = _test_journal_top_journalitem('faxserversettings',$subscriber->{id},$faxserversettings,'update',$journals,$journal);
+    
+    _test_journal_collection('faxserversettings',$subscriber->{id},$journals);
+    
+    return $faxserversettings;
+    
+}
+
+
+sub test_ccmapentries {
+    my ($subscriber) = @_;
+
+    my $ccmapentries_uri = $uri.'/api/ccmapentries/'.$subscriber->{id};
+    $req = HTTP::Request->new('PUT', $ccmapentries_uri); #$customer->{id});
+    $req->header('Content-Type' => 'application/json');
+    $req->header('Prefer' => 'return=representation');    
+    $req->content(JSON::to_json({
+        mappings => [ { auth_key => 'abc' },
+                      { auth_key => 'def' },
+                      { auth_key => 'ghi' } ]
+        }));
+    $res = $ua->request($req);
+    is($res->code, 200, "PUT test ccmapentries");
+    $req = HTTP::Request->new('GET', $ccmapentries_uri); # . '?page=1&rows=' . (scalar keys %$put_data));
+    $res = $ua->request($req);
+    is($res->code, 200, "fetch PUT test ccmapentries");
+    my $ccmapentries = JSON::from_json($res->decoded_content);
+    
+    _test_item_journal_link('ccmapentries',$ccmapentries,$subscriber->{id});
+    _test_journal_options_head('ccmapentries',$subscriber->{id});
+    my $journals = {};
+    my $journal = _test_journal_top_journalitem('ccmapentries',$subscriber->{id},$ccmapentries,'update',$journals);
+    _test_journal_options_head('ccmapentries',$subscriber->{id},$journal->{id});
+    
+    $req = HTTP::Request->new('PATCH', $ccmapentries_uri);
+    $req->header('Content-Type' => 'application/json-patch+json');
+    $req->header('Prefer' => 'return=representation');
+    $req->content(JSON::to_json(
+        [ { op => 'replace', path => '/mappings', value => [ { auth_key => 'jkl' },
+                      { auth_key => 'mno' },
+                      { auth_key => 'pqr' } ] } ] 
+    ));
+    $res = $ua->request($req);
+    is($res->code, 200, "PATCH test ccmapentries");
+    $req = HTTP::Request->new('GET', $ccmapentries_uri);
+    $res = $ua->request($req);
+    is($res->code, 200, "fetch PATCHED test ccmapentries");
+    $ccmapentries = JSON::from_json($res->decoded_content);
+    
+    _test_item_journal_link('ccmapentries',$ccmapentries,$subscriber->{id});    
+    $journal = _test_journal_top_journalitem('ccmapentries',$subscriber->{id},$ccmapentries,'update',$journals,$journal);
+
+    $req = HTTP::Request->new('DELETE', $ccmapentries_uri);
+    $res = $ua->request($req);
+    is($res->code, 204, "delete PATCHed test ccmapentries");
+    #$domain = JSON::from_json($res->decoded_content);
+    
+    $journal = _test_journal_top_journalitem('ccmapentries',$subscriber->{id},$ccmapentries,'delete',$journals,$journal);
+
+    _test_journal_collection('ccmapentries',$subscriber->{id},$journals);
+    
+    return undef;
+    
+}
+
+
+
+
+sub test_callforwards {
+    my ($subscriber,$cfdestinationset,$cftimeset) = @_;
+
+    my $callforward_uri = $uri.'/api/callforwards/'.$subscriber->{id};
+    $req = HTTP::Request->new('PUT', $callforward_uri); #$customer->{id});
+    $req->header('Content-Type' => 'application/json');
+    $req->header('Prefer' => 'return=representation');    
+    $req->content(JSON::to_json({
+        cfb => { destinations => $cfdestinationset->{destinations},
+                 times => $cftimeset->{times}},
+        cfna => { destinations => $cfdestinationset->{destinations},
+                 times => $cftimeset->{times}},
+        cft => { destinations => $cfdestinationset->{destinations},
+                 times => $cftimeset->{times}},
+        cfu => { destinations => $cfdestinationset->{destinations},
+                 times => $cftimeset->{times}},        
+        }));
+    $res = $ua->request($req);
+    is($res->code, 200, "PUT test callforwards");
+    $req = HTTP::Request->new('GET', $callforward_uri); # . '?page=1&rows=' . (scalar keys %$put_data));
+    $res = $ua->request($req);
+    is($res->code, 200, "fetch PUT test callforwards");
+    my $callforwards = JSON::from_json($res->decoded_content);
+    
+    _test_item_journal_link('callforwards',$callforwards,$subscriber->{id});
+    _test_journal_options_head('callforwards',$subscriber->{id});
+    my $journals = {};
+    my $journal = _test_journal_top_journalitem('callforwards',$subscriber->{id},$callforwards,'update',$journals);
+    _test_journal_options_head('callforwards',$subscriber->{id},$journal->{id});
+    
+    $req = HTTP::Request->new('PATCH', $callforward_uri);
+    $req->header('Content-Type' => 'application/json-patch+json');
+    $req->header('Prefer' => 'return=representation');
+    $req->content(JSON::to_json(
+        [ { op => 'replace', path => '/cfb', value => {destinations => $cfdestinationset->{destinations},
+                 times => $cftimeset->{times}} } ] 
+    ));
+    $res = $ua->request($req);
+    is($res->code, 200, "PATCH test callforwards");
+    $req = HTTP::Request->new('GET', $callforward_uri);
+    $res = $ua->request($req);
+    is($res->code, 200, "fetch PATCHED test callforwards");
+    $callforwards = JSON::from_json($res->decoded_content);
+    
+    _test_item_journal_link('callforwards',$callforwards,$subscriber->{id});    
+    $journal = _test_journal_top_journalitem('callforwards',$subscriber->{id},$callforwards,'update',$journals,$journal);
+
+    $req = HTTP::Request->new('DELETE', $callforward_uri);
+    $res = $ua->request($req);
+    is($res->code, 204, "delete PATCHed test callforwards");
+    #$domain = JSON::from_json($res->decoded_content);
+    
+    $journal = _test_journal_top_journalitem('callforwards',$subscriber->{id},$callforwards,'delete',$journals,$journal);
+
+    _test_journal_collection('callforwards',$subscriber->{id},$journals);
+    
+    return undef;
+    
+}
+
+
+sub test_cfmapping {
+    my ($subscriber,$cfdestinationset,$cftimeset) = @_;
+
+    my $cfmapping_uri = $uri.'/api/cfmappings/'.$subscriber->{id};
+    $req = HTTP::Request->new('PUT', $cfmapping_uri); #$customer->{id});
+    $req->header('Content-Type' => 'application/json');
+    $req->header('Prefer' => 'return=representation');    
+    $req->content(JSON::to_json({
+        cfb => [{ destinationset => $cfdestinationset->{name},
+                 timeset => $cftimeset->{name}}],
+        cfna => [{ destinationset => $cfdestinationset->{name},
+                 timeset => $cftimeset->{name}}],
+        cft => [{ destinationset => $cfdestinationset->{name},
+                 timeset => $cftimeset->{name}}],
+        cfu => [{ destinationset => $cfdestinationset->{name},
+                 timeset => $cftimeset->{name}}],        
+        }));
+    $res = $ua->request($req);
+    is($res->code, 200, "PUT test cfmappings");
+    $req = HTTP::Request->new('GET', $cfmapping_uri); # . '?page=1&rows=' . (scalar keys %$put_data));
+    $res = $ua->request($req);
+    is($res->code, 200, "fetch PUT test cfmappings");
+    my $cfmappings = JSON::from_json($res->decoded_content);
+    
+    _test_item_journal_link('cfmappings',$cfmappings,$subscriber->{id});
+    _test_journal_options_head('cfmappings',$subscriber->{id});
+    my $journals = {};
+    my $journal = _test_journal_top_journalitem('cfmappings',$subscriber->{id},$cfmappings,'update',$journals);
+    _test_journal_options_head('cfmappings',$subscriber->{id},$journal->{id});
+    
+    $req = HTTP::Request->new('PATCH', $cfmapping_uri);
+    $req->header('Content-Type' => 'application/json-patch+json');
+    $req->header('Prefer' => 'return=representation');
+    $req->content(JSON::to_json(
+        [ { op => 'replace', path => '/cfb', value => [{ destinationset => $cfdestinationset->{name},
+                 timeset => $cftimeset->{name}}] } ]
+    ));
+    $res = $ua->request($req);
+    is($res->code, 200, "PATCH test cfmappings");
+    $req = HTTP::Request->new('GET', $cfmapping_uri);
+    $res = $ua->request($req);
+    is($res->code, 200, "fetch PATCHED test cfmappings");
+    $cfmappings = JSON::from_json($res->decoded_content);
+    
+    _test_item_journal_link('cfmappings',$cfmappings,$subscriber->{id});    
+    $journal = _test_journal_top_journalitem('cfmappings',$subscriber->{id},$cfmappings,'update',$journals,$journal);
+    
+    _test_journal_collection('cfmappings',$subscriber->{id},$journals);
+    
+    return $cfmappings;
+    
+}
+
+
 sub test_cftimeset {
     my ($t,$subscriber) = @_;
     
@@ -114,7 +642,7 @@ sub test_cftimeset {
     is($res->code, 200, "fetch POSTed test cftimeset");
     my $cftimeset = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('cftimesets',$cftimeset);
+    _test_item_journal_link('cftimesets',$cftimeset,$cftimeset->{id});
     _test_journal_options_head('cftimesets',$cftimeset->{id});
     my $journals = {};
     my $journal = _test_journal_top_journalitem('cftimesets',$cftimeset->{id},$cftimeset,'create',$journals);
@@ -135,7 +663,7 @@ sub test_cftimeset {
     is($res->code, 200, "fetch PUT test cftimeset");
     $cftimeset = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('cftimesets',$cftimeset);    
+    _test_item_journal_link('cftimesets',$cftimeset,$cftimeset->{id});    
     $journal = _test_journal_top_journalitem('cftimesets',$cftimeset->{id},$cftimeset,'update',$journals,$journal);
     
     $req = HTTP::Request->new('PATCH', $cftimeset_uri);
@@ -151,7 +679,7 @@ sub test_cftimeset {
     is($res->code, 200, "fetch PATCHed test cftimeset");
     $cftimeset = JSON::from_json($res->decoded_content);
 
-    _test_item_journal_link('cftimesets',$cftimeset);    
+    _test_item_journal_link('cftimesets',$cftimeset,$cftimeset->{id});    
     $journal = _test_journal_top_journalitem('cftimesets',$cftimeset->{id},$cftimeset,'update',$journals,$journal);
     
     $req = HTTP::Request->new('DELETE', $cftimeset_uri);
@@ -214,7 +742,7 @@ sub test_cfdestinationset {
     is($res->code, 200, "fetch POSTed test cfdestinationset");
     my $cfdestinationset = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('cfdestinationsets',$cfdestinationset);
+    _test_item_journal_link('cfdestinationsets',$cfdestinationset,$cfdestinationset->{id});
     _test_journal_options_head('cfdestinationsets',$cfdestinationset->{id});
     my $journals = {};
     my $journal = _test_journal_top_journalitem('cfdestinationsets',$cfdestinationset->{id},$cfdestinationset,'create',$journals);
@@ -235,7 +763,7 @@ sub test_cfdestinationset {
     is($res->code, 200, "fetch PUT test cfdestinationset");
     $cfdestinationset = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('cfdestinationsets',$cfdestinationset);    
+    _test_item_journal_link('cfdestinationsets',$cfdestinationset,$cfdestinationset->{id});    
     $journal = _test_journal_top_journalitem('cfdestinationsets',$cfdestinationset->{id},$cfdestinationset,'update',$journals,$journal);
     
     $req = HTTP::Request->new('PATCH', $cfdestinationset_uri);
@@ -251,7 +779,7 @@ sub test_cfdestinationset {
     is($res->code, 200, "fetch PATCHed test cfdestinationset");
     $cfdestinationset = JSON::from_json($res->decoded_content);
 
-    _test_item_journal_link('cfdestinationsets',$cfdestinationset);    
+    _test_item_journal_link('cfdestinationsets',$cfdestinationset,$cfdestinationset->{id});    
     $journal = _test_journal_top_journalitem('cfdestinationsets',$cfdestinationset->{id},$cfdestinationset,'update',$journals,$journal);
     
     $req = HTTP::Request->new('DELETE', $cfdestinationset_uri);
@@ -311,7 +839,7 @@ sub test_profilepreferences {
     is($res->code, 200, "fetch PUT test profilepreferences");
     my $profilepreferences = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('profilepreferences',$profilepreferences);
+    _test_item_journal_link('profilepreferences',$profilepreferences,$profilepreferences->{id});
     _test_journal_options_head('profilepreferences',$profilepreferences->{id});
     my $journals = {};
     my $journal = _test_journal_top_journalitem('profilepreferences',$profilepreferences->{id},$profilepreferences,'update',$journals);
@@ -336,7 +864,7 @@ sub test_profilepreferences {
     is($res->code, 200, "fetch PATCHED test profilepreferences");
     $profilepreferences = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('profilepreferences',$profilepreferences);    
+    _test_item_journal_link('profilepreferences',$profilepreferences,$profilepreferences->{id});    
     $journal = _test_journal_top_journalitem('profilepreferences',$profilepreferences->{id},$profilepreferences,'update',$journals,$journal);
     
     _test_journal_collection('profilepreferences',$profilepreferences->{id},$journals);
@@ -380,7 +908,7 @@ sub test_subscriberprofile {
     is($res->code, 200, "fetch POSTed test subscriberprofile");
     my $subscriberprofile = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('subscriberprofiles',$subscriberprofile);
+    _test_item_journal_link('subscriberprofiles',$subscriberprofile,$subscriberprofile->{id});
     _test_journal_options_head('subscriberprofiles',$subscriberprofile->{id});
     my $journals = {};
     my $journal = _test_journal_top_journalitem('subscriberprofiles',$subscriberprofile->{id},$subscriberprofile,'create',$journals);
@@ -402,7 +930,7 @@ sub test_subscriberprofile {
     is($res->code, 200, "fetch PUT test subscriberprofile");
     $subscriberprofile = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('subscriberprofiles',$subscriberprofile);    
+    _test_item_journal_link('subscriberprofiles',$subscriberprofile,$subscriberprofile->{id});    
     $journal = _test_journal_top_journalitem('subscriberprofiles',$subscriberprofile->{id},$subscriberprofile,'update',$journals,$journal);
     
     $req = HTTP::Request->new('PATCH', $subscriberprofile_uri);
@@ -418,7 +946,7 @@ sub test_subscriberprofile {
     is($res->code, 200, "fetch PATCHed test subscriberprofile");
     $subscriberprofile = JSON::from_json($res->decoded_content);
 
-    _test_item_journal_link('subscriberprofiles',$subscriberprofile);    
+    _test_item_journal_link('subscriberprofiles',$subscriberprofile,$subscriberprofile->{id});    
     $journal = _test_journal_top_journalitem('subscriberprofiles',$subscriberprofile->{id},$subscriberprofile,'update',$journals,$journal);
     
     $req = HTTP::Request->new('DELETE', $subscriberprofile_uri);
@@ -469,7 +997,7 @@ sub test_subscriberprofileset {
     is($res->code, 200, "fetch POSTed test subscriberprofileset");
     my $subscriberprofileset = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('subscriberprofilesets',$subscriberprofileset);
+    _test_item_journal_link('subscriberprofilesets',$subscriberprofileset,$subscriberprofileset->{id});
     _test_journal_options_head('subscriberprofilesets',$subscriberprofileset->{id});
     my $journals = {};
     my $journal = _test_journal_top_journalitem('subscriberprofilesets',$subscriberprofileset->{id},$subscriberprofileset,'create',$journals);
@@ -490,7 +1018,7 @@ sub test_subscriberprofileset {
     is($res->code, 200, "fetch PUT test subscriberprofileset");
     $subscriberprofileset = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('subscriberprofilesets',$subscriberprofileset);    
+    _test_item_journal_link('subscriberprofilesets',$subscriberprofileset,$subscriberprofileset->{id});    
     $journal = _test_journal_top_journalitem('subscriberprofilesets',$subscriberprofileset->{id},$subscriberprofileset,'update',$journals,$journal);
     
     $req = HTTP::Request->new('PATCH', $subscriberprofileset_uri);
@@ -506,7 +1034,7 @@ sub test_subscriberprofileset {
     is($res->code, 200, "fetch PATCHed test subscriberprofileset");
     $subscriberprofileset = JSON::from_json($res->decoded_content);
 
-    _test_item_journal_link('subscriberprofilesets',$subscriberprofileset);    
+    _test_item_journal_link('subscriberprofilesets',$subscriberprofileset,$subscriberprofileset->{id});    
     $journal = _test_journal_top_journalitem('subscriberprofilesets',$subscriberprofileset->{id},$subscriberprofileset,'update',$journals,$journal);
     
     $req = HTTP::Request->new('DELETE', $subscriberprofileset_uri);
@@ -561,7 +1089,7 @@ sub test_soundset {
     is($res->code, 200, "fetch POSTed test " . $test_label);
     my $soundset = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('soundsets',$soundset);
+    _test_item_journal_link('soundsets',$soundset,$soundset->{id});
     _test_journal_options_head('soundsets',$soundset->{id});
     my $journals = {};
     my $journal = _test_journal_top_journalitem('soundsets',$soundset->{id},$soundset,'create',$journals);
@@ -583,7 +1111,7 @@ sub test_soundset {
     is($res->code, 200, "fetch PUT test " . $test_label);
     $soundset = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('soundsets',$soundset);    
+    _test_item_journal_link('soundsets',$soundset,$soundset->{id});    
     $journal = _test_journal_top_journalitem('soundsets',$soundset->{id},$soundset,'update',$journals,$journal);
     
     $req = HTTP::Request->new('PATCH', $soundset_uri);
@@ -599,7 +1127,7 @@ sub test_soundset {
     is($res->code, 200, "fetch PATCHed test " . $test_label);
     $soundset = JSON::from_json($res->decoded_content);
 
-    _test_item_journal_link('soundsets',$soundset);    
+    _test_item_journal_link('soundsets',$soundset,$soundset->{id});    
     $journal = _test_journal_top_journalitem('soundsets',$soundset->{id},$soundset,'update',$journals,$journal);
     
     $req = HTTP::Request->new('DELETE', $soundset_uri);
@@ -658,7 +1186,7 @@ sub test_subscriberpreferences {
     is($res->code, 200, "fetch PUT test subscriberpreferences");
     my $subscriberpreferences = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('subscriberpreferences',$subscriberpreferences);
+    _test_item_journal_link('subscriberpreferences',$subscriberpreferences,$subscriberpreferences->{id});
     _test_journal_options_head('subscriberpreferences',$subscriberpreferences->{id});
     my $journals = {};
     my $journal = _test_journal_top_journalitem('subscriberpreferences',$subscriberpreferences->{id},$subscriberpreferences,'update',$journals);
@@ -683,7 +1211,7 @@ sub test_subscriberpreferences {
     is($res->code, 200, "fetch PATCHED test subscriberpreferences");
     $subscriberpreferences = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('subscriberpreferences',$subscriberpreferences);    
+    _test_item_journal_link('subscriberpreferences',$subscriberpreferences,$subscriberpreferences->{id});    
     $journal = _test_journal_top_journalitem('subscriberpreferences',$subscriberpreferences->{id},$subscriberpreferences,'update',$journals,$journal);
     
     _test_journal_collection('subscriberpreferences',$subscriberpreferences->{id},$journals);
@@ -720,7 +1248,7 @@ sub test_customerpreferences {
     is($res->code, 200, "fetch PUT test customerpreferences");
     my $customerpreferences = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('customerpreferences',$customerpreferences);
+    _test_item_journal_link('customerpreferences',$customerpreferences,$customerpreferences->{id});
     _test_journal_options_head('customerpreferences',$customerpreferences->{id});
     my $journals = {};
     my $journal = _test_journal_top_journalitem('customerpreferences',$customerpreferences->{id},$customerpreferences,'update',$journals);
@@ -745,7 +1273,7 @@ sub test_customerpreferences {
     is($res->code, 200, "fetch PATCHED test customerpreferences");
     $customerpreferences = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('customerpreferences',$customerpreferences);    
+    _test_item_journal_link('customerpreferences',$customerpreferences,$customerpreferences->{id});    
     $journal = _test_journal_top_journalitem('customerpreferences',$customerpreferences->{id},$customerpreferences,'update',$journals,$journal);
     
     _test_journal_collection('customerpreferences',$customerpreferences->{id},$journals);
@@ -772,7 +1300,7 @@ sub test_billingprofile {
     is($res->code, 200, "fetch POSTed billing profile");
     my $billingprofile = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('billingprofiles',$billingprofile);
+    _test_item_journal_link('billingprofiles',$billingprofile,$billingprofile->{id});
     _test_journal_options_head('billingprofiles',$billingprofile->{id});
     my $journals = {};
     my $journal = _test_journal_top_journalitem('billingprofiles',$billingprofile->{id},$billingprofile,'create',$journals);
@@ -793,7 +1321,7 @@ sub test_billingprofile {
     is($res->code, 200, "fetch PUT test billingprofile");
     $billingprofile = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('billingprofiles',$billingprofile);    
+    _test_item_journal_link('billingprofiles',$billingprofile,$billingprofile->{id});    
     $journal = _test_journal_top_journalitem('billingprofiles',$billingprofile->{id},$billingprofile,'update',$journals,$journal);
     
     $req = HTTP::Request->new('PATCH', $billingprofile_uri);
@@ -809,7 +1337,7 @@ sub test_billingprofile {
     is($res->code, 200, "fetch PATCHed test billingprofile");
     $billingprofile = JSON::from_json($res->decoded_content);
 
-    _test_item_journal_link('billingprofiles',$billingprofile);    
+    _test_item_journal_link('billingprofiles',$billingprofile,$billingprofile->{id});    
     $journal = _test_journal_top_journalitem('billingprofiles',$billingprofile->{id},$billingprofile,'update',$journals,$journal);
     
     _test_journal_collection('billingprofiles',$billingprofile->{id},$journals);
@@ -837,7 +1365,7 @@ sub test_contract {
     is($res->code, 200, "fetch POSTed test reseller contract");
     my $contract = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('contracts',$contract);
+    _test_item_journal_link('contracts',$contract,$contract->{id});
     _test_journal_options_head('contracts',$contract->{id});
     my $journals = {};
     my $journal = _test_journal_top_journalitem('contracts',$contract->{id},$contract,'create',$journals);
@@ -860,7 +1388,7 @@ sub test_contract {
     is($res->code, 200, "fetch PUT test reseller contract");
     $contract = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('contracts',$contract);    
+    _test_item_journal_link('contracts',$contract,$contract->{id});    
     $journal = _test_journal_top_journalitem('contracts',$contract->{id},$contract,'update',$journals,$journal);
     
     $req = HTTP::Request->new('PATCH', $contract_uri);
@@ -876,7 +1404,7 @@ sub test_contract {
     is($res->code, 200, "fetch PATCHed test reseller contract");
     $contract = JSON::from_json($res->decoded_content);
 
-    _test_item_journal_link('contracts',$contract);    
+    _test_item_journal_link('contracts',$contract,$contract->{id});    
     $journal = _test_journal_top_journalitem('contracts',$contract->{id},$contract,'update',$journals,$journal);
     
     _test_journal_collection('contracts',$contract->{id},$journals);
@@ -903,7 +1431,7 @@ sub test_customercontact {
     is($res->code, 200, "fetch POSTed test customercontact");
     my $customercontact = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('customercontacts',$customercontact);
+    _test_item_journal_link('customercontacts',$customercontact,$customercontact->{id});
     _test_journal_options_head('customercontacts',$customercontact->{id});
     my $journals = {};
     my $journal = _test_journal_top_journalitem('customercontacts',$customercontact->{id},$customercontact,'create',$journals);
@@ -926,7 +1454,7 @@ sub test_customercontact {
     is($res->code, 200, "fetch PUT test customercontact");
     $customercontact = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('customercontacts',$customercontact);    
+    _test_item_journal_link('customercontacts',$customercontact,$customercontact->{id});    
     $journal = _test_journal_top_journalitem('customercontacts',$customercontact->{id},$customercontact,'update',$journals,$journal);
     
     $req = HTTP::Request->new('PATCH', $customercontact_uri);
@@ -942,7 +1470,7 @@ sub test_customercontact {
     is($res->code, 200, "fetch PATCHed test customercontact");
     $customercontact = JSON::from_json($res->decoded_content);
 
-    _test_item_journal_link('customercontacts',$customercontact);    
+    _test_item_journal_link('customercontacts',$customercontact,$customercontact->{id});    
     $journal = _test_journal_top_journalitem('customercontacts',$customercontact->{id},$customercontact,'update',$journals,$journal);
     
     $req = HTTP::Request->new('DELETE', $customercontact_uri);
@@ -992,7 +1520,7 @@ sub test_reseller {
     is($res->code, 200, "fetch POSTed test reseller");
     my $reseller = JSON::from_json($res->decoded_content);
 
-    _test_item_journal_link('resellers',$reseller);
+    _test_item_journal_link('resellers',$reseller,$reseller->{id});
     _test_journal_options_head('resellers',$reseller->{id});
     my $journals = {};
     my $journal = _test_journal_top_journalitem('resellers',$reseller->{id},$reseller,'create',$journals);
@@ -1013,7 +1541,7 @@ sub test_reseller {
     is($res->code, 200, "fetch PUT test reseller");
     $reseller = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('resellers',$reseller);    
+    _test_item_journal_link('resellers',$reseller,$reseller->{id});    
     $journal = _test_journal_top_journalitem('resellers',$reseller->{id},$reseller,'update',$journals,$journal);
     
     $req = HTTP::Request->new('PATCH', $reseller_uri);
@@ -1029,7 +1557,7 @@ sub test_reseller {
     is($res->code, 200, "fetch PATCHed test reseller");
     $reseller = JSON::from_json($res->decoded_content);
 
-    _test_item_journal_link('resellers',$reseller);    
+    _test_item_journal_link('resellers',$reseller,$reseller->{id});    
     $journal = _test_journal_top_journalitem('resellers',$reseller->{id},$reseller,'update',$journals,$journal);
     
     #$req = HTTP::Request->new('DELETE', $reseller_uri);
@@ -1090,7 +1618,7 @@ sub test_systemcontact {
     is($res->code, 200, "fetch POSTed test systemcontact");
     my $systemcontact = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('systemcontacts',$systemcontact);
+    _test_item_journal_link('systemcontacts',$systemcontact,$systemcontact->{id});
     _test_journal_options_head('systemcontacts',$systemcontact->{id});
     my $journals = {};
     my $journal = _test_journal_top_journalitem('systemcontacts',$systemcontact->{id},$systemcontact,'create',$journals);
@@ -1112,7 +1640,7 @@ sub test_systemcontact {
     is($res->code, 200, "fetch PUT test systemcontact");
     $systemcontact = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('systemcontacts',$systemcontact);    
+    _test_item_journal_link('systemcontacts',$systemcontact,$systemcontact->{id});    
     $journal = _test_journal_top_journalitem('systemcontacts',$systemcontact->{id},$systemcontact,'update',$journals,$journal);
     
     $req = HTTP::Request->new('PATCH', $systemcontact_uri);
@@ -1128,7 +1656,7 @@ sub test_systemcontact {
     is($res->code, 200, "fetch PATCHed test systemcontact");
     $systemcontact = JSON::from_json($res->decoded_content);
 
-    _test_item_journal_link('systemcontacts',$systemcontact);    
+    _test_item_journal_link('systemcontacts',$systemcontact,$systemcontact->{id});    
     $journal = _test_journal_top_journalitem('systemcontacts',$systemcontact->{id},$systemcontact,'update',$journals,$journal);
     
     $req = HTTP::Request->new('DELETE', $systemcontact_uri);
@@ -1175,7 +1703,7 @@ sub test_domain {
     is($res->code, 200, "fetch POSTed test domain");
     my $domain = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('domains',$domain);
+    _test_item_journal_link('domains',$domain,$domain->{id});
     _test_journal_options_head('domains',$domain->{id});
     my $journals = {};
     my $journal = _test_journal_top_journalitem('domains',$domain->{id},$domain,'create',$journals);
@@ -1228,7 +1756,7 @@ sub test_customer {
     is($res->code, 200, "fetch POSTed test customer");
     my $customer = JSON::from_json($res->decoded_content);
 
-    _test_item_journal_link('customers',$customer);
+    _test_item_journal_link('customers',$customer,$customer->{id});
     _test_journal_options_head('customers',$customer->{id});
     my $journals = {};
     my $journal = _test_journal_top_journalitem('customers',$customer->{id},$customer,'create',$journals);
@@ -1252,7 +1780,7 @@ sub test_customer {
     is($res->code, 200, "fetch PUT test customer");
     $customer = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('customers',$customer);    
+    _test_item_journal_link('customers',$customer,$customer->{id});    
     $journal = _test_journal_top_journalitem('customers',$customer->{id},$customer,'update',$journals,$journal);
     
     $req = HTTP::Request->new('PATCH', $customer_uri);
@@ -1268,7 +1796,7 @@ sub test_customer {
     is($res->code, 200, "fetch PATCHed test customer");
     $customer = JSON::from_json($res->decoded_content);
 
-    _test_item_journal_link('customers',$customer);    
+    _test_item_journal_link('customers',$customer,$customer->{id});    
     $journal = _test_journal_top_journalitem('customers',$customer->{id},$customer,'update',$journals,$journal);
     
     _test_journal_collection('customers',$customer->{id},$journals);
@@ -1319,7 +1847,7 @@ sub test_subscriber {
     is($res->code, 200, "fetch POSTed test subscriber");
     my $subscriber = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('subscribers',$subscriber);
+    _test_item_journal_link('subscribers',$subscriber,$subscriber->{id});
     _test_journal_options_head('subscribers',$subscriber->{id});
     my $journals = {};
     my $journal = _test_journal_top_journalitem('subscribers',$subscriber->{id},$subscriber,'create',$journals);
@@ -1341,7 +1869,7 @@ sub test_subscriber {
     is($res->code, 200, "fetch PUT test subscriber");
     $subscriber = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('subscribers',$subscriber);    
+    _test_item_journal_link('subscribers',$subscriber,$subscriber->{id});    
     $journal = _test_journal_top_journalitem('subscribers',$subscriber->{id},$subscriber,'update',$journals,$journal);
     
     $req = HTTP::Request->new('PATCH', $subscriber_uri);
@@ -1357,7 +1885,7 @@ sub test_subscriber {
     is($res->code, 200, "fetch PATCHed test subscriber");
     $subscriber = JSON::from_json($res->decoded_content);
     
-    _test_item_journal_link('subscribers',$subscriber);    
+    _test_item_journal_link('subscribers',$subscriber,$subscriber->{id});    
     $journal = _test_journal_top_journalitem('subscribers',$subscriber->{id},$subscriber,'update',$journals,$journal);
     
     $req = HTTP::Request->new('DELETE', $subscriber_uri);
@@ -1390,11 +1918,11 @@ sub test_subscriber {
 }    
 
 sub _test_item_journal_link {
-    my ($resource,$item) = @_;
+    my ($resource,$item,$item_id) = @_;
     if (_is_journal_resource_enabled($resource)) {
         ok(exists $item->{_links}, "check existence of _links");
         ok($item->{_links}->{'ngcp:journal'}, "check existence of ngcp:journal link");
-        ok($item->{_links}->{'ngcp:journal'}->{href} eq '/api/'.$resource . '/' . $item->{id} . '/journal/', "check if ngcp:journal link equals '/api/$resource/$item->{id}/journal/'");
+        ok($item->{_links}->{'ngcp:journal'}->{href} eq '/api/'.$resource . '/' . $item_id . '/journal/', "check if ngcp:journal link equals '/api/$item_id/journal/'");
     }
 }