Prompt command refactor