Updated load mechanism for new mcp methods