Added loging, DataSourceException