diff --git a/doc/conf.py b/doc/conf.py
index bb8df14e3..5b45b230d 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -37,7 +37,7 @@ def _LatestTagName():
 
 # The full version, including alpha/beta/rc tags
 version = "0.7"     # The short X.Y version.
-release = "0.7.1"   # The full version, including alpha/beta/rc tags.
+release = "0.7.3"   # The full version, including alpha/beta/rc tags.
 try:
 	if _IsUnderGitControl:
 		latestTagName = _LatestTagName()[1:]		# remove prefix "v"
diff --git a/pyVHDLModel/__init__.py b/pyVHDLModel/__init__.py
index afa897fde..9f2606031 100644
--- a/pyVHDLModel/__init__.py
+++ b/pyVHDLModel/__init__.py
@@ -36,3 +36,4 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # ==============================================================================
+__version__ = "0.7.3"
diff --git a/setup.py b/setup.py
index 7f4513a8b..faafa05bb 100644
--- a/setup.py
+++ b/setup.py
@@ -2,12 +2,12 @@
 # vim: tabstop=2:shiftwidth=2:noexpandtab
 # kate: tab-width 2; replace-tabs off; indent-width 2;
 # =============================================================================
-#             __     ___   _ ____  _     __  __           _      _
-#   _ __  _   \ \   / / | | |  _ \| |   |  \/  | ___   __| | ___| |
-#  | '_ \| | | \ \ / /| |_| | | | | |   | |\/| |/ _ \ / _` |/ _ \ |
-#  | |_) | |_| |\ V / |  _  | |_| | |___| |  | | (_) | (_| |  __/ |
-#  | .__/ \__, | \_/  |_| |_|____/|_____|_|  |_|\___/ \__,_|\___|_|
-#  |_|    |___/
+#            __     ___   _ ____  _     __  __           _      _
+#  _ __  _   \ \   / / | | |  _ \| |   |  \/  | ___   __| | ___| |
+# | '_ \| | | \ \ / /| |_| | | | | |   | |\/| |/ _ \ / _` |/ _ \ |
+# | |_) | |_| |\ V / |  _  | |_| | |___| |  | | (_) | (_| |  __/ |
+# | .__/ \__, | \_/  |_| |_|____/|_____|_|  |_|\___/ \__,_|\___|_|
+# |_|    |___/
 # =============================================================================
 # Authors:            Patrick Lehmann
 #
@@ -33,24 +33,30 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============================================================================
 #
-import setuptools
+from pathlib    import Path
+from setuptools import setup as setuptools_setup, find_packages as setuptools_find_packages
 
-with open("README.md", "r") as file:
-	long_description = file.read()
+gitHubNamespace = "vhdl"
+projectName =     "pyVHDLModel"
 
-requirements = []
-with open("requirements.txt") as file:
-	for line in file.readlines():
-		requirements.append(line)
+# Read README for upload to PyPI
+readmeFile = Path("README.md")
+with readmeFile.open("r") as file:
+	long_description = file.read()
 
-projectName = "pyVHDLModel"
+# Read requirements file and add them to package dependency list
+requirementsFile = Path("requirements.txt")
+with requirementsFile.open("r") as file:
+	requirements = [line for line in file.readlines()]
 
-github_url =  "https://github.com/vhdl/" + projectName
-rtd_url =     "https://" + projectName + ".readthedocs.io/en/latest/"
+# Derive URLs
+sourceCodeURL =     "https://github.com/{namespace}/{projectName}".format(namespace=gitHubNamespace, projectName=projectName)
+documentationURL =  "https://{namespace}.github.io/{projectName}".format(namespace=gitHubNamespace, projectName=projectName)
 
-setuptools.setup(
+# Assemble all package information
+setuptools_setup(
 	name=projectName,
-	version="0.7.2",
+	version="0.7.3",
 
 	author="Patrick Lehmann",
 	author_email="Paebbels@gmail.com",
@@ -61,34 +67,32 @@
 	long_description=long_description,
 	long_description_content_type="text/markdown",
 
-	url=github_url,
+	url=sourceCodeURL,
 	project_urls={
-		'Documentation': rtd_url,
-		'Source Code':   github_url,
-		'Issue Tracker': github_url + "/issues"
+		'Documentation': documentationURL,
+		'Source Code':   sourceCodeURL,
+		'Issue Tracker': sourceCodeURL + "/issues"
 	},
 	# download_url="https://github.com/vhdl/pyVHDLModel/tarball/0.1.0",
 
-	packages=setuptools.find_packages(),
-	# entry_points={
-	# 	'console_scripts': [
-	# 		"VHDLParser = pyVHDLParser.CLI.VHDLParser:main"
-	# 	]
-	# },
+	packages=setuptools_find_packages(),
 	classifiers=[
 		"License :: OSI Approved :: Apache Software License",
 		"Operating System :: OS Independent",
 		"Programming Language :: Python :: 3 :: Only",
+		"Programming Language :: Python :: 3.7",
 		"Programming Language :: Python :: 3.8",
+		"Programming Language :: Python :: 3.9",
    "Development Status :: 3 - Alpha",
 #		"Development Status :: 5 - Production/Stable",
 		"Intended Audience :: Developers",
+		"Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)",
+		"Topic :: Software Development :: Code Generators",
+		"Topic :: Software Development :: Compilers",
 		"Topic :: Utilities"
 	],
 	keywords="Python3 VHDL Language Model Abstract",
 
-	python_requires='>=3.8',
+	python_requires='>=3.7',
 	install_requires=requirements,
-	# provides=
-	# obsoletes=
 )