Fixing issue with not providing a datasource