More steps toward graphing by reusing datasource