Added optional and conditional prompts