diff --git a/get.php b/get.php
index 851a7bd..f3d0780 100644
--- a/get.php
+++ b/get.php
@@ -113,14 +113,18 @@ function uupGetFiles(
             case 'UPDATEONLY': break;
 
             case 'APP': $appEdition = 1;
+            case 'APP_MOMENT': $appEdition = 1;
 
             default:
                 if(!isset($genPack[$usePack][$desiredEdition])) {
                     return array('error' => 'UNSUPPORTED_COMBINATION');
                 }
 
-                $filesPacksList = $genPack[$usePack][$desiredEdition];
                 $fileListSource = 'GENERATEDPACKS';
+                $filesPacksList = $genPack[$usePack][$desiredEdition];
+                if($desiredEdition == 'APP' && isset($genPack[$usePack]['APP_MOMENT'])) {
+                    $filesPacksList = array_merge($filesPacksList, $genPack[$usePack]['APP_MOMENT']);
+                }
                 break;
         }
     } else {
@@ -133,6 +137,7 @@ function uupGetFiles(
                 return array('error' => 'UNSUPPORTED_COMBINATION');
             }
 
+            if($edition == 'APP' || $edition == 'APP_MOMENT') $appEdition = 1;
             $filesPacksList = array_merge($filesPacksList, $genPack[$usePack][$edition]);
         }
     }
diff --git a/shared/main.php b/shared/main.php
index e40a91e..adb9cd9 100644
--- a/shared/main.php
+++ b/shared/main.php
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 function uupApiVersion() {
-    return '1.40.2';
+    return '1.40.3';
 }
 
 require_once dirname(__FILE__).'/auths.php';
diff --git a/shared/packs.php b/shared/packs.php
index 19aca20..8f91100 100644
--- a/shared/packs.php
+++ b/shared/packs.php
@@ -63,6 +63,7 @@ function uupGetInfoTexts() {
 
     $fancyEditionNames = array(
         'APP' => 'Microsoft Store Inbox Apps',
+        'APP_MOMENT' => 'Microsoft Store Moment Apps',
         'FOD' => 'Features on Demand (Capabilities)',
         'CLOUD' => 'Windows S',
         'CLOUDN' => 'Windows S N',
diff --git a/shared/requests.php b/shared/requests.php
index 6ca9ad4..30093d5 100644
--- a/shared/requests.php
+++ b/shared/requests.php
@@ -112,8 +112,9 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type) {
     $attrib = array(
         'App=WU_OS',
         'AppVer='.$build,
-        'AttrDataVer=226',
+        'AttrDataVer=247',
         'AllowInPlaceUpgrade=1',
+        'AllowOptionalContent=1',
         'AllowUpgradesWithUnsupportedTPMOrCPU=1',
         'BlockFeatureUpdates='.$blockUpgrades,
         'BranchReadinessLevel=CB',
@@ -134,6 +135,7 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type) {
         'DataVer_RS5=2000000000',
         'DefaultUserRegion=191',
         'DeviceFamily='.$dvcFamily,
+        'DeviceInfoGatherSuccessful=1',
         'EKB19H2InstallCount=1',
         'EKB19H2InstallTimeEpoch=1255000000',
         'FlightingBranchName='.$fltBranch,
@@ -271,7 +273,6 @@ function branchFromBuild($build) {
 
         case 20348:
         case 20349:
-        case 20350:
             $branch = 'fe_release';
             break;
 
@@ -280,6 +281,7 @@ function branchFromBuild($build) {
             break;
 
         case 22621:
+        case 22631:
             $branch = 'ni_release';
             break;
 
@@ -410,6 +412,8 @@ function composeFetchUpdRequest($device, $encData, $arch, $flight, $ring, $build
         $products[] = "PN=Adobe.Flash.$currArch&Repairable=1&V=0.0.0.0";
         $products[] = "PN=Microsoft.Edge.Stable.$currArch&Repairable=1&V=0.0.0.0";
         $products[] = "PN=Microsoft.NETFX.$currArch&V=2018.12.2.0";
+        $products[] = "PN=Windows.Autopilot.$currArch&Repairable=1&V=0.0.0.0";
+        $products[] = "PN=Windows.AutopilotOOBE.$currArch&Repairable=1&V=0.0.0.0";
         $products[] = "PN=Windows.Appraiser.$currArch&Repairable=1&V=$build";
         $products[] = "PN=Windows.AppraiserData.$currArch&Repairable=1&V=$build";
         $products[] = "PN=Windows.EmergencyUpdate.$currArch&V=$build";