Rework carrier sync functionality