Update imports for TB 0.8.0