Add new synching logic