Updated to support next version of sync API.