Fix for MCP updates, also use getItem