Add PatchUtils to improve patch operation