diff --git a/src/generators.ts b/src/generators.ts
index a74a9de1..93e71701 100644
--- a/src/generators.ts
+++ b/src/generators.ts
@@ -4,10 +4,14 @@ import { hydrateRequest, hydrateTabRequest, getNgModules, GeneratorOption, Gener
 
 export { getNgModules, GeneratorOption, GeneratorRequest };
 
-export function processPageRequest(context: BuildContext, name: string, commandOptions: any) {
-
-  const hydratedRequest = hydrateRequest(context, { type: 'page', name, includeNgModule: commandOptions.module });
-  return generateTemplates(context, hydratedRequest, commandOptions.constants);
+export function processPageRequest(context: BuildContext, name: string, commandOptions?: { module?: boolean; constants?: boolean; }) {
+  if (commandOptions) {
+    const hydratedRequest = hydrateRequest(context, { type: 'page', name, includeNgModule: commandOptions.module });
+    return generateTemplates(context, hydratedRequest, commandOptions.constants);
+  }else {
+    const hydratedRequest = hydrateRequest(context, { type: 'page', name, includeNgModule: false });
+    return generateTemplates(context, hydratedRequest);
+  }
 }
 
 export function processPipeRequest(context: BuildContext, name: string, ngModulePath: string) {
@@ -26,9 +30,11 @@ export function processProviderRequest(context: BuildContext, name: string, ngMo
   return nonPageFileManipulation(context, name, ngModulePath, 'provider');
 }
 
-export function processTabsRequest(context: BuildContext, name: string, tabs: any[], commandOptions: any) {
-  const includePageConstants = commandOptions.constants;
-  const includeNgModule = commandOptions.module;
+export function processTabsRequest(context: BuildContext, name: string, tabs: any[],  commandOptions?: { module?: boolean; constants?: boolean; }) {
+
+  const includePageConstants = commandOptions ? commandOptions.constants : false;
+  const includeNgModule = commandOptions ? commandOptions.module : false;
+
   const tabHydratedRequests = tabs.map((tab) => hydrateRequest(context, { type: 'page', name: tab, includeNgModule}));
   const hydratedRequest = hydrateTabRequest(context, { type: 'tabs', name, includeNgModule, tabs: tabHydratedRequests });
 
diff --git a/src/generators/util.ts b/src/generators/util.ts
index cfb4933b..738b3e32 100644
--- a/src/generators/util.ts
+++ b/src/generators/util.ts
@@ -244,7 +244,7 @@ export function tabsModuleManipulation(tabs: string[][], hydratedRequest: Hydrat
 
 }
 
-export function generateTemplates(context: BuildContext, request: HydratedGeneratorRequest, includePageConstants: any): Promise<string[]> {
+export function generateTemplates(context: BuildContext, request: HydratedGeneratorRequest, includePageConstants?: boolean): Promise<string[]> {
   Logger.debug('[Generators] generateTemplates: Reading templates ...');
 
   let pageConstantFile = join(context.pagesDir, 'pages.constants.ts');