Re-structuring MCP once more.