Updated for 1.5 with MCP 7.42pre2