Updated to new MCP and fixed 1.6 compliance issues.