Bringing back SmartSync