Add tuple {ok, Ds} as return instead of just Ds

When creating Datasource