Update prompt and change some mappings