Add better prompts for the new DB