diff --git a/dhscanner-bitcode.cabal b/dhscanner-bitcode.cabal
--- a/dhscanner-bitcode.cabal
+++ b/dhscanner-bitcode.cabal
@@ -20,7 +20,7 @@
     in mind. The commands resemble an abstract RISC-style assembley, motivated by keeping
     later-phases analyses as simple as possible.
 
-version:            1.0.13
+version:            1.0.14
 license:            GPL-3.0-only
 license-file:       LICENSE
 author:             OrenGitHub
diff --git a/src/Fqn.hs b/src/Fqn.hs
--- a/src/Fqn.hs
+++ b/src/Fqn.hs
@@ -21,11 +21,12 @@
 -- * Unidirectional resolution only ( one pass )
 --
 data Fqn
-   = Imported ImportedContent
-   | ClassInstance ClassInstanceContent
+   = ClassInstance ClassInstanceContent
    | ClassName ClassNameContent
    | FieldedAccess Fqn Token.FieldName
    | CallMethodOfClass Location String Token.ClassName
+   | FirstPartyImport FirstPartyImportContent
+   | ThirdPartyImport ThirdPartyImportContent
    | NativeTypeInt
    | NativeTypeString
    | NativeTypeBool
@@ -36,24 +37,55 @@
    | Unknwon
    deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
 
-data ImportedContent
-   = ImportedLocal ImportedLocalContent
-   | ImportedThirdParty ImportedThirdPartyContent
-   deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
-
-data ImportedLocalContent
-   = ImportedLocalContent
+data FirstPartyImportContent
+   = FirstPartyImportContent
      {
-         importedLocalLocation :: FilePath,
-         importedLocalRest :: [ String ]
+         firstPartyImportedLocation :: FilePath,
+         firstPartyImportedName :: Maybe String
      }
      deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
 
-data ImportedThirdPartyContent
-   = ImportedThirdPartyContent
+-- |
+--
+-- ==== __Examples:__
+--
+-- * Entire third party package import
+--
+-- @
+-- # thirdPartyImportedPackageName == "urllib3"
+-- # thirdPartyImportedPartsFromPackage == []
+-- # thirdPartyImportJustOneName == Nothing
+-- # thirdPartyImportWithAlias == Nothing
+-- import urllib3
+-- @
+--
+-- * Specific third party import
+--
+-- @
+-- # thirdPartyImportedPackageName == "scipy"
+-- # thirdPartyImportedPartsFromPackage == [ "linalg" ]
+-- # thirdPartyImportJustOneName == Nothing
+-- # thirdPartyImportWithAlias == Nothing
+-- import scipy.linalg
+-- @
+--
+-- * Named third party import
+--
+-- @
+-- # thirdPartyImportedPackageName == "django"
+-- # thirdPartyImportedPartsFromPackage == [ "db" ]
+-- # thirdPartyImportJustOneName == "models"
+-- # thirdPartyImportWithAlias == Nothing
+-- from django.db import models
+-- @
+--
+data ThirdPartyImportContent
+   = ThirdPartyImportContent
      {
-         importedThirdPartyName :: String,
-         importedThirdPartyRest :: [ String ]
+         thirdPartyImportedPackageName :: String,
+         thirdPartyImportedPartsFromPackage :: [ String ],
+         thirdPartyImportJustOneName :: Maybe String,
+         thirdPartyImportWithAlias :: Maybe String
      }
      deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
 
