diff --git a/Build.PL b/Build.PL
index d156e71c..a4131e3b 100644
--- a/Build.PL
+++ b/Build.PL
@@ -9,6 +9,7 @@ my $builder = Module::Build->new(
         'DateTime::Format::MySQL'     => 0, #required by DBIx::Class
         'DBD::mysql'                  => 0,
         'DBIx::Class::EncodedColumn'  => 0,
+        'DBIx::Class::Helper::ResultSet' => 0,
         'DBIx::Class::Helper::Row::ToJSON' => 0,
         'DBIx::Class::Schema::Loader' => 0,
         'File::Path'                  => 0,
diff --git a/lib/NGCP/Schema.pm b/lib/NGCP/Schema.pm
index f9f778a0..4766803d 100644
--- a/lib/NGCP/Schema.pm
+++ b/lib/NGCP/Schema.pm
@@ -9,7 +9,9 @@ extends 'DBIx::Class::Schema';
 
 our $VERSION = '2.000';
 
-__PACKAGE__->load_namespaces;
+__PACKAGE__->load_namespaces(
+    default_resultset_class => 'ResultSet',
+);
 
 class_has('config', is => 'rw', isa => 'NGCP::Schema::Config', lazy => 1, default => sub {
     return NGCP::Schema::Config->instance;
diff --git a/lib/NGCP/Schema/ResultSet.pm b/lib/NGCP/Schema/ResultSet.pm
new file mode 100644
index 00000000..449ea258
--- /dev/null
+++ b/lib/NGCP/Schema/ResultSet.pm
@@ -0,0 +1,5 @@
+package NGCP::Schema::ResultSet;
+use Sipwise::Base;
+extends 'DBIx::Class::ResultSet';
+
+__PACKAGE__->load_components('Helper::ResultSet');