Core changes related to ObservableDataSource