diff --git a/lib/module.js b/lib/module.js
index 2ddbc4b..4881799 100755
--- a/lib/module.js
+++ b/lib/module.js
@@ -71,17 +71,21 @@ function addOneSignal (oneSignalOptions) {
     })
   }
 
+  if (!this.options.pwa) {
+    this.options.pwa = {}
+  }
+
   // Adjust manifest for oneSignal
-  if (!this.options.manifest) {
-    this.options.manifest = {}
+  if (!this.options.pwa.manifest) {
+    this.options.pwa.manifest = {}
   }
-  this.options.manifest.gcm_sender_id = options.GcmSenderId
+  this.options.pwa.manifest.gcm_sender_id = options.GcmSenderId
 
   // Adjust swURL option of Workbox for oneSignal
-  if (!this.options.workbox) {
-    this.options.workbox = {}
+  if (!this.options.pwa.workbox) {
+    this.options.pwa.workbox = {}
   }
-  this.options.workbox.swURL = 'OneSignalSDKWorker.js'
+  this.options.pwa.workbox.swURL = 'OneSignalSDKWorker.js'
 
   // Provide OneSignalSDKWorker.js and OneSignalSDKUpdaterWorker.js
   const makeSW = (name, scripts) => {
@@ -90,7 +94,7 @@ function addOneSignal (oneSignalOptions) {
   }
 
   makeSW('OneSignalSDKWorker.js', [].concat(options.importScripts || []).concat(options.OneSignalSDK))
-  makeSW('OneSignalSDKUpdaterWorker.js', [options.OneSignalSDK])
+  makeSW('OneSignalSDKUpdaterWorker.js', [].concat(options.importScripts || []).concat(options.OneSignalSDK))
 
   // Add OneSignal plugin
   this.addPlugin({