Added a few more features, matched with prompts.php