Improve SnapSync integration