Updated MCP Mappings + Some More Integration