Maybe update MCP to java1.7