Fixed imports for version8.0