Expanding and updating MCP classes, base class, and main script.