Added support for more prompts