Cleaning up the adapter data source API to avoid some synchronization issues.