Improve data sync loading support.