Feature/replace dataset uri