Added MCP classes