diff --git a/dhscanner-ast.cabal b/dhscanner-ast.cabal
--- a/dhscanner-ast.cabal
+++ b/dhscanner-ast.cabal
@@ -22,7 +22,7 @@
     and models both of them as plain sequential code blocks. Every file has exactly one ast that represents it.
     Non Haskell parogrammers note: The ast is /immutable/ (like everything else in Haskell ...)
 
-version:            0.1.0.3
+version:            0.1.0.4
 license:            GPL-3.0-only
 license-file:       LICENSE
 author:             OrenGitHub
diff --git a/src/Ast.hs b/src/Ast.hs
--- a/src/Ast.hs
+++ b/src/Ast.hs
@@ -81,6 +81,7 @@
    | ExpStr ExpStrContent
    | ExpVar ExpVarContent
    | ExpBool ExpBoolContent
+   | ExpNull ExpNullContent
    | ExpCall ExpCallContent
    | ExpBinop ExpBinopContent
    | ExpLambda ExpLambdaContent
@@ -90,9 +91,8 @@
    = StmtExp Exp
    | StmtIf StmtIfContent
    | StmtTry StmtTryContent
-   | StmtCall ExpCallContent
    | StmtFunc StmtFuncContent
-   | StmtDecvar DecVarContent
+   | StmtBlock StmtBlockContent
    | StmtBreak StmtBreakContent
    | StmtClass StmtClassContent
    | StmtWhile StmtWhileContent
@@ -100,6 +100,7 @@
    | StmtMethod StmtMethodContent
    | StmtAssign StmtAssignContent
    | StmtReturn StmtReturnContent
+   | StmtVardec StmtVardecContent
    | StmtContinue StmtContinueContent
    deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
 
@@ -170,19 +171,13 @@
      }
      deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
 
-data DecPackageContent
-   = DecPackageContent
-     {
-         decPackageName :: Token.PkgName
-     }
-     deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
-
-data DecVarContent
-   = DecVarContent
+data StmtVardecContent
+   = StmtVardecContent
      {
-         decVarName :: Token.VarName,
-         decVarNominalType :: Token.NominalTy,
-         decVarInitValue :: Maybe Exp
+         stmtVardecName :: Token.VarName,
+         stmtVardecNominalType :: Token.NominalTy,
+         stmtVardecInitValue :: Maybe Exp,
+         stmtVardecLocation :: Location
      }
      deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
 
@@ -207,6 +202,13 @@
      }
      deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
 
+data ExpNullContent
+   = ExpNullContent
+     {
+         expNullValue :: Token.ConstNull
+     }
+     deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
+
 data Operator
    = PLUS
    | MINUS
@@ -265,11 +267,49 @@
      }
      deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
 
+data StmtBlockContent
+   = StmtBlockContent
+     {
+         stmtBlockLocation :: Location
+     }
+     deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
+
+-- |
+-- ==== __Examples:__
+-- 
+-- * Simple source import
+--
+-- @
+-- # stmtImportSource is "json" 
+-- # stmtImportFromSource is Nothing 
+-- # stmtImportAlias is Nothing
+-- import json
+-- @
+--
+-- * Specifying a specific name from source
+--
+-- @
+-- # stmtImportSource is "urllib.parse"
+-- # stmtImportFromSource is Just "urljoin"
+-- # stmtImportAlias is Nothing
+-- from urllib.parse import urljoin
+-- @
+--
+-- * Specifying an alias for a source import
+--
+-- @
+-- # stmtImportSource is "networkx"
+-- # stmtImportFromSource is Nothing
+-- # stmtImportAlias is Just "nx"
+-- import networkx as nx
+-- @
+--
 data StmtImportContent
    = StmtImportContent
      {
-         stmtImportName :: String,
-         stmtImportAlias :: String,
+         stmtImportSource :: String,
+         stmtImportFromSource :: Maybe String,
+         stmtImportAlias :: Maybe String,
          stmtImportLocation :: Location
      }
      deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
diff --git a/src/Token.hs b/src/Token.hs
--- a/src/Token.hs
+++ b/src/Token.hs
@@ -121,3 +121,10 @@
        constStrLocation :: Location
    }
    deriving ( Show, Eq, Generic, ToJSON, FromJSON, Ord )
+
+data ConstNull
+   = ConstNull
+   {
+       constNullLocation :: Location
+   }
+   deriving ( Show, Eq, Generic, ToJSON, FromJSON, Ord )