diff --git a/features/com.minres.scviewer.database.feature/feature.properties b/features/com.minres.scviewer.database.feature/feature.properties
index 767ee18..1a8f646 100644
--- a/features/com.minres.scviewer.database.feature/feature.properties
+++ b/features/com.minres.scviewer.database.feature/feature.properties
@@ -1,6 +1,6 @@
-featureName=SystemC simulation results viewer
+featureName=SystemC simulation results viewer database loaders
 providerName=MINRES Technologies GmbH
-updateSiteName=SC Viewer Database Updates
+updateSiteName=SC Viewer Database Loader Updates
 description=A viewer for SystemC Verification Library transactions and VCD signals.
 licenseURL=license.html
 license=\
diff --git a/features/com.minres.scviewer.database.feature/feature.xml b/features/com.minres.scviewer.database.feature/feature.xml
index d9c7fd8..0220ea3 100644
--- a/features/com.minres.scviewer.database.feature/feature.xml
+++ b/features/com.minres.scviewer.database.feature/feature.xml
@@ -6,9 +6,7 @@
       provider-name="%providerName">
 
    <description>
-      A viewer for SystemC Verification Library transactions and VCD 
-signals. It supports a SQLite based recording as well as the built-in
-text base recording.
+      The database loaders for SystemC Verification Library transactions and VCD signals. They support SQLite based recording as well as the built-in text base recording.
    </description>
 
    <copyright>
diff --git a/features/com.minres.scviewer.ui.feature/feature.properties b/features/com.minres.scviewer.ui.feature/feature.properties
new file mode 100644
index 0000000..704f2e1
--- /dev/null
+++ b/features/com.minres.scviewer.ui.feature/feature.properties
@@ -0,0 +1,102 @@
+featureName=SCViewer UI elements
+providerName=MINRES Technologies GmbH
+updateSiteName=SC Viewer UI Updates
+description=A viewer for SystemC Verification Library transactions and VCD signals.
+licenseURL=license.html
+license=\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+March 17, 2005\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+   - The top-level (root) directory\n\
+   - Plug-in and Fragment directories\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
+   - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
diff --git a/features/com.minres.scviewer.ui.feature/feature.xml b/features/com.minres.scviewer.ui.feature/feature.xml
index d79b2cc..3a0afff 100644
--- a/features/com.minres.scviewer.ui.feature/feature.xml
+++ b/features/com.minres.scviewer.ui.feature/feature.xml
@@ -1,22 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="com.minres.scviewer.ui.feature"
-      label="SCViewer UI"
+      label="%featureName"
       version="1.1.0.qualifier"
-      provider-name="MINRES Technologies GmbH">
+      provider-name="%providerName">
 
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
+   <description>
+      The UI for the SCViewer databases
    </description>
 
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
+   <copyright>
+      Copyright (c) 2015-2021 MINRES Technologies GmbH.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License
+v1.0 which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
    </copyright>
 
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
+   <license url="%licenseURL">
+      %license
    </license>
 
+   <url>
+      <discovery label="MINRES Website" url="http://www.minres.com"/>
+   </url>
+
    <includes
          id="com.minres.scviewer.database.feature"
          version="0.0.0"/>
diff --git a/p2repositories/com.minres.scviewer.updateSite/category.xml b/p2repositories/com.minres.scviewer.updateSite/category.xml
index da1bab3..956d434 100644
--- a/p2repositories/com.minres.scviewer.updateSite/category.xml
+++ b/p2repositories/com.minres.scviewer.updateSite/category.xml
@@ -3,9 +3,16 @@
    <feature id="com.minres.scviewer.feature">
       <category name="com.minres.scviewer"/>
    </feature>
+   <feature id="com.minres.scviewer.database.feature">
+      <category name="com.minres.scviewer.database"/>
+   </feature>
+   <feature id="com.minres.scviewer.ui.feature">
+      <category name="com.minres.scviewer.database"/>
+   </feature>
    <category-def name="com.minres.scviewer" label="SCViewer">
       <description>
          Viewer for SystemC Verification (SCV) library&apos;s transaction recording
       </description>
    </category-def>
+   <category-def name="com.minres.scviewer.database" label="SCViewer Databases"/>
 </site>
diff --git a/p2repositories/com.minres.scviewer.updateSite/pom.xml b/p2repositories/com.minres.scviewer.updateSite/pom.xml
index 3634c3d..5e0f8d4 100644
--- a/p2repositories/com.minres.scviewer.updateSite/pom.xml
+++ b/p2repositories/com.minres.scviewer.updateSite/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>com.minres.scviewer.updateSite</artifactId>
@@ -9,12 +10,63 @@
 		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
-<!--	<build>
- 		<finalName>resources</finalName>
-		<resources>
-			<resource>
-				<directory>resources</directory>
-			</resource>
-		</resources>
-	</build> -->
-	</project>
\ No newline at end of file
+    <build>
+        <plugins>
+            <!-- make sure that zipped p2 repositories have the fully qualified version -->
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-p2-repository-plugin</artifactId>
+                <version>${tycho-version}</version>
+                <configuration>
+                    <finalName>${project.artifactId}-${qualifiedVersion}</finalName>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+	<profiles>
+		<profile>
+			<!-- Activate this profile to perform the release to Bintray -->
+			<id>release-composite</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>com.carrotgarden.maven</groupId>
+						<artifactId>bintray-maven-plugin</artifactId>
+    					<version>1.5.20191113165555</version>
+   						<configuration>
+							<skip>false</skip>
+							<!-- Bintray organization name. -->
+							<subject>minres</subject>
+							<!-- Bintray target repository. -->
+							<repository>eclipse</repository>
+							<!-- Bintray package name. -->
+							<bintrayPackage>SCViewer</bintrayPackage>
+							<bintrayVersion>2.10</bintrayVersion>
+							<packageVcsUrl>https://github.com/Minres/SCViewer.git</packageVcsUrl>
+							<!-- Local folder content to sync to the remote repo. -->
+							<sourceFolder>${project.build.directory}/repository</sourceFolder>
+							<!-- Remote folder for local content upload, relative path. -->
+							<targetFolder>repository</targetFolder>
+
+							<!-- Bintray credentials in settings.xml. -->
+							<serverId>bintray-minres-deploy</serverId>
+						</configuration>
+						<executions>
+							<!-- Activate "bintray:upload" during "package" -->
+							<execution>
+								<phase>package</phase>
+								<goals>
+                                    <goal>upload</goal>
+                                </goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
+</project>
\ No newline at end of file
diff --git a/p2repositories/com.minres.scviewer.updateSite/src/main/resources/index.html b/p2repositories/com.minres.scviewer.updateSite/src/main/resources/index.html
index 5808011..5324abb 100644
--- a/p2repositories/com.minres.scviewer.updateSite/src/main/resources/index.html
+++ b/p2repositories/com.minres.scviewer.updateSite/src/main/resources/index.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>com.itjw.txviewer.updateSite</title>
+<title>SCViewer Update site</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <style>@import url("web/site.css");</style>
 <script type="text/javascript">
diff --git a/pom.xml b/pom.xml
index 1f699f9..3758538 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,6 @@
 					</environments>
 				</configuration>
 			</plugin>
-
 		</plugins>
 	</build>
 </project>