Improved prompts and node creation