diff --git a/MVMCore/MVMCore/LoadHandling/MVMCoreRequestParameters.h b/MVMCore/MVMCore/LoadHandling/MVMCoreRequestParameters.h
index 7dbe729..2e52a05 100644
--- a/MVMCore/MVMCore/LoadHandling/MVMCoreRequestParameters.h
+++ b/MVMCore/MVMCore/LoadHandling/MVMCoreRequestParameters.h
@@ -29,8 +29,8 @@ typedef NS_ENUM(NSInteger, MFLoadStyle) {
 
 // request parameters
 @property (nullable, strong, nonatomic) NSString *pageType;
-@property (nullable, strong, nonatomic) NSArray *optionalModules;
-@property (nullable, strong, nonatomic) NSArray *modules;
+@property (nullable, strong, nonatomic) NSArray<NSString *> *optionalModules;
+@property (nullable, strong, nonatomic) NSArray<NSString *> *modules;
 @property (nullable, strong, nonatomic) NSDictionary *parameters;
 @property (nullable, strong, nonatomic) NSData *imageData;
 
@@ -122,6 +122,6 @@ typedef NS_ENUM(NSInteger, MFLoadStyle) {
 - (void)setMFLoadStyleBasedOnPresentationStyle:(nonnull NSString *)presentationStyle;
 
 /// Returns optional and required modules
-- (nullable NSArray *)allModules;
+- (nullable NSArray<NSString *> *)allModules;
 
 @end
diff --git a/MVMCore/MVMCore/LoadHandling/MVMCoreRequestParameters.m b/MVMCore/MVMCore/LoadHandling/MVMCoreRequestParameters.m
index 3ba9319..c4327e1 100644
--- a/MVMCore/MVMCore/LoadHandling/MVMCoreRequestParameters.m
+++ b/MVMCore/MVMCore/LoadHandling/MVMCoreRequestParameters.m
@@ -33,7 +33,8 @@
 - (nullable instancetype)initWithPageType:(nonnull NSString *)pageType extraParameters:(nullable NSDictionary *)extraParameters {
     if (self = [self initWithExtraParameters:extraParameters]) {
         self.pageType = pageType;
-        self.modules = [[MVMCoreViewControllerMappingObject sharedViewControllerMappingObject] allModulesForPageType:pageType];
+        self.optionalModules = [[MVMCoreViewControllerMappingObject sharedViewControllerMappingObject] modulesOptionalForPageType:pageType];
+        self.modules = [[MVMCoreViewControllerMappingObject sharedViewControllerMappingObject] modulesRequiredForPageType:pageType];
     }
     return self;
 }
@@ -127,7 +128,7 @@
     MVMCoreRequestParameters *copyObject = [[MVMCoreRequestParameters alloc] init];
     copyObject.pageType = [self.pageType copy];
     copyObject.parentPageType = self.parentPageType;
-
+    copyObject.optionalModules = [self.optionalModules copy];
     copyObject.modules = [self.modules copy];
     copyObject.parameters = [self.parameters copy];
     copyObject.contextRoot = [self.contextRoot copy];