Better support for prompting