diff --git a/starter.sh b/starter.sh
index e09a30707..0cbcd7ce1 100644
--- a/starter.sh
+++ b/starter.sh
@@ -188,7 +188,7 @@ else
     sed -i -e "s/$comment/$comment${lineBreak}$code/g" ./lib/redux/app/app_state.dart
 
     comment="STARTER: state getters - do not remove comment"
-    code="${Module}State get ${module}State => this.dataState.${module}State;${lineBreak}"
+    code="${Module}State get ${module}State => selectedCompanyState.${module}State;${lineBreak}"
     code="${code}ListUIState get ${module}ListState => this.uiState.${module}UIState.listUIState;${lineBreak}"
     code="${code}${Module}UIState get ${module}UIState => this.uiState.${module}UIState;${lineBreak}${lineBreak}"
     sed -i -e "s/$comment/$comment${lineBreak}$code/g" ./lib/redux/app/app_state.dart
diff --git a/stubs/data/repositories/stub_repository b/stubs/data/repositories/stub_repository
index b2df0abd3..d8769cba4 100644
--- a/stubs/data/repositories/stub_repository
+++ b/stubs/data/repositories/stub_repository
@@ -40,4 +40,23 @@ class StubRepository {
 
     return stubResponse.data;
   }
+  
+  Future<StubEntity> saveData(
+      CompanyEntity company, AuthState auth, StubEntity stub,
+      [EntityAction action]) async {
+    final data = serializers.serializeWith(StubEntity.serializer, stub);
+    dynamic response;
+
+    if (stub.isNew) {
+      response = await webClient.post(
+          auth.url + '/stubs',
+          company.token,
+          json.encode(data));
+    } else {
+      var url = auth.url + '/stubs/' + stub.id.toString();
+      if (action != null) {
+        url += '?action=' + action.toString();
+      }
+      response = await webClient.put(url, company.token, json.encode(data));
+    }  
 }