Move update checks from P2Util to UpdateHandler