Updated to new Forge/MCP mappings