diff --git a/fetchupd.php b/fetchupd.php
index a3dc648..e7d77af 100644
--- a/fetchupd.php
+++ b/fetchupd.php
@@ -206,15 +206,12 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
     $isCumulativeUpdate = 0;
     if(preg_match('/\d{4}-\d{2}.+Update/', $updateTitle)) {
         $isCumulativeUpdate = 1;
-        $updateTitle = preg_replace('/\d{4}-\d{2} /i', '', $updateTitle);
         $updateTitle = preg_replace('/ for .{3,5}-based systems| \(KB.*?\)/i', '', $updateTitle);
-
-        if(!preg_match("/$foundBuild/", $updateTitle)) {
-            $updateTitle = $updateTitle.' ('.$foundBuild.')';
-        }
     }
 
-    if(preg_match('/Feature update/i', $updateTitle)) {
+    $updateTitle = preg_replace("/ ?\d{4}-\d{2} ?| ?$arch ?/i", '', $updateTitle);
+
+    if(!preg_match("/$foundBuild/i", $updateTitle)) {
         $updateTitle = $updateTitle.' ('.$foundBuild.')';
     }
 
diff --git a/shared/main.php b/shared/main.php
index 769f649..1e695b5 100644
--- a/shared/main.php
+++ b/shared/main.php
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 function uupApiVersion() {
-    return '1.20.3';
+    return '1.20.4';
 }
 
 require_once dirname(__FILE__).'/auths.php';
diff --git a/shared/requests.php b/shared/requests.php
index 0d811a3..4497c61 100644
--- a/shared/requests.php
+++ b/shared/requests.php
@@ -30,7 +30,7 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku) {
     $attrib = array(
         'App=WU_OS',
         'AppVer='.$build,
-        'AttrDataVer=57',
+        'AttrDataVer=60',
         'BranchReadinessLevel=CB',
         'CurrentBranch='.$branch,
         'DefaultUserRegion=191',
@@ -41,6 +41,7 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku) {
         'FlightingBranchName=external',
         'Free=32to64',
         'GStatus_RS5=2',
+        'GStatus_19H1=2',
         'InstallDate=1438196400',
         'InstallLanguage=en-US',
         'InstallationType=Client',
@@ -59,6 +60,7 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku) {
         'TelemetryLevel=3',
         'UpdateManagementGroup=2',
         'UpgEx_RS5=Green',
+        'UpgEx_19H1=Green',
         'Version_RS5='.PHP_INT_MAX,
         'WuClientVer='.$build,
     );