Changed DataSources to open on-demand and also for callback registration to be performed before opening