Updated for new MCP mappings/forge.