Ensure backwards compatibile behaviour with the datasource parameter. RE: #48