diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7800b110..ad4c4b2f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -88,3 +88,4 @@ workflows:
               only: /^v.*/
             branches:
               ignore: /.*/
+    
\ No newline at end of file
diff --git a/backend/.nycrc.json b/backend/.nycrc.json
index b07d1625..f7d5f6aa 100644
--- a/backend/.nycrc.json
+++ b/backend/.nycrc.json
@@ -8,8 +8,8 @@
     "temp-dir": "./reports/.nyc_output",
     "report-dir": "./reports/coverage",
     "check-coverage": true,
-    "branches": 42.9,
-    "lines": 52.8,
-    "functions": 39.9,
-    "statements": 52.7
+    "branches": 51.5,
+    "lines": 56.2,
+    "functions": 43.3,
+    "statements": 56.1
   }
diff --git a/backend/package.json b/backend/package.json
index 2f7f2347..09043d2e 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -5,7 +5,7 @@
 	"license": "Apache 2.0",
 	"description": "Provide rich user experience for Yeoman generators using VSCode extension or the browser",
 	"repository": "https://github.com/SAP/yeoman-ui",
-	"version": "0.0.51",
+	"version": "0.0.53",
 	"engines": {
 		"vscode": "^1.39.2"
 	},
@@ -76,7 +76,8 @@
 		}
 	},
 	"scripts": {
-		"backend": "npm install && npm run compile",
+		"backend": "npm i && npm run compile",
+		"types": "cd ../types && npm i && npm run compile",
 		"frontend": "npm run frontend:install && npm run frontend:build && npm run frontend:copy",
 		"frontend:install": "cd ../frontend && npm i",
 		"frontend:build": "cd ../frontend && npm run build",
@@ -94,24 +95,25 @@
 	},
 	"dependencies": {
 		"@sap-devx/webview-rpc": "^0.2.0",
+		"@vscode-logging/logger": "^0.1.2",
+		"chalk": "^3.0.0",
 		"datauri": "^2.0.0",
+		"fs-extra": "^8.1.0",
+		"humanize-string": "^1.0.2",
 		"lodash": "^4.17.15",
 		"strip-ansi": "^6.0.0",
-		"ws": "^7.2.0",
-		"yeoman-environment": "^2.7.0",
 		"titleize": "^1.0.1",
-		"humanize-string": "^1.0.2",
-		"fs-extra": "^8.1.0",
-		"chalk": "^3.0.0",
-		"@vscode-logging/logger": "^0.1.2"
+		"ws": "^7.2.0",
+		"yeoman-environment": "^2.8.0",
+		"@sap-devx/yeoman-ui-types": "0.0.1"
 	},
 	"devDependencies": {
-		"@types/chai": "^4.2.5",
-		"@types/fs-extra": "^8.0.1",
+		"@types/chai": "^4.2.9",
+		"@types/fs-extra": "^8.1.0",
 		"@types/inquirer": "^6.5.0",
 		"@types/lodash": "^4.14.145",
 		"@types/mocha": "^5.2.7",
-		"@types/node": "^10.12.21",
+		"@types/node": "^10.17.16",
 		"@types/sinon": "^7.5.0",
 		"@types/strip-ansi": "^5.2.1",
 		"@types/ws": "^6.0.3",
@@ -123,15 +125,15 @@
 		"nyc": "^14.1.1",
 		"sinon": "^7.5.0",
 		"ts-loader": "^6.2.1",
-		"ts-node": "^8.5.4",
+		"ts-node": "^8.6.2",
 		"tslint": "^5.20.1",
 		"tslint-config-prettier": "^1.18.0",
 		"tslint-no-unused-expression-chai": "^0.1.4",
 		"typescript": "^3.8.2",
 		"utf-8-validate": "^5.0.2",
-		"vsce": "^1.68.0",
+		"vsce": "^1.73.0",
 		"vscode": "^1.1.28",
-		"webpack": "^4.41.2",
-		"webpack-cli": "^3.3.10"
+		"webpack": "^4.41.6",
+		"webpack-cli": "^3.3.11"
 	}
 }
diff --git a/backend/src/extension.ts b/backend/src/extension.ts
index 438a9a84..614ff7cb 100644
--- a/backend/src/extension.ts
+++ b/backend/src/extension.ts
@@ -192,9 +192,9 @@ export class YeomanUIPanel {
 		}
 		const uiMessages = _.assign({}, backendMessages, _.get(YeomanUIPanel, "messages", {}));
 		this.panel.title = _.get(uiMessages, "panel_title");
-		
+
 		this.setMessages(uiMessages);
-		
+
 		this.panel.webview.html = indexHtml;
 	}
 }
diff --git a/backend/src/yeomanui.ts b/backend/src/yeomanui.ts
index 99a1e425..f7f69a81 100644
--- a/backend/src/yeomanui.ts
+++ b/backend/src/yeomanui.ts
@@ -4,9 +4,9 @@ import * as fsextra from "fs-extra";
 import * as _ from "lodash";
 import * as Environment from "yeoman-environment";
 import * as inquirer from "inquirer";
+const datauri = require("datauri");
 const titleize = require('titleize');
 const humanizeString = require('humanize-string');
-const datauri = require("datauri");
 import * as defaultImage from "./defaultImage";
 import { YouiAdapter } from "./youi-adapter";
 import { YouiLog } from "./youi-log";
@@ -15,6 +15,7 @@ import { IRpc } from "@sap-devx/webview-rpc/out.ext/rpc-common";
 import Generator = require("yeoman-generator");
 import { GeneratorType, GeneratorFilter } from "./filter";
 import { IChildLogger } from "@vscode-logging/logger";
