Updates to automatically check for datasource.
Commenting out the eventHandler for now.