Fixed MCP functions