+import {IPrompt} from "@sap-devx/yeoman-ui-types";
 
 export interface IGeneratorChoice {
   name: string;
@@ -31,9 +32,7 @@ export interface IGeneratorQuestion {
   choices: IGeneratorChoice[];
 }
 
-export interface IPrompt {
-  name: string;
-  description: string;
+export interface IQuestionsPrompt extends IPrompt{
   questions: any[];
 }
 
@@ -42,7 +41,7 @@ export class YeomanUI {
     "Some quick example text of the generator description. This is a long text so that the example will look good.";
   private static YEOMAN_PNG = "yeoman.png";
   private static isWin32 = (process.platform === 'win32');
-  private static CWD = path.join(os.homedir(), 'projects');
+  private static CWD: string = path.join(os.homedir(), 'projects');
   private static NODE_MODULES = 'node_modules';
 
   private static funcReplacer(key: any, value: any) {
@@ -115,11 +114,11 @@ export class YeomanUI {
     return errorMessage;
   }
 
-  public async getGenerators(): Promise<IPrompt> {
+  public async getGenerators(): Promise<IQuestionsPrompt> {
     // optimization: looking up generators takes a long time, so if generators are already loaded don't bother
     // on the other hand, we never look for newly installed generators...
 
-    const promise: Promise<IPrompt> = new Promise(resolve => {
+    const promise: Promise<IQuestionsPrompt> = new Promise(resolve => {
       const env: Environment.Options = this.getEnv();
       env.lookup(async () => this.onEnvLookup(env, resolve, this.genFilter));
     });
@@ -137,27 +136,13 @@ export class YeomanUI {
       const meta: Environment.GeneratorMeta = this.getGenMetadata(generatorName);
       // TODO: support sub-generators
       env.register(meta.resolved);
-      const gen: any = env.create(meta.namespace, {});
-      // check if generator defined a helper function called getPrompts()
-      const genGetPrompts = _.get(gen, "getPrompts");
-      if (genGetPrompts) {
-        const promptNames: any[] = genGetPrompts();
-        const prompts: IPrompt[] = promptNames.map(value => {
-          return _.assign({ questions: [], name: "", description: "" }, value);
-        });
-        this.setPrompts(prompts);
-      }
 
-      const genGetImage = _.get(gen, "getImage");
-      if (genGetImage) {
-        const image: any = genGetImage();
-        if (image.then) {
-          image.then((contents: string) => {
-            this.logger.debug(`image contents: ${contents}`);
-          });
-        } else if (image !== undefined) {
-          this.logger.debug(`image contents: ${image}`);
-        }
+      const genNamespace = this.getGenNamespace(generatorName);
+      const gen: any = env.create(genNamespace, {});
+      // check if generator defined a helper function called setPromptsCallback()
+      const setPromptsCallback = _.get(gen, "setPromptsCallback");
+      if (setPromptsCallback) {
+        setPromptsCallback(this.setPromptList.bind(this));
       }
       
       this.setGenInstall(gen);
@@ -216,7 +201,7 @@ export class YeomanUI {
   public async receiveIsWebviewReady() {
     try {
       // TODO: loading generators takes a long time; consider prefetching list of generators
-      const generators: IPrompt = await this.getGenerators();
+      const generators: IQuestionsPrompt = await this.getGenerators();
       const response: any = await this.rpc.invoke("showPrompt", [generators.questions, "select_generator"]);
       await this.runGenerator(response.name);
     } catch (error) {
@@ -235,18 +220,20 @@ export class YeomanUI {
   public async showPrompt(questions: Environment.Adapter.Questions<any>): Promise<inquirer.Answers> {
     this.currentQuestions = questions;
     
-      this.promptCount++;
-      const firstQuestionName = _.get(questions, "[0].name");
-      let promptName: string = `Step ${this.promptCount}`;
-      if (firstQuestionName) {
-        promptName = _.startCase(firstQuestionName);
-      }
-      const mappedQuestions: Environment.Adapter.Questions<any> = this.normalizeFunctions(questions);
-      if (_.isEmpty(mappedQuestions)) {
-        return {};
-      }
-      
-      return this.rpc.invoke("showPrompt", [mappedQuestions, promptName]);
+    this.promptCount++;
+    
+    const promptName: string = this.getPromptName(questions);
+    const mappedQuestions: Environment.Adapter.Questions<any> = this.normalizeFunctions(questions);
+    if (_.isEmpty(mappedQuestions)) {
+      return {};
+    }
+    
+    return this.rpc.invoke("showPrompt", [mappedQuestions, promptName]);
+  }
+
+  private getPromptName(questions: Environment.Adapter.Questions<any>): string {
+    const firstQuestionName = _.get(questions, "[0].name");
+    return (firstQuestionName ? _.startCase(firstQuestionName) : `Step ${this.promptCount}`);
   }
 
   private onGeneratorSuccess(generatorName: string, destinationRoot: string) {
@@ -337,12 +324,12 @@ export class YeomanUI {
       this.logError(error);
       return Promise.resolve(undefined);
     }
-    
+
     const genFilter: GeneratorFilter = GeneratorFilter.create(_.get(packageJson, ["generator-filter"]));
     const typeEqual: boolean = (filter.type === GeneratorType.all || filter.type === genFilter.type);
     const categoriesHasIntersection: boolean = (_.isEmpty(filter.categories) || !_.isEmpty(_.intersection(filter.categories, genFilter.categories)));
     if (typeEqual && categoriesHasIntersection) {
-        return this.createGeneratorChoice(genName, genPackagePath, packageJson);
+      return this.createGeneratorChoice(genName, genPackagePath, packageJson);
     }
 
     return Promise.resolve(undefined);
@@ -382,10 +369,10 @@ export class YeomanUI {
   }
 
   private getGenMetadata(genName: string): Environment.GeneratorMeta {
-    const namespace = this.getGenNamespace(genName);
-    const genMetadata = _.get(this, ["genMeta", namespace]);
+    const genNamespace = this.getGenNamespace(genName);
+    const genMetadata = _.get(this, ["genMeta", genNamespace]);
     if (_.isNil(genMetadata)) {
-      const debugMessage = `${namespace} generator metadata was not found.`;
+      const debugMessage = `${genNamespace} generator metadata was not found.`;
       this.logger.debug(debugMessage);
     }
     return genMetadata;
@@ -408,10 +395,18 @@ export class YeomanUI {
     return JSON.parse(JSON.stringify(questions, YeomanUI.funcReplacer));
   }
 
+  private setPromptList(prompts: IPrompt[]): Promise<void> {
+    const promptsToDisplay: IPrompt[] = prompts.map((prompt: IPrompt) => {
+      return _.assign({ questions: [], name: "", description: ""}, prompt);
+    });
+
+    return this.rpc.invoke("setPromptList", [promptsToDisplay]);
+  }
+  
   private addCustomQuestionEventHandlers(questions: Environment.Adapter.Questions<any>): void {
-    for (const index in questions) {
+    for (let index in questions) {
       const question = (questions as any[])[Number.parseInt(index)];
-      const questionHandlers = this.customQuestionEventHandlers.get((question as any)["guiType"]);
+      const questionHandlers = this.customQuestionEventHandlers.get(question.guiType);
       if (questionHandlers) {
         questionHandlers.forEach((handler, methodName) => {
           (question as any)[methodName] = handler;
@@ -419,8 +414,4 @@ export class YeomanUI {
       }
     }
   }
-
-  private setPrompts(prompts: IPrompt[]): Promise<void> {
-    return this.rpc.invoke("setPrompts", [prompts]);
-  }
 }
diff --git a/frontend/jest.config.js b/frontend/jest.config.js
index 1d4af42b..c2a53fe9 100644
--- a/frontend/jest.config.js
+++ b/frontend/jest.config.js
@@ -36,10 +36,10 @@ module.exports = {
   ],
   coverageThreshold: {
     "global": {
-      "branches": 94.2,
+      "branches": 95.8,
       "functions": 100,
-      "lines": 96.9,
-      "statements": 96.9
+      "lines": 98.1,
+      "statements": 98.1
     }
   }
 }
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 8efea644..916a2313 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -81,7 +81,6 @@
   </v-app>
 </template>
 
-
 <script>
 import Vue from "vue";
 import Loading from "vue-loading-overlay";
@@ -107,7 +106,6 @@ function initialState() {
     stepValidated: false,
     prompts: [],
     promptIndex: 0,
-    index: 0,
     rpc: Object,
     resolve: Object,
     reject: Object,
@@ -119,7 +117,8 @@ function initialState() {
     showConsole: false,
     messages: {},
     showBusyIndicator: false,
-    transitionToggle: false
+    transitionToggle: false,
+    promptsInfoToDisplay: []
   };
 }
 
@@ -190,9 +189,7 @@ export default {
         this.currentPrompt.questions[0].type==='generators';
     },
     setBusyIndicator() {
-      this.showBusyIndicator =
-        _.isEmpty(this.prompts) ||
-        (this.currentPrompt.status === PENDING && !this.isDone);
+      this.showBusyIndicator = _.isEmpty(this.prompts) || (this.currentPrompt.status === PENDING && !this.isDone);
     },
     next() {
       if (this.resolve) {
@@ -220,9 +217,8 @@ export default {
     },
     selectGenerator(generatorName, generatorPrettyName) {
       this.stepValidated = true;
-      const currentPrompt = this.currentPrompt;
-      if (currentPrompt) {
-        currentPrompt.answers.name = generatorName;
+      if (this.currentPrompt) {
+        _.set(this.currentPrompt, "answers.name", generatorName);
       }
       this.generatorName = generatorName;
       this.generatorPrettyName = generatorPrettyName;
@@ -237,51 +233,32 @@ export default {
     setMessages(messages) {
       this.messages = messages;
     },
+    setPromptList(prompts) {
+      prompts = prompts || [];
+      this.promptsInfoToDisplay = _.cloneDeep(prompts);
+      // replace all existing prompts except 1st (generator selction) and current prompt
+      const startIndex = this.promptIndex + 1;
+      const deleteCount = _.size(this.prompts) - this.promptIndex;
+      const itemsToInsert = prompts.splice(this.promptIndex, _.size(prompts));
+      this.prompts.splice(startIndex, deleteCount, ...itemsToInsert);
+    },
     setPrompts(prompts) {
-      // TODO:
-      //   if prompt name is provided, find an existing prompt based on key or name:
-      //     if found then update it
-      //     if not found then create a prompt
-      //   if no prompt name is provided, assign incoming question to current prompt
-      _.forEach(prompts, (prompt, index) => {
-        if (index === 0) {
-          if (prompt.status === PENDING) {
-            // new pending prompt
-            this.prompts.push(prompt);
-          } else {
-            if (this.currentPrompt) {
-              this.updateCurrentPrompt(prompt);
-            } else {
-              // first prompt (Select Generator)
-              prompt.active = true;
-              this.prompts.push(prompt);
-            }
-          }
-        } else {
-          // multiple prompts provided -- simply add them
-          this.prompts.push(prompt);
+      const firstIncomingPrompt = _.get(prompts, "[0]");
+      if (firstIncomingPrompt) {
+        let startIndex = this.promptIndex;
+        let deleteCount = prompts.length;
+        if (!this.currentPrompt || firstIncomingPrompt.status === PENDING) {
+          startIndex = this.promptIndex + 1;
+          deleteCount = 0;
         }
-      });
-    },
-    updateCurrentPrompt(prompt) {
-      this.currentPrompt.questions = prompt.questions;
-      if (
-        prompt.name &&
-        this.currentPrompt.name === this.messages.step_is_pending
-      ) {
-        this.currentPrompt.name = prompt.name;
-        this.currentPrompt.description = _.get(prompt, "description", "");
-      }
-      // if questions are provided, remote the pending status
-      if (_.size(prompt.questions) > 0) {
-        delete this.currentPrompt.status;
+        this.prompts.splice(startIndex, deleteCount, ...prompts);
       }
     },
     prepQuestions(questions) {
       for (let question of questions) {
         for (let prop in question) {
           if (question[prop] === FUNCTION) {
-            var that = this;
+            const that = this;
             question[prop] = async (...args) => {
               let showBusy = true;
               setTimeout(() => {
@@ -329,6 +306,10 @@ export default {
       if (name === "select_generator") {
         promptDescription = this.messages.select_generator_description;
         promptName = this.messages.select_generator_name;
+      } else {
+        const promptToDisplay = _.get(this.promptsInfoToDisplay, "[" + (this.promptIndex - 1) +"]");
+        promptDescription = _.get(promptToDisplay, "description", "");
+        promptName = _.get(promptToDisplay, "name", name);
       }
 
       const prompt = Vue.observable({
@@ -383,7 +364,7 @@ export default {
     initRpc() {
       const functions = [
         "showPrompt",
-        "setPrompts",
+        "setPromptList",
         "generatorInstall",
         "generatorDone",
         "log",
diff --git a/frontend/tests/App.spec.js b/frontend/tests/App.spec.js
index 05f89432..ba3e2faf 100644
--- a/frontend/tests/App.spec.js
+++ b/frontend/tests/App.spec.js
@@ -4,10 +4,10 @@ import Vue from 'vue'
 import Vuetify from 'vuetify'
 import { WebSocket } from 'mock-socket'
 
-Vue.use(Vuetify)
-global.WebSocket = WebSocket
+Vue.use(Vuetify);
+global.WebSocket = WebSocket;
 
-let wrapper
+let wrapper;
 
 describe('App.vue', () => {
   afterEach(() => {
@@ -23,15 +23,15 @@ describe('App.vue', () => {
   })
 
   describe('currentPrompt - computed', () => {
-    it.skip('questions are not defined', () => {
-      wrapper = initComponent(App, {}, true)
+    it('questions are not defined', () => {
+      wrapper = initComponent(App, {})
       wrapper.vm.prompts = [{}, {}]
       wrapper.vm.promptIndex = 1
       expect(wrapper.vm.currentPrompt.answers).toEqual({})
     })
 
     it('questions are defined', async () => {
-      wrapper = initComponent(App, {}, true)
+      wrapper = initComponent(App, {})
       await Vue.nextTick()
       wrapper.vm.prompts = [{
           questions: []
@@ -45,7 +45,7 @@ describe('App.vue', () => {
   })
 
   describe('setQuestionProps - method', () => {
-    test('set props', async () => {
+    it('set props', async () => {
       wrapper = initComponent(App, {}, true)
       wrapper.vm.rpc = {
         invoke: jest.fn().mockImplementation((...args) => { return args[1][1] })
@@ -81,7 +81,7 @@ describe('App.vue', () => {
     })
 
     // the delay ensures we call the busy indicator
-    test('validate() with delay', async () => {
+    it('validate() with delay', async () => {
       wrapper = initComponent(App, {}, true)
       wrapper.vm.rpc = {
         invoke: jest.fn().mockImplementation(async (...args) => {
@@ -108,7 +108,7 @@ describe('App.vue', () => {
     })
   })
 
-  test('initRpc - method', () => {
+  it('initRpc - method', () => {
     wrapper = initComponent(App, {}, true)
     wrapper.vm.rpc = {
       invoke: jest.fn(),
@@ -126,7 +126,6 @@ describe('App.vue', () => {
     wrapper.vm.initRpc();
     
     expect(registerMethodSpy).toHaveBeenCalledWith({func: wrapper.vm.showPrompt, thisArg: wrapper.vm, name: 'showPrompt'})
-    expect(registerMethodSpy).toHaveBeenCalledWith({func: wrapper.vm.setPrompts, thisArg: wrapper.vm, name: 'setPrompts'})
     expect(registerMethodSpy).toHaveBeenCalledWith({func: wrapper.vm.generatorInstall, thisArg: wrapper.vm, name: 'generatorInstall'})
     expect(registerMethodSpy).toHaveBeenCalledWith({func: wrapper.vm.generatorDone, thisArg: wrapper.vm, name: 'generatorDone'})
     expect(registerMethodSpy).toHaveBeenCalledWith({func: wrapper.vm.log, thisArg: wrapper.vm, name: 'log'})
@@ -136,7 +135,7 @@ describe('App.vue', () => {
     registerMethodSpy.mockRestore()
   })
 
-  test('runGenerator - method', () => {
+  it('runGenerator - method', () => {
     wrapper = initComponent(App, {}, true)
     wrapper.vm.rpc = {
       invoke: jest.fn()
@@ -150,7 +149,7 @@ describe('App.vue', () => {
     invokeSpy.mockRestore()
   })
 
-  test('log - method', () => {
+  it('log - method', () => {
     wrapper = initComponent(App, {}, true)
     wrapper.vm.logText = 'test_'
 
@@ -159,29 +158,31 @@ describe('App.vue', () => {
     expect(wrapper.vm.logText).toBe('test_test_log')
   })
 
-  test('selectGenerator - method', async () => {
-    wrapper = initComponent(App, {}, true)
-    wrapper.vm.generatorName = 'test_ge_name'
-
-    wrapper.vm.selectGenerator('testGeneratorName', 'Test Generator Name');
-    await Vue.nextTick();
-    
-    expect(wrapper.vm.generatorName).toBe('testGeneratorName')
-    expect(wrapper.vm.generatorPrettyName).toBe('Test Generator Name')
-  })
-
-  test.skip('onStepValidated - method', () => {
-    wrapper = initComponent(App, {}, true)
-    wrapper.vm.stepValidated = false
+  describe('selectGenerator - method', () => {
+    it('currentPrompt is undefined', () => {
+      wrapper = initComponent(App)
+      wrapper.vm.generatorName = 'test_ge_name'
 
-    wrapper.vm.onStepValidated(false);
-    expect(wrapper.vm.stepValidated).toBeFalsy()
+      wrapper.vm.selectGenerator('testGeneratorName', 'Test Generator Name');
+      
+      expect(wrapper.vm.generatorName).toBe('testGeneratorName')
+      expect(wrapper.vm.generatorPrettyName).toBe('Test Generator Name')
+    })
 
-    wrapper.vm.onStepValidated(true);
-    expect(wrapper.vm.stepValidated).toBeTruthy()
+    it('currentPrompt is defined', () => {
+      wrapper = initComponent(App)
+      wrapper.vm.prompts = [{}, {}]
+      wrapper.vm.promptIndex = 1
+      wrapper.vm.generatorName = 'test_ge_name'
+      wrapper.vm.selectGenerator('testGeneratorName', 'Test Generator Name');
+      
+      expect(wrapper.vm.generatorName).toBe('testGeneratorName')
+      expect(wrapper.vm.generatorPrettyName).toBe('Test Generator Name')
+      expect(wrapper.vm.currentPrompt.answers.name).toBe('testGeneratorName')
+    })
   })
 
-  test('setMessages - method', () => {
+  it('setMessages - method', () => {
     wrapper = initComponent(App, {}, true)
     expect(wrapper.vm.messages).toEqual({})
 
@@ -190,8 +191,8 @@ describe('App.vue', () => {
   })
 
   describe('next - method', () => {
-    test('promptIndex is greater than prompt quantity, resolve is defined', () => {
-      wrapper = initComponent(App, {}, true)
+    it('promptIndex is greater than prompt quantity, resolve is defined', () => {
+      wrapper = initComponent(App, {})
       wrapper.vm.resolve = jest.fn()
       wrapper.vm.reject = jest.fn()
       wrapper.vm.promptIndex = 1 
@@ -207,8 +208,8 @@ describe('App.vue', () => {
       resolveSpy.mockRestore()
     })
 
-    test('resolve method throws an exception', () => {
-      wrapper = initComponent(App, {}, true)
+    it('resolve method throws an exception', () => {
+      wrapper = initComponent(App, {})
      
       wrapper.vm.resolve = () => {
         throw new Error('test_error')
@@ -227,8 +228,8 @@ describe('App.vue', () => {
       rejectSpy.mockRestore()
     })
 
-    test('resolve method does not exist', () => {
-      wrapper = initComponent(App, {}, true)
+    it('resolve method does not exist', () => {
+      wrapper = initComponent(App, {})
      
       wrapper.vm.resolve = undefined
       wrapper.vm.promptIndex = 1 
@@ -242,57 +243,35 @@ describe('App.vue', () => {
     })
   })
 
-  describe('updateCurrentPrompt - method', () => {
-    test('currentPrompt status should be deleted', () => {
+  describe('setPromptList - method', () => {
+    it('prompts is empty array', () => {
       wrapper = initComponent(App)
       
-      wrapper.vm.prompts = [{}, {status: "testStatus", name: "name2"}]
+      wrapper.vm.prompts = [{}, {}]
       wrapper.vm.promptIndex = 1
+      wrapper.vm.currentPrompt.status = 'pending'
 
-      wrapper.vm.currentPrompt.status = "status";
-      wrapper.vm.updateCurrentPrompt({questions: [{}, {}]})
-      expect(wrapper.vm.currentPrompt.status).toBeUndefined()
-    })
+      wrapper.vm.setPromptList([])
 
-    test('currentPrompt status should not be deleted', () => {
-      wrapper = initComponent(App)
-      
-      wrapper.vm.prompts = [{}, {status: "testStatus", name: "name2"}]
-      wrapper.vm.promptIndex = 1
-
-      wrapper.vm.currentPrompt.status = "status";
-      wrapper.vm.updateCurrentPrompt({questions: []})
-      expect(wrapper.vm.currentPrompt.status).not.toBeUndefined()
+      expect(wrapper.vm.prompts).toHaveLength(2)
     })
 
-    test('only currentPrompt questions are updated', () => {
+    it('prompts is undefined', () => {
       wrapper = initComponent(App)
       
-      wrapper.vm.prompts = [{}, {status: "testStatus", name: "name2"}]
+      wrapper.vm.prompts = [{}, {}]
       wrapper.vm.promptIndex = 1
+      wrapper.vm.currentPrompt.status = 'pending'
 
-      wrapper.vm.updateCurrentPrompt({questions: [{}, {}, {}, {}]})
-      expect(wrapper.vm.currentPrompt.questions).toHaveLength(4)
-    })
-
-    test('prompt name and description', () => {
-      wrapper = initComponent(App)
-      
-      wrapper.vm.prompts = [{}, {name: "Loading..."}]
-      wrapper.vm.promptIndex = 1
+      wrapper.vm.setPromptList()
 
-      wrapper.vm.setMessages({step_is_pending: "Loading..."});
-      wrapper.vm.updateCurrentPrompt({name: "name2", description: "desc2", questions: [{}, {}, {}, {}]})
-      expect(wrapper.vm.currentPrompt.questions).toHaveLength(4)
-      expect(wrapper.vm.currentPrompt.name).toBe("name2");
-      expect(wrapper.vm.currentPrompt.description).toBe("desc2");
+      expect(wrapper.vm.prompts).toHaveLength(2)
     })
-
-  });
+  })
 
   describe('generatorInstall - method', () => {
-    test('status is pending', () => {
-      wrapper = initComponent(App, {}, true)
+    it('status is pending', () => {
+      wrapper = initComponent(App, {})
       
       wrapper.vm.prompts = [{}, {}]
       wrapper.vm.promptIndex = 1
@@ -306,7 +285,7 @@ describe('App.vue', () => {
 
   describe('generatorDone - method', () => {
     test('status is pending', () => {
-      wrapper = initComponent(App, {donePath: 'testDonePath'}, true)
+      wrapper = initComponent(App, {donePath: 'testDonePath'})
       wrapper.vm.prompts = [{}, {}]
       wrapper.vm.promptIndex = 1
       wrapper.vm.currentPrompt.status = 'pending'
@@ -322,14 +301,14 @@ describe('App.vue', () => {
 
   describe('setBusyIndicator - method', () => {
     it('prompts is empty', () => {
-      wrapper = initComponent(App, {}, true)
+      wrapper = initComponent(App)
       wrapper.vm.prompts = []
       wrapper.vm.setBusyIndicator()
       expect(wrapper.vm.showBusyIndicator).toBeTruthy()
     })
 
     it('isDone is false, status is pending, prompts is not empty', () => {
-      wrapper = initComponent(App, {}, true)
+      wrapper = initComponent(App)
       wrapper.vm.prompts = [{}, {}]
       wrapper.vm.isDone = false
       wrapper.vm.currentPrompt.status = 'pending'
@@ -338,7 +317,7 @@ describe('App.vue', () => {
     })
 
     it('isDone is true, status is pending, prompts is not empty', () => {
-      wrapper = initComponent(App, {}, true)
+      wrapper = initComponent(App)
       wrapper.vm.prompts = [{}, {}]
       wrapper.vm.isDone = true
       wrapper.vm.currentPrompt.status = 'pending'
@@ -348,7 +327,7 @@ describe('App.vue', () => {
   })
 
   describe('toggleConsole - method', () => {
-    test('showConsole property updated from toggleConsole()', () => {
+    it('showConsole property updated from toggleConsole()', () => {
       wrapper = initComponent(App, {}, true)
       wrapper.vm.toggleConsole()
       expect(wrapper.vm.showConsole).toBeTruthy()
@@ -358,7 +337,7 @@ describe('App.vue', () => {
   })
 
   describe('init - method', () => {
-    test('isInVsCode = true', () => {
+    it('isInVsCode = true', () => {
       wrapper = initComponent(App)
       
       wrapper.vm.isInVsCode = jest.fn().mockReturnValue(true)
@@ -369,7 +348,7 @@ describe('App.vue', () => {
       expect(wrapper.vm.consoleClass).toBe('consoleClassHidden')
     })
 
-    test('isInVsCode = false', () => {
+    it('isInVsCode = false', () => {
       wrapper = initComponent(App)
       
       wrapper.vm.isInVsCode = jest.fn().mockReturnValue(false)
@@ -377,10 +356,9 @@ describe('App.vue', () => {
 
       expect(wrapper.vm.consoleClass).toBe('consoleClassVisible')
     })
-
   })
 
-  test('reload - method', () => {
+  it('reload - method', () => {
     wrapper = initComponent(App)
 
     wrapper.vm.rpc = {
@@ -402,7 +380,7 @@ describe('App.vue', () => {
 
   describe('headerTitle - computed', () => {
     it('generatorPrettyName is empty', () => {
-      wrapper = initComponent(App, {}, true)
+      wrapper = initComponent(App)
       wrapper.vm.prompts = [{}, {}]
       wrapper.vm.promptIndex = 1
       wrapper.vm.$data.generatorPrettyName = null;
@@ -410,8 +388,8 @@ describe('App.vue', () => {
       expect(wrapper.vm.headerTitle).toEqual("yeoman_ui_title")
     })
 
-    it('generatorPrettyName is not empty', async () => {
-      wrapper = initComponent(App, {}, true)
+    it('generatorPrettyName is not empty', () => {
+      wrapper = initComponent(App)
       wrapper.vm.prompts = [{}, {}]
       wrapper.vm.promptIndex = 1
       wrapper.vm.$data.generatorPrettyName = "testGeneratorPrettyName";
diff --git a/frontend/tests/components/Header.spec.js b/frontend/tests/components/Header.spec.js
index fbe1b268..3e30dc61 100644
--- a/frontend/tests/components/Header.spec.js
+++ b/frontend/tests/components/Header.spec.js
@@ -43,9 +43,6 @@ describe('Header.vue', () => {
     test('click triggers reload method', async () => {
         const rpcInvokeMockFunction = jest.fn()
         wrapper = initComponent(Header, {
-            rpc: {
-                invoke: rpcInvokeMockFunction
-            }
         }, true)
         
         wrapper.findAll("button").wrappers[1].trigger('click')
diff --git a/generator-foodq/generators/app/index.js b/generator-foodq/generators/app/index.js
index bcb5f481..f5b38588 100644
--- a/generator-foodq/generators/app/index.js
+++ b/generator-foodq/generators/app/index.js
@@ -3,18 +3,24 @@ var chalkPipe = require('chalk-pipe');
 var Inquirer = require('inquirer');
 var path = require('path');
 var _ = require('lodash');
+var types = require('@sap-devx/yeoman-ui-types');
 
 module.exports = class extends Generator {
   constructor(args, opts) {
     super(args, opts);
 
-    this.getPrompts = function () {
-      console.log('in getPrompts()');
+    this.setPromptsCallback = fn => {
+      if (this.prompts) {
+        this.prompts.setCallback(fn);
+      }
+    };
 
-      return [{ name: "Prompt 1", description: "Prompt 1 Description\nWe are happy to welcome you to our family restaurant" },
-              { name: "Prompt 2", description: "Prompt 2 Description\nWe hope you enjoy our authentic food" },
-              { name: "Registration", description: "Thank you for your interest in our resturant.\nPlease enter credentials to register.\n(it shouldn't take you more then 1 minute)" }];
-    }
+    var prompts = [
+      {name: "Hunger Info", description: "Hunger Info Description"},
+      {name: "Hunger Level", description: "Hunger Level Description"},
+      {name: "Registration", description: "Thank you for your interest in our resturant.\nPlease enter credentials to register.\n(it shouldn't take you more then 1 minute)"}
+    ];
+    this.prompts = new types.Prompts(prompts);
 
     this.option('babel');
   }
@@ -27,8 +33,8 @@ module.exports = class extends Generator {
     // returns '~/projects/index.js'
   }
 
-  async default() {
-    this.composeWith(require.resolve("../app2"), this.projectEnvironment);
+  async initializing() {
+    this.composeWith(require.resolve("../app2"), { prompts: this.prompts });
   }
 
   async prompting() {
@@ -115,11 +121,10 @@ module.exports = class extends Generator {
     ];
 
     this.answers = await this.prompt(prompts);
-    this.log("Food", this.answers.food);
 
     // currently not supported:
     const ui = new Inquirer.ui.BottomBar();
-    this.log("xx");
+
     ui.updateBottomBar("This is written to the bottom bar");
 
     prompts = [
@@ -199,8 +204,8 @@ module.exports = class extends Generator {
       }
     ];
 
-
     const answers = await this.prompt(prompts);
+
     this.answers = Object.assign({}, this.answers, answers);
     this.log("Hunger level", this.answers.hungerLevel);
 
@@ -276,7 +281,7 @@ module.exports = class extends Generator {
     this.destinationRoot(path.join(this.destinationRoot(), _.get(this, "answers.food", "")));
     this.log('destinationRoot: ' + this.destinationRoot());
     this.fs.copyTpl(this.templatePath('index.html'),
-    this.destinationPath('public/index.html'), {
+      this.destinationPath('public/index.html'), {
       title: 'Templating with Yeoman',
       hungry: this.answers.hungry,
       confirmHungry: this.answers.confirmHungry,
@@ -284,17 +289,17 @@ module.exports = class extends Generator {
       beers: this.answers.beers,
       fav_color: this.answers.fav_color,
       number: this.answers.number,
-      
+
       hungerLevel: this.answers.hungerLevel,
       dessert: this.answers.dessert,
       enjoy: this.answers.enjoy,
       comments: this.answers.comments,
-      
+
       repotype: this.answers.repotype,
       repoperms: this.answers.repoperms,
       email: this.answers.email,
       password: this.answers.password
-      }
+    }
     );
     this.fs.copy(
       this.templatePath('README.md'),
diff --git a/generator-foodq/generators/app2/index.js b/generator-foodq/generators/app2/index.js
index d900d42d..dc9b728e 100644
--- a/generator-foodq/generators/app2/index.js
+++ b/generator-foodq/generators/app2/index.js
@@ -1,35 +1,76 @@
 var Generator = require('yeoman-generator');
+var _ = require('lodash');
 
 module.exports = class extends Generator {
   constructor(args, opts) {
     super(args, opts);
+    this.prompts = opts.prompts;
+    this.parentPromptsQuantity = this.prompts.size();
 
-    this.getPrompts = function() {
-      console.log('in getPrompts()');
-      return [{name:"Prompt 1 app2"},{name: "Prompt 2 app2"}];
-    }
+    this.dynamicAddressPrompt = {name: "Address", description: "Address Description"};
+
+    const prompts = [
+      {name: "Delivery", description: "Delivery Description"},
+      this.dynamicAddressPrompt,
+      {name: "Tip", description: "Tip Description"}];
+
+    this.prompts.splice(this.parentPromptsQuantity, 0, prompts);
   }
 
   async prompting() {
-    let prompts = [
+    // isDelivery question appears twice in CLI: https://github.com/yeoman/generator/issues/1100
+    const prompts = [
       {
         type: "confirm",
-        name: "isTakeaway",
-        message: "Do you want to take away?"
+        name: "isDelivery",
+        message: "Do you want to get food near your home?"
       },
       {
-        when: (response)=>{
-          return response.isTakeaway;
-        },
-        type: "input",
-        name: "address",
-        message: "Your Address"
+        type: "list",
+        name: "deliveryMethod",
+        message: "Delivery method",
+        choices: [
+          "Car",
+          "Drone"
+        ],
+        when: answers => {
+          const indexOfAddress = _.findIndex(this.prompts.items, prompt => {
+            return prompt.name === this.dynamicAddressPrompt.name;
+          });
+
+          let bWhen = false;
+          if (answers.isDelivery) {
+            // add address prompt if doesn't exist
+            if (indexOfAddress === -1) {
+              this.prompts.splice(this.parentPromptsQuantity + 1, 0, this.dynamicAddressPrompt);
+            }
+            bWhen = true;
+          } else {
+            // remove address prompt if exists
+            if (indexOfAddress > -1) {
+              this.prompts.splice(indexOfAddress, 1);
+            }
+          }
+
+          return bWhen;
+        }
       }
     ];
 
     this.answers = await this.prompt(prompts);
 
-    let prompts2 = [
+    if (this.answers.isDelivery) {
+      const addressPrompt = [
+        {
+          type: "input",
+          name: "address",
+          message: "Your Address"
+        }
+      ];
+      this.answers = await this.prompt(addressPrompt);
+    }
+
+    const tipPrompt = [
       {
         type: "number",
         name: "tip",
@@ -38,6 +79,6 @@ module.exports = class extends Generator {
       }
     ];
 
-    this.answers = await this.prompt(prompts2);
+    this.answers = await this.prompt(tipPrompt);
   }
 };
diff --git a/generator-foodq/package.json b/generator-foodq/package.json
index b4073e0e..3bbce2ae 100644
--- a/generator-foodq/package.json
+++ b/generator-foodq/package.json
@@ -23,7 +23,8 @@
     "yeoman-generator": "^1.1.1",
     "chalk": "^2.0.0",
     "inquirer": "^6.2.2",
-    "lodash": "^4.17.15"
+    "lodash": "^4.17.15",
+    "@sap-devx/yeoman-ui-types": "0.0.1"
   },
   "generator-filter": {
     "type": "project"
diff --git a/types/.gitignore b/types/.gitignore
new file mode 100644
index 00000000..3c3629e6
--- /dev/null
+++ b/types/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/types/package.json b/types/package.json
new file mode 100644
index 00000000..9b897082
--- /dev/null
+++ b/types/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "@sap-devx/yeoman-ui-types",
+  "displayName": "yeoman-ui-types",
+  "description": "Yeoman-UI prompt types",
+  "version": "0.0.1",
+  "author": "SAP SE",
+  "publisher": "SAP",
+  "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/SAP/yeoman-ui.git"
+  },
+  "main": "out/src/Prompts.js",
+  "types": "",
+  "files": [
+    "out/src/*"
+  ],
+  "scripts": {
+    "compile": "tsc -p ./",
+    "watch": "tsc -watch -p ./"
+  },
+  "dependencies": {
+    "typescript": "^3.8.3"
+  }
+}
diff --git a/types/src/Prompts.ts b/types/src/Prompts.ts
new file mode 100644
index 00000000..ee231649
--- /dev/null
+++ b/types/src/Prompts.ts
@@ -0,0 +1,31 @@
+export class Prompts {
+    private callback: any;
+
+    constructor(private items: IPrompt[] = []) { }
+
+    public splice(start: number, deleteCount: number, items: IPrompt[]) {
+        if (items) {
+            items = Array.isArray(items) ? items : [items];
+            this.items.splice(start, deleteCount, ...items);
+        } else {
+            this.items.splice(start, deleteCount);
+        }
+        if (this.callback) {
+            this.callback(this.items);
+        }
+    }
+
+    public setCallback(callback: any) {
+        this.callback = callback;
+        callback(this.items);
+    }
+
+    public size() {
+        return this.items.length;
+    }
+}
+
+export interface IPrompt {
+    name: string;
+    description: string;
+}
\ No newline at end of file
diff --git a/types/tsconfig.json b/types/tsconfig.json
new file mode 100644
index 00000000..30da994e
--- /dev/null
+++ b/types/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+      "allowJs": false,
+      "lib": ["es6"],
+      "listEmittedFiles": false,
+      "listFiles": false,
+      "module": "commonjs",
+      "noFallthroughCasesInSwitch": true,
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "outDir": "./out",
+      "removeComments": true,
+      "experimentalDecorators": true,
+      "rootDir": ".",
+      "rootDirs": ["./src"],
+      "skipLibCheck": true,
+      "sourceMap": true,
+      "target": "es6",
+      "traceResolution": false,
+      "declaration": true,
+      "alwaysStrict": true,
+      "esModuleInterop": true
+    },
+    "include": ["./src/**/*"]
+  }
\ No newline at end of file