diff --git a/stubs/data/models/stub_model b/stubs/data/models/stub_model
index 3c36f3cfb..0baefe4b5 100644
--- a/stubs/data/models/stub_model
+++ b/stubs/data/models/stub_model
@@ -4,14 +4,39 @@ import 'package:flutter_redux_starter/data/models/models.dart';
 
 part 'stub_model.g.dart';
 
+abstract class StubListResponse
+    implements Built<StubListResponse, StubListResponseBuilder> {
+  factory StubListResponse([void updates(StubListResponseBuilder b)]) =
+      _$StubListResponse;
+
+  StubListResponse._();
+
+  BuiltList<StubEntity> get data;
+
+  static Serializer<StubListResponse> get serializer =>
+      _$StubListResponseSerializer;
+}
+
+abstract class StubItemResponse
+    implements Built<StubItemResponse, StubItemResponseBuilder> {
+  factory StubItemResponse([void updates(StubItemResponseBuilder b)]) =
+      _$StubItemResponse;
+
+  StubItemResponse._();
+
+  StubEntity get data;
+
+  static Serializer<StubItemResponse> get serializer =>
+      _$StubItemResponseSerializer;
+}
+
+
 class StubFields {
   // STARTER: fields - do not remove comment
 }
 
 abstract class StubEntity extends Object with BaseEntity implements Built<StubEntity, StubEntityBuilder> {
 
-  // STARTER: properties - do not remove comment
-
   static int counter = 0;
   factory StubEntity() {
     return _$StubEntity._(
@@ -20,6 +45,8 @@ abstract class StubEntity extends Object with BaseEntity implements Built<StubEn
     );
   }
 
+  // STARTER: properties - do not remove comment
+
   String get displayName {
     // STARTER: display name - do not remove comment
   }
@@ -40,18 +67,30 @@ abstract class StubEntity extends Object with BaseEntity implements Built<StubEn
     }
   }
 
-  bool matchesSearch(String search) {
-    if (search == null || search.isEmpty) {
+  @override
+  bool matchesFilter(String filter) {
+    if (filter == null || filter.isEmpty) {
       return true;
     }
 
-    search = search.toLowerCase();
+    filter = filter.toLowerCase();
 
     // STARTER: search - do not remove comment
 
     return false;
   }
 
+  @override
+  String matchesFilterValue(String filter) {
+    if (filter == null || filter.isEmpty) {
+      return null;
+    }
+
+    filter = filter.toLowerCase();
+
+    return null;
+  }
+
   StubEntity._();
   static Serializer<StubEntity> get serializer => _$stubEntitySerializer;
 }
diff --git a/stubs/data/repositories/stub_repository b/stubs/data/repositories/stub_repository
index 17234d709..b2df0abd3 100644
--- a/stubs/data/repositories/stub_repository
+++ b/stubs/data/repositories/stub_repository
@@ -1,13 +1,11 @@
 import 'dart:async';
-import 'dart:core';
 import 'dart:convert';
+import 'dart:core';
 import 'package:built_collection/built_collection.dart';
-import 'package:flutter_redux_starter/data/models/models.dart';
-import 'package:flutter_redux_starter/data/models/serializers.dart';
-import 'package:flutter_redux_starter/redux/auth/auth_state.dart';
-import 'package:flutter_redux_starter/data/models/stub_model.dart';
-import 'package:flutter_redux_starter/data/web_client.dart';
-import 'package:flutter_redux_starter/constants.dart';
+import 'package:invoiceninja_flutter/data/models/serializers.dart';
+import 'package:invoiceninja_flutter/redux/auth/auth_state.dart';
+import 'package:invoiceninja_flutter/data/models/models.dart';
+import 'package:invoiceninja_flutter/data/web_client.dart';
 
 class StubRepository {
   final WebClient webClient;
@@ -16,29 +14,30 @@ class StubRepository {
     this.webClient = const WebClient(),
   });
 
-  Future<BuiltList<StubEntity>> loadList(AuthState auth) async {
-    final response = await webClient.get(kApiUrl + '/stubs');
+  Future<StubEntity> loadItem(
+      CompanyEntity company, AuthState auth, int entityId) async {
+    final dynamic response = await webClient.get(
+        '${auth.url}/stubs/$entityId', company.token);
 
-    var list = new BuiltList<StubEntity>(response.map((stub) {
-      return serializers.deserializeWith(StubEntity.serializer, stub);
-    }));
+    final StubItemResponse stubResponse =
+        serializers.deserializeWith(StubItemResponse.serializer, response);
 
-    return list;
+    return stubResponse.data;
   }
 
-  Future saveData(AuthState auth, StubEntity stub, [EntityAction action]) async {
+  Future<BuiltList<StubEntity>> loadList(
+      CompanyEntity company, AuthState auth, int updatedAt) async {
+    String url = auth.url + '/stubs';
 
-    var data = serializers.serializeWith(StubEntity.serializer, stub);
-    var response;
-
-    if (stub.isNew) {
-      response = await webClient.post(
-          kApiUrl + '/stubs', json.encode(data));
-    } else {
-      var url = kApiUrl + '/stubs/' + stub.id.toString();
-      response = await webClient.put(url, json.encode(data));
+    if (updatedAt > 0) {
+      url += '&updated_at=${updatedAt - 600}';
     }
 
-    return serializers.deserializeWith(StubEntity.serializer, response);
+    final dynamic response = await webClient.get(url, company.token);
+
+    final StubListResponse stubResponse =
+        serializers.deserializeWith(StubListResponse.serializer, response);
+
+    return stubResponse.data;
   }
-}
\ No newline at end of file
+}