Removed an import cycle