Update imports for 3.0