Fixing the import issue