Improving prompts and dependencies