Adapted most missing method signatures on Client interface; Addapted all missing method signatures on DatasourceManager interface.