Add move statements to MCP constructor

10 jobs for update_headers in 41 minutes and 11 seconds (queued for 2 seconds)