diff --git a/src/fiskaltrust.AndroidLauncher.Common/Migrations/008_Indices.sqlite3 b/src/fiskaltrust.AndroidLauncher.Common/Migrations/008_Indices.sqlite3
new file mode 100644
index 00000000..5eb9a76e
--- /dev/null
+++ b/src/fiskaltrust.AndroidLauncher.Common/Migrations/008_Indices.sqlite3
@@ -0,0 +1,7 @@
+CREATE INDEX IF NOT EXISTS idx_ftQueueItem_Timestamp ON ftQueueItem (TimeStamp);
+CREATE INDEX IF NOT EXISTS idx_ftQueueItem_cbReceiptReference ON ftQueueItem (cbReceiptReference);
+CREATE INDEX IF NOT EXISTS idx_ftActionJournal_Timestamp ON ftActionJournal (TimeStamp);
+CREATE INDEX IF NOT EXISTS idx_ftReceiptJournal_Timestamp ON ftReceiptJournal (TimeStamp);
+CREATE INDEX IF NOT EXISTS idx_ftJournalAT_Timestamp ON ftJournalAT (TimeStamp);
+CREATE INDEX IF NOT EXISTS idx_ftJournalDE_Timestamp ON ftJournalDE (TimeStamp);
+CREATE INDEX IF NOT EXISTS idx_ftJournalFR_Timestamp ON ftJournalFR (TimeStamp);
diff --git a/src/fiskaltrust.AndroidLauncher.Common/Migrations/009_QueueME.sqlite3 b/src/fiskaltrust.AndroidLauncher.Common/Migrations/009_QueueME.sqlite3
new file mode 100644
index 00000000..1fddfa72
--- /dev/null
+++ b/src/fiskaltrust.AndroidLauncher.Common/Migrations/009_QueueME.sqlite3
@@ -0,0 +1,43 @@
+CREATE TABLE IF NOT EXISTS ftJournalME
+(
+ ftJournalMEId NVARCHAR(36) PRIMARY KEY NOT NULL,
+ Number BIGINT NOT NULL,
+ cbReference NVARCHAR(2147483647) NULL,
+ InvoiceNumber NVARCHAR(2147483647) NULL,
+ YearlyOrdinalNumber BIGINT NOT NULL,
+ ftQueueItemId NVARCHAR(36) NOT NULL,
+ ftQueueId NVARCHAR(36) NOT NULL,
+ FCDC NVARCHAR(36) NULL,
+ FIC NVARCHAR(36) NULL,
+ IIC NVARCHAR(36) NULL,
+ JournalType BIGINT NOT NULL,
+ TimeStamp BIGINT NOT NULL
+);
+CREATE TABLE IF NOT EXISTS ftQueueME
+(
+ ftQueueMEId NVARCHAR(36) PRIMARY KEY NOT NULL,
+ ftSignaturCreationUnitMEId NVARCHAR(36) NULL,
+ LastHash NVARCHAR(2147483647) NULL,
+ SSCDFailCount BIGINT NOT NULL,
+ SSCDFailMoment BIGINT NULL,
+ SSCDFailQueueItemId NVARCHAR(36) NULL,
+ UsedFailedCount BIGINT NOT NULL,
+ UsedFailedMomentMin BIGINT NULL,
+ UsedFailedMomentMax BIGINT NULL,
+ UsedFailedQueueItemId NVARCHAR(36) NULL,
+ DailyClosingNumber BIGINT NULL
+);
+CREATE TABLE IF NOT EXISTS ftSignaturCreationUnitME
+(
+ ftSignaturCreationUnitMEId NVARCHAR(36) PRIMARY KEY NOT NULL,
+ Url NVARCHAR(2147483647) NULL,
+ TimeStamp BIGINT NOT NULL,
+ IssuerTin NVARCHAR(2147483647) NULL,
+ BusinessUnitCode NVARCHAR(2147483647) NULL,
+ TcrIntId NVARCHAR(2147483647) NULL,
+ SoftwareCode NVARCHAR(2147483647) NULL,
+ MaintainerCode NVARCHAR(2147483647) NULL,
+ ValidFrom BIGINT NULL,
+ ValidTo BIGINT NULL,
+ TcrCode NVARCHAR(2147483647) NULL
+);
\ No newline at end of file
diff --git a/src/fiskaltrust.AndroidLauncher.Common/Migrations/010_ExtendedMasterData.sqlite3 b/src/fiskaltrust.AndroidLauncher.Common/Migrations/010_ExtendedMasterData.sqlite3
new file mode 100644
index 00000000..d04a8314
--- /dev/null
+++ b/src/fiskaltrust.AndroidLauncher.Common/Migrations/010_ExtendedMasterData.sqlite3
@@ -0,0 +1,2 @@
+ALTER TABLE PosSystemMasterData ADD Type NVARCHAR(2147483647) NULL;
+ALTER TABLE OutletMasterData ADD LocationId NVARCHAR(2147483647) NULL;
\ No newline at end of file
diff --git a/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj b/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj
index bebd1462..ff2c9b7c 100644
--- a/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj
+++ b/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj
@@ -100,6 +100,9 @@
+
+
+