diff --git a/.env-devel b/.env-devel
index 0a1a7b210ea..52eae87d12c 100644
--- a/.env-devel
+++ b/.env-devel
@@ -8,6 +8,8 @@ BF_API_SECRET=none
 
 DOCKER_IMAGE_TAG=latest
 
+MAINTENANCE_PASSWORD=z43
+
 PUBLISHED_HOST_NAME=localhost
 
 POSTGRES_ENDPOINT=postgres:5432
@@ -41,7 +43,7 @@ S3_SECURE=0
 SMTP_HOST=mail.speag.com
 SMTP_PORT=25
 
-VENV2=.venv27/
+WEBSERVER_LOGIN_REGISTRATION_INVITATION_REQUIRED=1
 
 # python3 -c "from cryptography.fernet import Fernet; print(Fernet.generate_key())"
 WEBSERVER_SESSION_SECRET_KEY=REPLACE ME with a key of at least length 32.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 35e1b45ef88..2c0e50eceba 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -10,6 +10,11 @@
 <!-- Please add #issues -->
 
 
+## How to test
+
+<!-- Please explain how this can be tested. Also state wether this PR needs a full rebuild, database changes, etc. -->
+
+
 ## Checklist
 
 - [ ] I think the code is well written
diff --git a/Makefile b/Makefile
index d6410c0c9c8..db1525b1c2a 100644
--- a/Makefile
+++ b/Makefile
@@ -37,8 +37,8 @@ PY_FILES := $(strip $(shell find services packages -iname '*.py' \
 											-not -path "*web/server*"))
 TEMPCOMPOSE := $(shell mktemp)
 
-SERVICES_LIST := apihub director sidecar storage webserver
-CACHED_SERVICES_LIST := ${SERVICES_LIST} webclient
+SERVICES_LIST := apihub director sidecar storage webserver maintenance
+CACHED_SERVICES_LIST := apihub director sidecar storage webserver webclient
 CLIENT_WEB_OUTPUT:=$(CURDIR)/services/web/client/source-output
 
 export VCS_URL:=$(shell git config --get remote.origin.url)
@@ -82,7 +82,13 @@ endif
 .PHONY: build
 # target: build: – Builds all core service images.
 build: .env .tmp-webclient-build
-	${DOCKER_COMPOSE} -f services/docker-compose.yml build --parallel ${SERVICES_LIST};
+	${DOCKER_COMPOSE} -f services/docker-compose.yml build --parallel ${SERVICES_LIST}
+
+.PHONY: rebuild
+# target: build: – Builds all core service images.
+rebuild: .env .tmp-webclient-build
+	${DOCKER_COMPOSE} -f services/docker-compose.yml build --no-cache --parallel ${SERVICES_LIST}
+
 
 .PHONY: build-devel .tmp-webclient-build
 # target: build-devel, rebuild-devel: – Builds images of core services for development.
@@ -129,12 +135,16 @@ up-devel: up-swarm-devel
 
 up-swarm: .env docker-swarm-check
 	${DOCKER} swarm init
-	${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.tools.yml config > $(TEMPCOMPOSE).tmp-compose.yml ;
+	${DOCKER_COMPOSE} -f services/docker-compose.yml \
+										-f services/docker-compose-tools.yml \
+										config > $(TEMPCOMPOSE).tmp-compose.yml ;
 	${DOCKER} stack deploy -c $(TEMPCOMPOSE).tmp-compose.yml ${SWARM_STACK_NAME}
 
 up-swarm-devel: .env docker-swarm-check $(CLIENT_WEB_OUTPUT)
 	${DOCKER} swarm init
-	${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.devel.yml -f services/docker-compose.tools.yml config > $(TEMPCOMPOSE).tmp-compose.yml
+	${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.devel.yml \
+										-f services/docker-compose-tools.yml \
+										config > $(TEMPCOMPOSE).tmp-compose.yml
 	${DOCKER} stack deploy -c $(TEMPCOMPOSE).tmp-compose.yml ${SWARM_STACK_NAME}
 
 .PHONY: up-webclient-devel
@@ -167,7 +177,8 @@ pull-cache: .env
 .PHONY: build-cache
 # target: build-cache – Builds service images and tags them as 'cache'
 build-cache:
-	${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.cache.yml build --parallel apihub director sidecar storage webclient
+	# WARNING: first all except webserver and then webserver
+	${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.cache.yml build --parallel apihub director sidecar storage webclient maintenance
 	${DOCKER} tag ${DOCKER_REGISTRY}/webclient:cache services_webclient:build
 	${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.cache.yml build webserver
 
@@ -201,15 +212,18 @@ endif
 
 # target: push – Pushes images into a registry
 push:
-	${DOCKER_COMPOSE} -f services/docker-compose.yml push ${SERVICES_LIST}
+	${DOCKER_COMPOSE} -f services/docker-compose.yml \
+										push ${SERVICES_LIST}
 
 # target: pull – Pulls images from a registry
 pull: .env
-	${DOCKER_COMPOSE} -f services/docker-compose.yml pull ${SERVICES_LIST}
+	${DOCKER_COMPOSE} -f services/docker-compose.yml \
+					 					pull ${SERVICES_LIST}
 
 # target: create-stack-file – use as 'make create-stack-file output_file=stack.yaml'
 create-stack-file:
-	${DOCKER_COMPOSE} -f services/docker-compose.yml config > $(output_file)
+	${DOCKER_COMPOSE} -f services/docker-compose.yml \
+										config > $(output_file)
 
 ## -------------------------------
 # Tools
@@ -273,12 +287,6 @@ setup-check: .env .vscode/settings.json
 	.venv/bin/pip3 install pylint autopep8 virtualenv pip-tools
 	@echo "To activate the venv, execute 'source .venv/bin/activate' or '.venv/Scripts/activate.bat' (WIN)"
 
-.venv27: .venv
-# target: .venv27 – Creates a python2.7 virtual environment with dev tools
-	@python2 --version
-	.venv/bin/virtualenv --python=python2 .venv27
-	@echo "To activate the venv27, execute 'source .venv27/bin/activate' or '.venv27/Scripts/activate.bat' (WIN)"
-
 
 ## -------------------------------
 # Auxiliary targets.
diff --git a/api/specs/storage/v0/components/schemas/file_meta_data.yaml b/api/specs/storage/v0/components/schemas/file_meta_data.yaml
index 29c0c26cd63..2c94ecf0c21 100644
--- a/api/specs/storage/v0/components/schemas/file_meta_data.yaml
+++ b/api/specs/storage/v0/components/schemas/file_meta_data.yaml
@@ -39,6 +39,18 @@ components:
           type: string
         user_name:
           type: string
+        file_id:
+          type: string
+        raw_file_path:
+          type: string
+        display_file_path:
+          type: string
+        created_at:
+          type: string
+        last_modified:
+          type: string
+        file_size:
+          type: integer
       example:
         file_uuid: 'simcore-testing/105/1000/3'
         location_id: "0"
@@ -52,3 +64,9 @@ components:
         file_name: "example.txt"
         user_id: "12"
         user_name: "dennis"
+        file_id: "N:package:e263da07-2d89-45a6-8b0f-61061b913873"
+        raw_file_path: "Curation/derivatives/subjects/sourcedata/docs/samples/sam_1/sam_1.csv"
+        display_file_path: "Curation/derivatives/subjects/sourcedata/docs/samples/sam_1/sam_1.csv"
+        created_at: "2019-06-19T12:29:03.308611Z"
+        last_modified: "2019-06-19T12:29:03.78852Z"
+        file_size: 73
diff --git a/ops/db/docker-compose.yml b/ops/db/docker-compose.yml
deleted file mode 100644
index 13583c41d06..00000000000
--- a/ops/db/docker-compose.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-version: '3.4'
-services:
-  postgres:
-    image: postgres:10
-    environment:
-      - POSTGRES_USER=scu
-      - POSTGRES_PASSWORD=z43
-      - POSTGRES_DB=simcoredb
-    volumes:
-      - postgres:/var/lib/postgresql/data
-    ports:
-      - "5432:5432"
-  adminer:
-    image: adminer
-    ports:
-      - 18080:8080
-    depends_on:
-      - postgres
-volumes:
-  postgres:
diff --git a/ops/db/example/README.md b/ops/db/example/README.md
deleted file mode 100644
index e2a7763520a..00000000000
--- a/ops/db/example/README.md
+++ /dev/null
@@ -1,159 +0,0 @@
-# Example for database migration
-
-Illustrates the workflow for database migration using `alembic`
-
-There are two folders:
- - models: contains definition of tables in different stages
- - migration: will contain files needed for migration, needs to be creted first. All `alembic` commands must be started in this directory.
-
-## Step 1 Initialize
-
-```bash
-docker-compose up -d
-pip install alembic
-cd migration
-alembic init alembic
-````
-
-This starts the database and creates an initial configuration for the migration.
-We want to have a baseline state that basically contains only the table defintions.
-
-```bash
-alembic revision -m "baseline"
-```
-
-This creates a file `uid_baseline.py` in `alembic/versions`.
-
-Go there and edit manually
-```python
-
-"""baseline
-
-Revision ID: 100559f72c66
-Revises:
-Create Date: 2018-07-11 14:28:59.084794
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = '100559f72c66'
-down_revision = None
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-     op.create_table(
-        'A',
-        sa.Column('id', sa.Integer, primary_key=True),
-        sa.Column('name', sa.String(), nullable=False))
-
-    op.create_table(
-        'B',
-        sa.Column('id', sa.Integer, primary_key=True),
-        sa.Column('name', sa.String(), nullable=False))
-
-
-def downgrade():
-    op.drop_table('A')
-    op.drop_table('B')
-```
-
-Edit the file `alembic.ini` for the correct db url
-
-```
-sqlalchemy.url = postgresql+psycopg2://test:test@localhost:5432/test
-```
-
-Upgrade the database to the current state
-
-```bash
-alembic upgrade head
-```
-
-Go and check `localhost:18080`
-
-
-## Step 2 Track changes
-
-From now on we want to automatically track changes in the models.
-Edit the file `migration/alembic/env.py` and import all models that shall be tracked. Obviously those guys need to be in the path.
-Also change
-
-```python
-target_metadata = Base.metadata
-```
-
-```python
-
-from __future__ import with_statement
-from alembic import context
-from sqlalchemy import engine_from_config, pool
-from logging.config import fileConfig
-
-from base import Base
-from a import A
-from b import B
-
-# this is the Alembic Config object, which provides
-# access to the values within the .ini file in use.
-config = context.config
-
-# Interpret the config file for Python logging.
-# This line sets up loggers basically.
-fileConfig(config.config_file_name)
-
-# add your model's MetaData object here
-# for 'autogenerate' support
-# from myapp import mymodel
-# target_metadata = mymodel.Base.metadata
-target_metadata = Base.metadata
-
-# other values from the config, defined by the needs of env.py,
-# can be acquired:
-# my_important_option = config.get_main_option("my_important_option")
-# ... etc.
-
-```
-
-Now start changing the schemas:
-
-Copy `a.py.1` to `a.py` and let `alembic` do its magic
-
-```bash
-alembic revision --autogenerate -m "Adds new thing to A"
-```
-This creates an new script `uuid_adds_new_thing_to_a.py`
-
-Upgrade can be done with
-
-```bash
-alembic upgrade head
-```
-
-Go and check `localhost:18080`
-
-Copy `b.py.1` to `b.py` and let `alembic` do its magic
-```bash
-alembic revision --autogenerate -m "Adds new thing to B"
-```
-This creates an new script `uuid_adds_new_thing_to_b.py`
-
-Upgrade can be done with
-
-```bash
-alembic upgrade head
-```
-
-Go and check `localhost:18080`
-
-From now on you can do the following
-
-```bash
-alembic upgrade +1
-alembic downgrade -1
-alembic downgrade -2
-```
diff --git a/ops/db/example/models/__init__.py b/ops/db/example/models/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/ops/db/example/models/a.py b/ops/db/example/models/a.py
deleted file mode 100644
index 03900920b3b..00000000000
--- a/ops/db/example/models/a.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from sqlalchemy import Column, Integer, String
-from base import Base
-
-class A(Base):
-
-    __tablename__ = 'A'
-
-    id = Column(Integer, primary_key=True)
-    name = Column(String)
diff --git a/ops/db/example/models/a.py.0 b/ops/db/example/models/a.py.0
deleted file mode 100644
index 03900920b3b..00000000000
--- a/ops/db/example/models/a.py.0
+++ /dev/null
@@ -1,9 +0,0 @@
-from sqlalchemy import Column, Integer, String
-from base import Base
-
-class A(Base):
-
-    __tablename__ = 'A'
-
-    id = Column(Integer, primary_key=True)
-    name = Column(String)
diff --git a/ops/db/example/models/a.py.1 b/ops/db/example/models/a.py.1
deleted file mode 100644
index 1addaadfd9c..00000000000
--- a/ops/db/example/models/a.py.1
+++ /dev/null
@@ -1,10 +0,0 @@
-from sqlalchemy import Column, Integer, String
-from base import Base
-
-class A(Base):
-
-    __tablename__ = 'A'
-
-    id = Column(Integer, primary_key=True)
-    name = Column(String)
-    new_item = Column(String)
diff --git a/ops/db/example/models/b.py b/ops/db/example/models/b.py
deleted file mode 100644
index ac0020b317c..00000000000
--- a/ops/db/example/models/b.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from sqlalchemy import Column, Integer, String
-from base import Base
-
-class B(Base):
-
-    __tablename__ = 'B'
-
-    id = Column(Integer, primary_key=True)
-    name = Column(String)
diff --git a/ops/db/example/models/b.py.0 b/ops/db/example/models/b.py.0
deleted file mode 100644
index ac0020b317c..00000000000
--- a/ops/db/example/models/b.py.0
+++ /dev/null
@@ -1,9 +0,0 @@
-from sqlalchemy import Column, Integer, String
-from base import Base
-
-class B(Base):
-
-    __tablename__ = 'B'
-
-    id = Column(Integer, primary_key=True)
-    name = Column(String)
diff --git a/ops/db/example/models/b.py.2 b/ops/db/example/models/b.py.2
deleted file mode 100644
index f4ee5ab6175..00000000000
--- a/ops/db/example/models/b.py.2
+++ /dev/null
@@ -1,10 +0,0 @@
-from sqlalchemy import Column, Integer, String
-from base import Base
-
-class B(Base):
-
-    __tablename__ = 'B'
-
-    id = Column(Integer, primary_key=True)
-    name = Column(String)
-    new_item = Column(String)
diff --git a/ops/db/example/models/base.py b/ops/db/example/models/base.py
deleted file mode 100644
index c64447da1a1..00000000000
--- a/ops/db/example/models/base.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from sqlalchemy.ext.declarative import declarative_base
-Base = declarative_base()
diff --git a/ops/travis/system-testing/tests/test_swarm_runs.py b/ops/travis/system-testing/tests/test_swarm_runs.py
index 09e76b03202..3d32a40e228 100644
--- a/ops/travis/system-testing/tests/test_swarm_runs.py
+++ b/ops/travis/system-testing/tests/test_swarm_runs.py
@@ -8,10 +8,10 @@
 import datetime
 import logging
 import sys
+import urllib
 from pathlib import Path
 from pprint import pformat
 from typing import Dict
-import urllib
 
 import docker
 import pytest
@@ -26,9 +26,58 @@
 
 logger = logging.getLogger(__name__)
 
+# UTILS --------------------------------
 def _here() -> Path:
     return Path(sys.argv[0] if __name__ == "__main__" else __file__).resolve().parent
 
+
+def _load_yaml(path: Path) -> Dict:
+    content = {}
+    assert path.exists()
+    with path.open() as f:
+        content = yaml.safe_load(f)
+    return content
+
+
+def _services_docker_compose(osparc_simcore_root_dir: Path) -> Dict[str, str]:
+    # TODO: pip install docker-compose and use
+    # https://github.com/docker/compose/blob/master/compose/cli/main.py#L328
+    osparc_simcore_services_dir = osparc_simcore_root_dir / "services"
+    compose = {}
+    for name in ["docker-compose.yml", ]:
+        content = _load_yaml(osparc_simcore_services_dir / name)
+        compose.update(content)
+    return compose
+
+def get_tasks_summary(tasks):
+    msg = ""
+    for t in tasks:
+        t["Status"].setdefault("Err", '')
+        msg += "- task ID:{ID}, STATE: {Status[State]}, ERROR: '{Status[Err]}' \n".format(
+            **t)
+    return msg
+
+
+def get_failed_tasks_logs(service, docker_client):
+    failed_states = ["COMPLETE", "FAILED",
+                     "SHUTDOWN", "REJECTED", "ORPHANED", "REMOVE"]
+    failed_logs = ""
+    for t in service.tasks():
+        if t['Status']['State'].upper() in failed_states:
+            cid = t['Status']['ContainerStatus']['ContainerID']
+            failed_logs += "{2} {0} - {1} BEGIN {2}\n".format(
+                service.name, t['ID'], "="*10)
+            if cid:
+                container = docker_client.containers.get(cid)
+                failed_logs += container.logs().decode('utf-8')
+            else:
+                failed_logs += "  log unavailable. container does not exists\n"
+            failed_logs += "{2} {0} - {1} END {2}\n".format(
+                service.name, t['ID'], "="*10)
+
+    return failed_logs
+
+# FIXTURES -------------------------------------
 @pytest.fixture(scope="session")
 def here() -> Path:
     return _here()
@@ -43,15 +92,10 @@ def _osparc_simcore_root_dir(here) -> Path:
 def osparc_simcore_root_dir(here) -> Path:
     return _osparc_simcore_root_dir(here)
 
-
-def _services_docker_compose(osparc_simcore_root_dir) -> Dict[str, str]:
-    docker_compose_path = osparc_simcore_root_dir / "services" / "docker-compose.yml"
-    assert docker_compose_path.exists()
-
-    content = {}
-    with docker_compose_path.open() as f:
-        content = yaml.safe_load(f)
-    return content
+@pytest.fixture(scope='session')
+def osparc_simcore_services_dir(osparc_simcore_root_dir) -> Path:
+    services_dir = Path(osparc_simcore_root_dir) / "services"
+    return services_dir
 
 @pytest.fixture("session")
 def services_docker_compose(osparc_simcore_root_dir) -> Dict[str, str]:
@@ -60,12 +104,7 @@ def services_docker_compose(osparc_simcore_root_dir) -> Dict[str, str]:
 
 @pytest.fixture("session")
 def tools_docker_compose(osparc_simcore_root_dir) -> Dict[str, str]:
-    docker_compose_path = osparc_simcore_root_dir / "services" / "docker-compose.tools.yml"
-    assert docker_compose_path.exists()
-
-    content = {}
-    with docker_compose_path.open() as f:
-        content = yaml.safe_load(f)
+    content = _load_yaml(osparc_simcore_root_dir / "services" / "docker-compose-tools.yml")
     return content
 
 def _list_core_services():
@@ -85,33 +124,7 @@ def docker_client():
     yield client
 
 
-# UTILS --------------------------------
-
-def get_tasks_summary(tasks):
-    msg = ""
-    for t in tasks:
-        t["Status"].setdefault("Err", '')
-        msg += "- task ID:{ID}, STATE: {Status[State]}, ERROR: '{Status[Err]}' \n".format(**t)
-    return msg
-
-def get_failed_tasks_logs(service, docker_client):
-    failed_states = ["COMPLETE", "FAILED", "SHUTDOWN", "REJECTED", "ORPHANED", "REMOVE"]
-    failed_logs = ""
-    for t in service.tasks():
-        if t['Status']['State'].upper() in failed_states:
-            cid = t['Status']['ContainerStatus']['ContainerID']
-            failed_logs += "{2} {0} - {1} BEGIN {2}\n".format(service.name, t['ID'], "="*10)
-            if cid:
-                container = docker_client.containers.get(cid)
-                failed_logs += container.logs().decode('utf-8')
-            else:
-                failed_logs += "  log unavailable. container does not exists\n"
-            failed_logs += "{2} {0} - {1} END {2}\n".format(service.name, t['ID'], "="*10)
-
-    return failed_logs
-
 # TESTS -------------------------------
-
 def test_all_services_up(docker_client, services_docker_compose, tools_docker_compose):
     """
         NOTE: Assumes `make up-swarm` executed
diff --git a/packages/postgres-database/README.md b/packages/postgres-database/README.md
new file mode 100644
index 00000000000..15ad2273a97
--- /dev/null
+++ b/packages/postgres-database/README.md
@@ -0,0 +1,55 @@
+# simcore postgres database
+
+Contains database **models** served by the ``postgres`` service and adds an extension with **migration** tools (e.g. entrypoint that wraps [alembic]'s CLI in a similar way to [flask-migrate]).
+
+
+To install migration tools add ``[migration]`` extra
+```console
+  pip install .[migration]
+```
+and to call the CLI use
+```console
+  simcore-postgres-database --help
+
+  # or a short alias
+
+  sc-pg --help
+```
+This entrypoing wraps calls to [alembic] commands and customizes it for ``simcore_postgres_database`` models and `postgres` online database.
+
+
+A typical workflow:
+
+### Discover
+
+```console
+  simcore-postgres-database discover -u simcore -p simcore
+```
+
+```console
+  simcore-postgres-database info
+```
+
+### Review
+
+```console
+  simcore-postgres-database review -m "some message about changes"
+```
+Auto-generates some scripts under [migration/versions](packages/postgres-database/migration/versions). The migration script **needs to be reviewed and edited**, as Alembic currently does not detect every change you
+make to your models. In particular, Alembic is currently unable to detect:
+- table name changes,
+- column name changes,
+- or anonymously named constraints
+A detailed summary of limitations can be found in the Alembic autogenerate documentation.
+Once finalized, the migration script also needs to be added to version control.
+
+### Upgrade
+
+Upgrades to given revision (get ``info`` to check history)
+```console
+  simcore-postgres-database upgrade head
+```
+
+
+[alembic]:https://alembic.sqlalchemy.org/en/latest/
+[flask-migrate]:https://flask-migrate.readthedocs.io/en/latest/
diff --git a/packages/postgres-database/VERSION b/packages/postgres-database/VERSION
new file mode 100644
index 00000000000..6e8bf73aa55
--- /dev/null
+++ b/packages/postgres-database/VERSION
@@ -0,0 +1 @@
+0.1.0
diff --git a/packages/postgres-database/doc/database-migration.md b/packages/postgres-database/doc/database-migration.md
new file mode 100644
index 00000000000..21ec44f8249
--- /dev/null
+++ b/packages/postgres-database/doc/database-migration.md
@@ -0,0 +1,58 @@
+# Migration of a database
+
+Issue 709
+
+## Migration bewteen schema updates
+
+- Database model schemas change with time based on new requirements or fixes
+- Deployed databases have already some data that fulfills current schema but not new one
+- We need to update these databases to the new schema while keeping its data
+- This shall be done with minimal or no downtime of the running databases
+
+
+- https://sqlalchemy-migrate.readthedocs.io/en/latest/
+  - Migration environment templates: ``alembic list_templates``
+    - multidb??
+  - Multiple alembic environs from [one ini file](https://alembic.sqlalchemy.org/en/latest/cookbook.html#multiple-environments)
+  ```
+  alembic init migration
+  alembic revision -m "baseline"
+  alembic upgrade head
+  alembic revision -m "first tables"
+  alembic upgrade head
+  alembic revision -m "add column"
+
+  alembic info
+  alembic list_templates
+  alembic current
+  alembic downgrade -1
+  alembic head
+  alembic upgrade head
+  alembic history
+```
+
+- what autogenerate [does NOT decect](https://alembic.sqlalchemy.org/en/latest/autogenerate.html#what-does-autogenerate-detect-and-what-does-it-not-detect)
+
+- https://stackoverflow.com/questions/42992256/how-do-you-add-migrate-an-existing-database-with-alembic-flask-migrate-if-you-di
+```console
+alembic revision --autogenerate -m "Init tables" # to an empty db
+
+# changes to real db con these tables
+alembic stamp head
+
+# revision changes
+alembic revision --autogenerate -m "Added column to file_meta_data"
+alembic upgrade head
+```
+
+## Migration between major releases of postgresql
+
+- Major release of PostgreSQL (first two digit groups, e.g. 8.4 and 8.5 are two consecutive major releases) might change the internal storage format
+
+- See https://www.postgresql.org/docs/9.0/migration.html
+
+
+## Migration of database in production
+
+- Needs downtime?
+- Collisions with ongoing requests while migration?
diff --git a/packages/postgres-database/doc/database-models.md b/packages/postgres-database/doc/database-models.md
new file mode 100644
index 00000000000..aa2bf5bdbbd
--- /dev/null
+++ b/packages/postgres-database/doc/database-models.md
@@ -0,0 +1,12 @@
+# Database Models
+
+
+## Rationale
+
+- Every table in the database is maintained by a given service
+- This maintainer service shall have all helpers associated to that table (e.g. extension functions over raw metadata model)
+-
+
+
+- Isolate package with all table schemas per database and service
+- Models shall not be implemented inheriting from Base. Use instead explicit table definitions](https://docs.sqlalchemy.org/en/latest/orm/mapping_styles.html#classical-mappings)
diff --git a/packages/postgres-database/requirements/Makefile b/packages/postgres-database/requirements/Makefile
new file mode 100644
index 00000000000..a947354f2d6
--- /dev/null
+++ b/packages/postgres-database/requirements/Makefile
@@ -0,0 +1,29 @@
+.PHONY: all check clean help
+
+objects = $(wildcard *.in)
+outputs := $(objects:.in=.txt)
+
+# target: all – pip-compiles all requirements/*.in -> requirements/*.txt
+all: $(outputs)
+
+%.txt: %.in
+	pip-compile --output-file $@ $<
+
+_test.txt: _base.txt
+
+_migration.txt: _base.txt
+
+# target: check – Checks whether pip-compile is installed
+check:
+	@which pip-compile > /dev/null
+
+# target: clean – Cleans all requirements/*.txt
+clean: check
+	- rm $(outputs)
+
+# target: help – Display all callable targets
+help:
+	@echo
+	@egrep "^\s*#\s*target\s*:\s*" [Mm]akefile \
+	| sed -r "s/^\s*#\s*target\s*:\s*//g"
+	@echo
diff --git a/packages/postgres-database/requirements/_base.in b/packages/postgres-database/requirements/_base.in
new file mode 100644
index 00000000000..da6c74026c1
--- /dev/null
+++ b/packages/postgres-database/requirements/_base.in
@@ -0,0 +1,9 @@
+#
+# Specifies third-party dependencies for 'simcore-postgres-database'
+#
+
+# psycopg2-binary     # enforces binary version
+# sqlalchemy>=1.3.3   # https://nvd.nist.gov/vuln/detail/CVE-2019-7164
+sqlalchemy[postgresql_psycopg2binary]>=1.3.3
+
+yarl
diff --git a/packages/postgres-database/requirements/_base.txt b/packages/postgres-database/requirements/_base.txt
new file mode 100644
index 00000000000..08220816da0
--- /dev/null
+++ b/packages/postgres-database/requirements/_base.txt
@@ -0,0 +1,11 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile --output-file=_base.txt _base.in
+#
+idna==2.8                 # via yarl
+multidict==4.5.2          # via yarl
+psycopg2-binary==2.8.3    # via sqlalchemy
+sqlalchemy[postgresql_psycopg2binary]==1.3.5
+yarl==1.3.0
diff --git a/packages/postgres-database/requirements/_migration.in b/packages/postgres-database/requirements/_migration.in
new file mode 100644
index 00000000000..331a5cf7fb7
--- /dev/null
+++ b/packages/postgres-database/requirements/_migration.in
@@ -0,0 +1,12 @@
+# Installs dependencies to migrate 'simcore-postgres-database'
+#
+
+# frozen specs
+-r _base.txt
+
+certifi==2019.6.16 # added contraint to fit pre-installation of jupyter/base-notebook:python-3.7.3 (cannot uninstall)
+
+alembic
+click
+docker # TODO: aiodocker
+tenacity
diff --git a/packages/postgres-database/requirements/_migration.txt b/packages/postgres-database/requirements/_migration.txt
new file mode 100644
index 00000000000..5c2d44bf2e8
--- /dev/null
+++ b/packages/postgres-database/requirements/_migration.txt
@@ -0,0 +1,25 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile --output-file=_migration.txt _migration.in
+#
+alembic==1.0.8
+certifi==2019.6.16
+chardet==3.0.4            # via requests
+click==7.0
+docker==4.0.2
+idna==2.8
+mako==1.0.12              # via alembic
+markupsafe==1.1.1         # via mako
+multidict==4.5.2
+psycopg2-binary==2.8.3
+python-dateutil==2.8.0    # via alembic
+python-editor==1.0.4      # via alembic
+requests==2.22.0          # via docker
+six==1.12.0               # via docker, python-dateutil, tenacity, websocket-client
+sqlalchemy[postgresql_psycopg2binary]==1.3.5
+tenacity==5.0.4
+urllib3==1.25.3           # via requests
+websocket-client==0.56.0  # via docker
+yarl==1.3.0
diff --git a/packages/postgres-database/requirements/_test.in b/packages/postgres-database/requirements/_test.in
new file mode 100644
index 00000000000..8f8f72ffd35
--- /dev/null
+++ b/packages/postgres-database/requirements/_test.in
@@ -0,0 +1,14 @@
+#
+# Specifies dependencies required to run tests on 'simcore-postgres-database'
+#
+
+# frozen specs
+-r _base.txt
+
+# testing
+pytest
+pytest-cov
+
+# tools
+pylint
+coveralls
diff --git a/packages/postgres-database/requirements/_test.txt b/packages/postgres-database/requirements/_test.txt
new file mode 100644
index 00000000000..ca2985f29e9
--- /dev/null
+++ b/packages/postgres-database/requirements/_test.txt
@@ -0,0 +1,38 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile --output-file=_test.txt _test.in
+#
+astroid==2.2.5            # via pylint
+atomicwrites==1.3.0       # via pytest
+attrs==19.1.0             # via pytest
+certifi==2019.6.16        # via requests
+chardet==3.0.4            # via requests
+coverage==4.5.3           # via coveralls, pytest-cov
+coveralls==1.8.1
+docopt==0.6.2             # via coveralls
+idna==2.8
+importlib-metadata==0.18  # via pluggy, pytest
+isort==4.3.20             # via pylint
+lazy-object-proxy==1.4.1  # via astroid
+mccabe==0.6.1             # via pylint
+more-itertools==7.0.0     # via pytest
+multidict==4.5.2
+packaging==19.0           # via pytest
+pluggy==0.12.0            # via pytest
+psycopg2-binary==2.8.3
+py==1.8.0                 # via pytest
+pylint==2.3.1
+pyparsing==2.4.0          # via packaging
+pytest-cov==2.7.1
+pytest==4.6.3
+requests==2.22.0          # via coveralls
+six==1.12.0               # via astroid, packaging, pytest
+sqlalchemy[postgresql_psycopg2binary]==1.3.5
+typed-ast==1.4.0          # via astroid
+urllib3==1.25.3           # via requests
+wcwidth==0.1.7            # via pytest
+wrapt==1.11.2             # via astroid
+yarl==1.3.0
+zipp==0.5.1               # via importlib-metadata
diff --git a/packages/postgres-database/requirements/ci.txt b/packages/postgres-database/requirements/ci.txt
new file mode 100644
index 00000000000..8a60c977a55
--- /dev/null
+++ b/packages/postgres-database/requirements/ci.txt
@@ -0,0 +1,13 @@
+# Shortcut to install all packages for the contigous integration (CI) of 'simcore-postgres-database'
+#
+# - As ci.txt but w/ tests
+#
+# Usage:
+#   pip install -r requirements/ci.txt
+#
+
+# installs base + tests requirements
+-r _test.txt
+
+# current module
+.
diff --git a/packages/postgres-database/requirements/dev.txt b/packages/postgres-database/requirements/dev.txt
new file mode 100644
index 00000000000..cebccc971db
--- /dev/null
+++ b/packages/postgres-database/requirements/dev.txt
@@ -0,0 +1,13 @@
+# Shortcut to install all packages needed to develop 'simcore-postgres-database'
+#
+# - As ci.txt but with current and repo packages in develop (edit) mode
+#
+# Usage:
+#   pip install -r requirements/dev.txt
+#
+
+# installs base + tests requirements
+-r _test.txt
+
+# current module
+-e .[migration]
diff --git a/packages/postgres-database/setup.py b/packages/postgres-database/setup.py
new file mode 100644
index 00000000000..3ede4446855
--- /dev/null
+++ b/packages/postgres-database/setup.py
@@ -0,0 +1,61 @@
+import re
+import sys
+from pathlib import Path
+
+from setuptools import find_packages, setup
+
+here = Path(sys.argv[0] if __name__ == "__main__" else __file__).resolve().parent
+readme = Path( here / "README.md" ).read_text()
+version = Path(here/ "VERSION").read_text().strip()
+
+def read_reqs( reqs_path: Path):
+    return re.findall(r'(^[^#-][\w]+[-~>=<.\w]+)', reqs_path.read_text(), re.MULTILINE)
+
+# Weak dependencies
+install_requirements = read_reqs( here / "requirements" / "_base.in" )
+
+# Strong dependencies
+migration_requirements = read_reqs( here / "requirements" / "_migration.txt" )
+test_requirements = read_reqs( here / "requirements" / "_test.txt" )
+
+
+setup(
+    name='simcore-postgres-database',
+    version=version,
+    author="Pedro Crespo (pcrespov)",
+    description="Database models served by the simcore 'postgres' core service",
+    classifiers=[
+        'Development Status :: 2 - Pre-Alpha',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: MIT License',
+        'Natural Language :: English',
+        'Programming Language :: Python :: 3.6',
+    ],
+    long_description=readme,
+    license="MIT license",
+    packages=find_packages(where='src'),
+    package_dir={'': 'src'},
+    test_suite='tests',
+    install_requires=install_requirements,
+    tests_require=test_requirements,
+    extras_require= {
+        'migration': migration_requirements,
+        'test': test_requirements
+    },
+    include_package_data=True,
+    package_data={
+        '': [
+            '*.ini',
+            'migration/*.py',
+            'migration/*.mako',
+            'migration/versions/*.py',
+         ]
+    },
+    entry_points = {
+        'console_scripts': [
+            'simcore-postgres-database=simcore_postgres_database.cli:main',
+            'sc-pg=simcore_postgres_database.cli:main',
+        ]
+    },
+    zip_safe=False
+)
diff --git a/packages/postgres-database/src/simcore_postgres_database/__init__.py b/packages/postgres-database/src/simcore_postgres_database/__init__.py
new file mode 100644
index 00000000000..1f5831b9301
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/__init__.py
@@ -0,0 +1,8 @@
+from . import storage_models, webserver_models
+from .models.base import metadata
+
+__all__ = [
+    'metadata',
+    'webserver_models',
+    'storage_models'
+]
diff --git a/packages/postgres-database/src/simcore_postgres_database/alembic.ini b/packages/postgres-database/src/simcore_postgres_database/alembic.ini
new file mode 100644
index 00000000000..1c067c09635
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/alembic.ini
@@ -0,0 +1,74 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts
+script_location = %(here)s/migration
+
+# template used to generate migration files
+# file_template = %%(rev)s_%%(slug)s
+
+# timezone to use when rendering the date
+# within the migration file as well as the filename.
+# string value is passed to dateutil.tz.gettz()
+# leave blank for localtime
+timezone = UTC
+
+# max length of characters to apply to the
+# "slug" field
+# truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+# set to 'true' to allow .pyc and .pyo files without
+# a source .py file to be detected as revisions in the
+# versions/ directory
+# sourceless = false
+
+# version location specification; this defaults
+# to migration/versions.  When using multiple version
+# directories, initial revisions must be specified with --version-path
+# version_locations = %(here)s/bar %(here)s/bat migration/versions
+
+# the output encoding used when revision files
+# are written from script.py.mako
+# output_encoding = utf-8
+
+# url for testing. See packages/postgres-database/tests/docker-compose.yml
+sqlalchemy.url = None
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S
diff --git a/packages/postgres-database/src/simcore_postgres_database/cli.py b/packages/postgres-database/src/simcore_postgres_database/cli.py
new file mode 100644
index 00000000000..338489e2758
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/cli.py
@@ -0,0 +1,263 @@
+""" command line interface for migration
+
+"""
+#pylint: disable=broad-except
+
+import json
+import logging
+import os
+import sys
+from copy import deepcopy
+from logging.config import fileConfig
+from pathlib import Path
+
+import alembic.command
+import click
+import docker
+import sqlalchemy as sa
+from alembic import __version__ as __alembic_version__
+from alembic.config import Config as AlembicConfig
+
+from simcore_postgres_database.settings import build_url
+
+alembic_version = tuple([int(v) for v in __alembic_version__.split('.')[0:3]])
+
+here = Path( sys.argv[0] if __name__ == "__main__" else __file__ ).parent.resolve()
+default_ini = here / 'alembic.ini'
+migration_dir = here / 'migration'
+discovered_cache = os.path.expanduser("~/.simcore_postgres_database_cache.json")
+
+log = logging.getLogger('root')
+fileConfig(default_ini)
+
+def safe(if_fails_return=False):
+    def decorate(func):
+        def safe_func(*args, **kargs):
+            try:
+                res = func(*args, **kargs)
+                return res
+            except RuntimeError as err:
+                log.info("%s failed:  %s", func.__name__, str(err))
+            except Exception:
+                log.info("%s failed unexpectedly", func.__name__, exc_info=True)
+            return deepcopy(if_fails_return) # avoid issues with default mutables
+        return safe_func
+    return decorate
+
+#@retry(wait=wait_fixed(0.1), stop=stop_after_delay(60))
+def _ping(url):
+    """checks whether database is responsive"""
+    engine = sa.create_engine(str(url))
+    conn = engine.connect()
+    conn.close()
+
+
+@safe(if_fails_return=None)
+def _get_service_published_port(service_name: str) -> int:
+    client = docker.from_env()
+    services = [x for x in client.services.list() if service_name in x.name]
+    if not services:
+        raise RuntimeError("Cannot find published port for service '%s'. Probably services still not up" % service_name)
+    service_endpoint = services[0].attrs["Endpoint"]
+
+    if "Ports" not in service_endpoint or not service_endpoint["Ports"]:
+        raise RuntimeError("Cannot find published port for service '%s' in endpoint. Probably services still not up" % service_name)
+
+    published_port = service_endpoint["Ports"][0]["PublishedPort"]
+    return int(published_port)
+
+def _get_alembic_config(cfg=None):
+    try:
+        if not cfg:
+            cfg = _load_cache() or {}
+        url = build_url(**cfg)
+    except Exception:
+        click.echo("Invalid database config, please run discover", err=True)
+        _reset_cache()
+        return {}
+
+    config = AlembicConfig(default_ini)
+    config.set_main_option('script_location', str(migration_dir))
+    config.set_main_option('sqlalchemy.url', str(url))
+    return config
+
+@safe(if_fails_return={})
+def _load_cache():
+    with open(discovered_cache) as fh:
+        cfg = json.load(fh)
+    return cfg
+
+def _reset_cache():
+    if os.path.exists(discovered_cache):
+        os.remove(discovered_cache)
+        click.echo("Removed %s" % discovered_cache)
+
+# CLI -----------------------------------------------
+DEFAULT_HOST = 'postgres'
+DEFAULT_PORT = 5432
+DEFAULT_DB = 'simcoredb'
+
+@click.group()
+def main():
+    """ Simplified CLI for database migration with alembic """
+
+@main.command()
+@click.option('--user', '-u')
+@click.option('--password', '-p')
+@click.option('--host')
+@click.option('--port', type=int)
+@click.option('--database')
+def discover(**cli_inputs):
+    """ Discovers databases and stores configs in ~/.simcore_postgres_database.json """
+    # NOTE: Do not add defaults to user, password so we get a chance to ping urls
+    # TODO: if multiple candidates online, then query user to select
+
+    click.echo(f'Discovering database ...')
+    cli_cfg = {key:value for key, value in cli_inputs.items() if value is not None}
+
+    def test_cached():
+        """Tests cached configuration """
+        cfg = _load_cache() or {}
+        if cfg:
+            cfg.update(cli_cfg) # overrides
+        return cfg
+
+    def test_env():
+        """Tests environ variables """
+        cfg = {
+            'user': os.getenv('POSTGRES_USER'),
+            'password': os.getenv('POSTGRES_PASSWORD'),
+            'host': os.getenv('POSTGRES_HOST', DEFAULT_HOST),
+            'port': int(os.getenv('POSTGRES_PORT') or DEFAULT_PORT),
+            'database': os.getenv('POSTGRES_DB', DEFAULT_DB)
+        }
+        cfg.update(cli_cfg)
+        return cfg
+
+
+    def test_swarm():
+        """Tests published port in swarm from host """
+        cfg = deepcopy(cli_cfg)
+        cfg['host'] = "127.0.0.1"
+        cfg['port'] = _get_service_published_port(cli_cfg.get('host', DEFAULT_HOST))
+        cfg.setdefault('database', DEFAULT_DB)
+        return cfg
+
+
+    for test in [test_cached, test_env, test_swarm]:
+        try:
+            click.echo("-> {0.__name__}: {0.__doc__}".format(test))
+
+            cfg = test()
+            cfg.update(cli_cfg) # CLI always overrides
+            url = build_url(**cfg)
+
+            click.echo(" ping {0.__name__}: {1} ...".format(test, url))
+
+            _ping(url)
+
+            with open(discovered_cache, 'w') as fh:
+                json.dump(cfg, fh, sort_keys=True, indent=4)
+
+            click.echo(f"Saved config at{discovered_cache}: {cfg}")
+            click.secho(f"{test.__name__} succeeded: {url} is online",
+                blink=True, bold=True, fg='green')
+
+            return
+
+        except Exception as err:
+            inline_msg = str(err).replace('\n','. ')
+            click.echo("<- {0.__name__} failed : {1}".format(test, inline_msg))
+
+    _reset_cache()
+    click.secho("Sorry, database not found !!", blink=True,
+        bold=True, fg="red")
+
+@main.command()
+def info():
+    """ Displays discovered config and other alembic infos"""
+    click.echo("Using alembic {}.{}.{}".format(*alembic_version))
+
+    cfg = _load_cache()
+    click.echo(f"Saved config: {cfg} @ {discovered_cache}")
+    config = _get_alembic_config(cfg)
+    if config:
+        click.echo("Revisions history ------------")
+        alembic.command.history(config)
+        click.echo("Current version: -------------")
+        alembic.command.current(config, verbose=True)
+
+
+@main.command()
+def clean():
+    """ Clears discovered database """
+    _reset_cache()
+
+
+# Bypasses alembic CLI into a reduced version  ------------
+# TODO: systematic bypass??
+
+@main.command()
+@click.option('-m', 'message')
+def review(message):
+    """Auto-generates a new revison. Equivalent to `alembic revision --autogenerate -m "first tables"`
+    """
+    click.echo('Auto-generates revision based on changes ')
+
+    config = _get_alembic_config()
+    alembic.command.revision(config, message,
+        autogenerate=True,
+        sql=False,
+        head='head',
+        splice=False,
+        branch_label=None,
+        version_path=None,
+        rev_id=None)
+
+@main.command()
+@click.argument('revision', default='head')
+def upgrade(revision):
+    """Upgrades target database to a given revision
+
+        Say we have revision ae1027a6acf
+
+        Absolute migration:
+            sc-pg upgrade ae10
+
+        Relative to current:
+            sc-pg upgrade +2
+            sc-pg downgrade -- -1
+            sc-pg upgrade ae10+2
+
+    """
+    click.echo(f'Upgrading database to {revision} ...')
+    config = _get_alembic_config()
+    alembic.command.upgrade(config, revision, sql=False, tag=None)
+
+@main.command()
+@click.argument('revision', default='-1')
+def downgrade(revision):
+    """Revert target database to a given revision
+
+        Say we have revision ae1027a6acf
+
+        Absolute migration:
+            sc-pg upgrade ae10
+
+        Relative to current:
+            sc-pg upgrade +2
+            sc-pg downgrade -- -1
+            sc-pg upgrade ae10+2
+    """
+    # https://click.palletsprojects.com/en/3.x/arguments/#argument-like-options
+    click.echo(f'Downgrading database to current-{revision} ...')
+    config = _get_alembic_config()
+    alembic.command.downgrade(config, str(revision), sql=False, tag=None)
+
+@main.command()
+@click.argument('revision', default='head')
+def stamp(revision):
+    """Stamps the database with a given revision; does not run any migration"""
+    click.echo(f'Stamps db to {revision} ...')
+    config = _get_alembic_config()
+    alembic.command.stamp(config, revision, sql=False, tag=None)
diff --git a/packages/postgres-database/src/simcore_postgres_database/migration/README.md b/packages/postgres-database/src/simcore_postgres_database/migration/README.md
new file mode 100644
index 00000000000..41e0670f87e
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/migration/README.md
@@ -0,0 +1,87 @@
+# ``postgres-database`` database migration
+
+Generic single-database configuration.
+
+
+## Basic workflow
+
+Our database migration is based on [alembic] and emulates [flask-migrate] plugin. The following steps assume that we start from scratch and aim to setup and run migration scripts for a new database.
+
+
+### Init
+
+```command
+alembic init migration
+```
+
+Will add a migrations folder to your application. The contents of this folder need to be added to version control along with your other source files.
+
+### Revision
+
+```command
+$ alembic revision --autogenerate -m "Adding storage service tables"
+INFO  [alembic.runtime.migration] Context impl PostgresqlImpl.
+INFO  [alembic.runtime.migration] Will assume transactional DDL.
+INFO  [alembic.autogenerate.compare] Detected added table 'file_meta_data'
+INFO  [alembic.ddl.postgresql] Detected sequence named 'user_to_projects_id_seq' as owned by integer column 'user_to_projects(id)', assuming SERIAL and omitting
+INFO  [alembic.ddl.postgresql] Detected sequence named 'tokens_token_id_seq' as owned by integer column 'tokens(token_id)', assuming SERIAL and omitting
+INFO  [alembic.ddl.postgresql] Detected sequence named 'comp_tasks_task_id_seq' as owned by integer column 'comp_tasks(task_id)', assuming SERIAL and omitting
+  Generating /home/crespo/devp/osparc-simcore/packages/postgres-database/migration/versions/86f
+ca23596da_adding_storage_service_tables.py ... done
+```
+Auto-generates some scripts under [migration/versions](packages/postgres-database/migration/versions). The migration script **needs to be reviewed and edited**, as Alembic currently does not detect every change you
+make to your models. In particular, Alembic is currently unable to detect:
+- table name changes,
+- column name changes,
+- or anonymously named constraints
+A detailed summary of limitations can be found in the Alembic autogenerate documentation.
+Once finalized, the migration script also needs to be added to version control.
+
+### Upgrade
+
+Then you can apply the migration to the database:
+```command
+alembic upgrade head
+```
+Then each time the database models change repeat the migrate and upgrade commands.
+
+To sync the database in another system just refresh the migrations folder from source control and run the upgrade command.
+
+
+[flask-migrate]:https://flask-migrate.readthedocs.io/en/latest/
+[alembic]:https://alembic.sqlalchemy.org/en/latest/
+
+
+## Migration of databases already online
+
+**Context:**
+- There is a database already online and with data that we want to preserve
+- There are **no** migration scripts
+
+```command
+alembic init migration
+# setup config
+
+alembic revision --autogenerate -m "Init tables"
+alembic stamp head # stamps the revision database with the given revision but do not run migrations
+alembic revision --autogenerate -m "Added column to file_meta_data"
+alembic upgrade head
+```
+
+
+## Use cases
+**A table has been altered*
+
+We create a revision script for the change by using the local db as follows:
+
+```bash
+pip install -r packages/postgres-database/requirements/dev.txt # install sc-pg package
+docker-compose -f services/docker-compose.yml -f services/docker-compose-tools.yml up adminer # bring db and ui up
+docker ps # find the published port for the db
+sc-pg discover -u simcore -p simcore --port=32787 # discover the db
+sp-pg info # what revision are we at?
+sc-pg upgrade head # to to latest if necessary
+sc-pg review -m "Altered_table_why" # create a revision, note: the string will be part of the script
+sc-pg upgrade head # apply the revision
+sc-pg downgrade -- -1 # go back to old revision if sth went banana
+```
diff --git a/packages/postgres-database/src/simcore_postgres_database/migration/env.py b/packages/postgres-database/src/simcore_postgres_database/migration/env.py
new file mode 100644
index 00000000000..6836d5ae008
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/migration/env.py
@@ -0,0 +1,76 @@
+
+from logging.config import fileConfig
+
+from alembic import context
+from sqlalchemy import engine_from_config, pool
+
+from simcore_postgres_database.settings import target_metadatas
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+fileConfig(config.config_file_name)
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+target_metadata = target_metadatas
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+
+
+def run_migrations_offline():
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+    # pylint: disable=no-member
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(
+        url=url, target_metadata=target_metadata, literal_binds=True
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online():
+    """Run migrations in 'online' mode.
+
+    In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+    # pylint: disable=no-member
+    connectable = engine_from_config(
+        config.get_section(config.config_ini_section),
+        prefix="sqlalchemy.",
+        poolclass=pool.NullPool,
+    )
+
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection, target_metadata=target_metadata
+        )
+
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+# pylint: disable=no-member
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()
diff --git a/packages/postgres-database/src/simcore_postgres_database/migration/script.py.mako b/packages/postgres-database/src/simcore_postgres_database/migration/script.py.mako
new file mode 100644
index 00000000000..2c0156303a8
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/migration/script.py.mako
@@ -0,0 +1,24 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision = ${repr(up_revision)}
+down_revision = ${repr(down_revision)}
+branch_labels = ${repr(branch_labels)}
+depends_on = ${repr(depends_on)}
+
+
+def upgrade():
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade():
+    ${downgrades if downgrades else "pass"}
diff --git a/packages/postgres-database/src/simcore_postgres_database/migration/versions/20ec678d7dad_nullable_project_columns.py b/packages/postgres-database/src/simcore_postgres_database/migration/versions/20ec678d7dad_nullable_project_columns.py
new file mode 100644
index 00000000000..ab4a2ff0e02
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/migration/versions/20ec678d7dad_nullable_project_columns.py
@@ -0,0 +1,38 @@
+"""Nullable project columns
+
+Revision ID: 20ec678d7dad
+Revises: 99db5efc4548
+Create Date: 2019-07-04 08:44:35.901118+00:00
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '20ec678d7dad'
+down_revision = '99db5efc4548'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('projects', 'description',
+               existing_type=sa.VARCHAR(),
+               nullable=True)
+    op.alter_column('projects', 'thumbnail',
+               existing_type=sa.VARCHAR(),
+               nullable=True)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('projects', 'thumbnail',
+               existing_type=sa.VARCHAR(),
+               nullable=False)
+    op.alter_column('projects', 'description',
+               existing_type=sa.VARCHAR(),
+               nullable=False)
+    # ### end Alembic commands ###
diff --git a/packages/postgres-database/src/simcore_postgres_database/migration/versions/645807399320_init_tables.py b/packages/postgres-database/src/simcore_postgres_database/migration/versions/645807399320_init_tables.py
new file mode 100644
index 00000000000..4e05b14d235
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/migration/versions/645807399320_init_tables.py
@@ -0,0 +1,123 @@
+"""Init tables
+
+Revision ID: 645807399320
+Revises: 
+Create Date: 2019-06-21 13:14:40.700747+00:00
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '645807399320'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('comp_pipeline',
+    sa.Column('project_id', sa.String(), nullable=False),
+    sa.Column('dag_adjacency_list', sa.JSON(), nullable=True),
+    sa.Column('state', sa.String(), nullable=True),
+    sa.PrimaryKeyConstraint('project_id')
+    )
+    op.create_table('projects',
+    sa.Column('id', sa.BigInteger(), nullable=False),
+    sa.Column('type', sa.Enum('TEMPLATE', 'STANDARD', name='projecttype'), nullable=False),
+    sa.Column('uuid', sa.String(), nullable=False),
+    sa.Column('name', sa.String(), nullable=False),
+    sa.Column('description', sa.String(), nullable=False),
+    sa.Column('thumbnail', sa.String(), nullable=False),
+    sa.Column('prj_owner', sa.String(), nullable=False),
+    sa.Column('creation_date', sa.DateTime(), nullable=False),
+    sa.Column('last_change_date', sa.DateTime(), nullable=False),
+    sa.Column('workbench', sa.JSON(), nullable=False),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('uuid')
+    )
+    op.create_table('users',
+    sa.Column('id', sa.BigInteger(), nullable=False),
+    sa.Column('name', sa.String(), nullable=False),
+    sa.Column('email', sa.String(), nullable=False),
+    sa.Column('password_hash', sa.String(), nullable=False),
+    sa.Column('status', sa.Enum('CONFIRMATION_PENDING', 'ACTIVE', 'BANNED', name='userstatus'), nullable=False),
+    sa.Column('role', sa.Enum('ANONYMOUS', 'GUEST', 'USER', 'TESTER', name='userrole'), nullable=False),
+    sa.Column('created_at', sa.DateTime(), nullable=False),
+    sa.Column('created_ip', sa.String(), nullable=True),
+    sa.PrimaryKeyConstraint('id', name='user_pkey'),
+    sa.UniqueConstraint('email', name='user_login_key')
+    )
+    op.create_table('comp_tasks',
+    sa.Column('task_id', sa.Integer(), nullable=False),
+    sa.Column('project_id', sa.String(), nullable=True),
+    sa.Column('node_id', sa.String(), nullable=True),
+    sa.Column('job_id', sa.String(), nullable=True),
+    sa.Column('internal_id', sa.Integer(), nullable=True),
+    sa.Column('schema', sa.JSON(), nullable=True),
+    sa.Column('inputs', sa.JSON(), nullable=True),
+    sa.Column('outputs', sa.JSON(), nullable=True),
+    sa.Column('image', sa.JSON(), nullable=True),
+    sa.Column('state', sa.Integer(), nullable=True),
+    sa.Column('submit', sa.DateTime(), nullable=True),
+    sa.Column('start', sa.DateTime(), nullable=True),
+    sa.Column('end', sa.DateTime(), nullable=True),
+    sa.ForeignKeyConstraint(['project_id'], ['comp_pipeline.project_id'], ),
+    sa.PrimaryKeyConstraint('task_id')
+    )
+    op.create_table('confirmations',
+    sa.Column('code', sa.Text(), nullable=False),
+    sa.Column('user_id', sa.BigInteger(), nullable=True),
+    sa.Column('action', sa.Enum('REGISTRATION', 'RESET_PASSWORD', 'CHANGE_EMAIL', 'INVITATION', name='confirmationaction'), nullable=False),
+    sa.Column('data', sa.Text(), nullable=True),
+    sa.Column('created_at', sa.DateTime(), nullable=False),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], name='user_confirmation_fkey', ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('code', name='confirmation_code')
+    )
+    op.create_table('tokens',
+    sa.Column('token_id', sa.BigInteger(), nullable=False),
+    sa.Column('user_id', sa.BigInteger(), nullable=False),
+    sa.Column('token_service', sa.String(), nullable=False),
+    sa.Column('token_data', sa.JSON(), nullable=False),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
+    sa.PrimaryKeyConstraint('token_id')
+    )
+    op.create_table('user_to_projects',
+    sa.Column('id', sa.BigInteger(), nullable=False),
+    sa.Column('user_id', sa.BigInteger(), nullable=False),
+    sa.Column('project_id', sa.BigInteger(), nullable=False),
+    sa.ForeignKeyConstraint(['project_id'], ['projects.id'], ),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('file_meta_data',
+    sa.Column('file_uuid', sa.String(), nullable=False),
+    sa.Column('location_id', sa.String(), nullable=True),
+    sa.Column('location', sa.String(), nullable=True),
+    sa.Column('bucket_name', sa.String(), nullable=True),
+    sa.Column('object_name', sa.String(), nullable=True),
+    sa.Column('project_id', sa.String(), nullable=True),
+    sa.Column('project_name', sa.String(), nullable=True),
+    sa.Column('node_id', sa.String(), nullable=True),
+    sa.Column('node_name', sa.String(), nullable=True),
+    sa.Column('file_name', sa.String(), nullable=True),
+    sa.Column('user_id', sa.String(), nullable=True),
+    sa.Column('user_name', sa.String(), nullable=True),
+    sa.PrimaryKeyConstraint('file_uuid')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('file_meta_data')
+    op.drop_table('user_to_projects')
+    op.drop_table('tokens')
+    op.drop_table('confirmations')
+    op.drop_table('comp_tasks')
+    op.drop_table('users')
+    op.drop_table('projects')
+    op.drop_table('comp_pipeline')
+    # ### end Alembic commands ###
diff --git a/packages/postgres-database/src/simcore_postgres_database/migration/versions/99db5efc4548_added_column_to_file_meta_data.py b/packages/postgres-database/src/simcore_postgres_database/migration/versions/99db5efc4548_added_column_to_file_meta_data.py
new file mode 100644
index 00000000000..3a57e96f025
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/migration/versions/99db5efc4548_added_column_to_file_meta_data.py
@@ -0,0 +1,38 @@
+"""Added column to file_meta_data
+
+Revision ID: 99db5efc4548
+Revises: 645807399320
+Create Date: 2019-06-21 13:22:23.214635+00:00
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '99db5efc4548'
+down_revision = '645807399320'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('file_meta_data', sa.Column('created_at', sa.String(), nullable=True))
+    op.add_column('file_meta_data', sa.Column('display_file_path', sa.String(), nullable=True))
+    op.add_column('file_meta_data', sa.Column('file_id', sa.String(), nullable=True))
+    op.add_column('file_meta_data', sa.Column('file_size', sa.Integer(), nullable=True))
+    op.add_column('file_meta_data', sa.Column('last_modified', sa.String(), nullable=True))
+    op.add_column('file_meta_data', sa.Column('raw_file_path', sa.String(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('file_meta_data', 'raw_file_path')
+    op.drop_column('file_meta_data', 'last_modified')
+    op.drop_column('file_meta_data', 'file_size')
+    op.drop_column('file_meta_data', 'file_id')
+    op.drop_column('file_meta_data', 'display_file_path')
+    op.drop_column('file_meta_data', 'created_at')
+    # ### end Alembic commands ###
diff --git a/packages/postgres-database/src/simcore_postgres_database/migration/versions/add5f60f0f67_adds_published_colums_in_projects_table.py b/packages/postgres-database/src/simcore_postgres_database/migration/versions/add5f60f0f67_adds_published_colums_in_projects_table.py
new file mode 100644
index 00000000000..d3cd58e7f26
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/migration/versions/add5f60f0f67_adds_published_colums_in_projects_table.py
@@ -0,0 +1,35 @@
+"""Adds published columns in projects table
+
+Revision ID: add5f60f0f67
+Revises: 20ec678d7dad
+Create Date: 2019-07-07 19:04:09.502576+00:00
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'add5f60f0f67'
+down_revision = '20ec678d7dad'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('projects', sa.Column('published', sa.Boolean(), default=True))
+    # ### end Alembic commands ###
+
+    # Applies the default to all
+    query = 'UPDATE "projects" SET published=false;'
+    op.execute(query)
+    # makes non nullable
+    query = 'ALTER TABLE "projects" ALTER "published" SET NOT NULL;'
+    op.execute(query)
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('projects', 'published')
+    # ### end Alembic commands ###
diff --git a/packages/postgres-database/src/simcore_postgres_database/models/__init__.py b/packages/postgres-database/src/simcore_postgres_database/models/__init__.py
new file mode 100644
index 00000000000..dfa8b309243
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/models/__init__.py
@@ -0,0 +1,6 @@
+""" tables
+
+  We use a classical Mapping w/o using a Declarative system.
+
+ See https://docs.sqlalchemy.org/en/latest/orm/mapping_styles.html#classical-mappings
+ """
diff --git a/packages/postgres-database/src/simcore_postgres_database/models/base.py b/packages/postgres-database/src/simcore_postgres_database/models/base.py
new file mode 100644
index 00000000000..707221ae332
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/models/base.py
@@ -0,0 +1,11 @@
+""" Contains model's metadata
+
+    - Collects all table's schemas
+    - Metadata object needed to explicitly define table schemas
+"""
+from sqlalchemy.ext.declarative import declarative_base
+
+#  DO NOT inheriting from _base. Use instead explicit table definitions
+#  See https://docs.sqlalchemy.org/en/latest/orm/mapping_styles.html#classical-mappings
+_base = declarative_base()
+metadata = _base.metadata
diff --git a/packages/postgres-database/src/simcore_postgres_database/models/comp_pipeline.py b/packages/postgres-database/src/simcore_postgres_database/models/comp_pipeline.py
new file mode 100644
index 00000000000..d81d67ebce7
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/models/comp_pipeline.py
@@ -0,0 +1,23 @@
+""" Computational Pipeline Table
+
+"""
+import uuid
+
+import sqlalchemy as sa
+
+from .base import metadata
+
+UNKNOWN = 0
+PENDING = 1
+RUNNING = 2
+SUCCESS = 3
+FAILED = 4
+
+def _new_uuid():
+    return str(uuid.uuid4())
+
+comp_pipeline = sa.Table("comp_pipeline", metadata,
+    sa.Column("project_id", sa.String, primary_key=True, default=_new_uuid),
+    sa.Column("dag_adjacency_list", sa.JSON),
+    sa.Column("state", sa.String, default=UNKNOWN) # TODO: MaG should not string??
+)
diff --git a/packages/postgres-database/src/simcore_postgres_database/models/comp_tasks.py b/packages/postgres-database/src/simcore_postgres_database/models/comp_tasks.py
new file mode 100644
index 00000000000..77c7b85724a
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/models/comp_tasks.py
@@ -0,0 +1,31 @@
+
+""" Computational Tasks Table
+
+"""
+import sqlalchemy as sa
+
+from .base import metadata
+from .comp_pipeline import UNKNOWN
+
+comp_tasks = sa.Table("comp_tasks", metadata,
+    # this task db id
+    sa.Column("task_id", sa.Integer, primary_key=True),
+    sa.Column("project_id", sa.String, sa.ForeignKey('comp_pipeline.project_id')),
+    # dag node id
+    sa.Column("node_id", sa.String),
+    # celery task id
+    sa.Column("job_id", sa.String),
+    # internal id (better for debugging, nodes from 1 to N)
+    sa.Column("internal_id", sa.Integer),
+
+    sa.Column("schema", sa.JSON),
+    sa.Column("inputs", sa.JSON),
+    sa.Column("outputs", sa.JSON),
+    sa.Column("image", sa.JSON),
+    sa.Column("state", sa.Integer, default=UNKNOWN),
+
+    # utc timestamps for submission/start/end
+    sa.Column("submit", sa.DateTime),
+    sa.Column("start", sa.DateTime),
+    sa.Column("end", sa.DateTime),
+)
diff --git a/packages/postgres-database/src/simcore_postgres_database/models/confirmations.py b/packages/postgres-database/src/simcore_postgres_database/models/confirmations.py
new file mode 100644
index 00000000000..ca7410cca3d
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/models/confirmations.py
@@ -0,0 +1,39 @@
+""" User's confirmations table
+
+    - Keeps a list of tokens to identify an action (registration, invitation, reset, etc) authorized
+    by link to a a user in the framework
+    - These tokens have an expiration date defined by configuration
+
+"""
+import enum
+import sqlalchemy as sa
+
+from .base import metadata
+from .users import users
+
+
+class ConfirmationAction(enum.Enum):
+    REGISTRATION = "REGISTRATION"
+    RESET_PASSWORD = "RESET_PASSWORD"
+    CHANGE_EMAIL = "CHANGE_EMAIL"
+    INVITATION = "INVITATION"
+
+
+
+confirmations = sa.Table("confirmations", metadata,
+    sa.Column("code", sa.Text),
+    sa.Column("user_id", sa.BigInteger),
+    sa.Column("action",
+        sa.Enum(ConfirmationAction),
+        nullable=False,
+        default=ConfirmationAction.REGISTRATION
+    ),
+    sa.Column("data", sa.Text), # TODO: json?
+    sa.Column("created_at", sa.DateTime, nullable=False),
+
+    #
+    sa.PrimaryKeyConstraint("code", name="confirmation_code"),
+    sa.ForeignKeyConstraint(["user_id"], [users.c.id],
+                            name="user_confirmation_fkey",
+                            ondelete="CASCADE"),
+ )
diff --git a/packages/postgres-database/src/simcore_postgres_database/models/file_meta_data.py b/packages/postgres-database/src/simcore_postgres_database/models/file_meta_data.py
new file mode 100644
index 00000000000..f95a37a18bc
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/models/file_meta_data.py
@@ -0,0 +1,26 @@
+import sqlalchemy as sa
+
+from .base import metadata
+
+file_meta_data = sa.Table(
+    "file_meta_data", metadata,
+    sa.Column("file_uuid", sa.String, primary_key=True),
+    sa.Column("location_id", sa.String),
+    sa.Column("location", sa.String),
+    sa.Column("bucket_name", sa.String),
+    sa.Column("object_name", sa.String),
+    sa.Column("project_id", sa.String),
+    sa.Column("project_name", sa.String),
+    sa.Column("node_id", sa.String),
+    sa.Column("node_name", sa.String),
+    sa.Column("file_name", sa.String),
+    sa.Column("user_id", sa.String),
+    sa.Column("user_name", sa.String),
+    sa.Column("file_id", sa.String),
+    sa.Column("raw_file_path", sa.String),
+    sa.Column("display_file_path", sa.String),
+    sa.Column("created_at", sa.String),
+    sa.Column("last_modified", sa.String),
+    sa.Column("file_size", sa.Integer)
+#    sa.Column("state", sa.String())
+)
diff --git a/packages/postgres-database/src/simcore_postgres_database/models/projects.py b/packages/postgres-database/src/simcore_postgres_database/models/projects.py
new file mode 100644
index 00000000000..d1de2b6bd54
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/models/projects.py
@@ -0,0 +1,38 @@
+""" Projects table
+
+    - Every row fits a project document schemed as api/specs/webserver/v0/components/schemas/project-v0.0.1.json
+
+"""
+import enum
+import logging
+from datetime import datetime
+
+import sqlalchemy as sa
+
+from .base import metadata
+
+log = logging.getLogger(__name__)
+
+
+class ProjectType(enum.Enum):
+    """
+        template: template project
+        standard: standard project
+    """
+    TEMPLATE = "template"
+    STANDARD = "standard"
+
+
+projects = sa.Table("projects", metadata,
+    sa.Column("id", sa.BigInteger, nullable=False, primary_key=True),
+    sa.Column("type", sa.Enum(ProjectType), nullable=False, default=ProjectType.STANDARD),
+    sa.Column("uuid", sa.String, nullable=False, unique=True),
+    sa.Column("name", sa.String, nullable=False),
+    sa.Column("description", sa.String, nullable=True),
+    sa.Column("thumbnail", sa.String, nullable=True),
+    sa.Column("prj_owner", sa.String, nullable=False),
+    sa.Column("creation_date", sa.DateTime(), nullable=False, default=datetime.utcnow),
+    sa.Column("last_change_date", sa.DateTime(), nullable=False, default=datetime.utcnow),
+    sa.Column("workbench", sa.JSON, nullable=False),
+    sa.Column("published", sa.Boolean, nullable=False, default=False)
+)
diff --git a/packages/postgres-database/src/simcore_postgres_database/models/tokens.py b/packages/postgres-database/src/simcore_postgres_database/models/tokens.py
new file mode 100644
index 00000000000..6cbef180981
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/models/tokens.py
@@ -0,0 +1,15 @@
+""" User Tokens table
+"""
+import sqlalchemy as sa
+
+from .base import metadata
+from .users import users
+
+# NOTE: this is another way of of defining keys ...
+tokens = sa.Table("tokens", metadata,
+    sa.Column("token_id", sa.BigInteger, nullable=False, primary_key=True),
+    sa.Column("user_id", sa.BigInteger, sa.ForeignKey(users.c.id), nullable=False),
+    sa.Column("token_service", sa.String, nullable=False),
+    sa.Column("token_data", sa.JSON, nullable=False),
+
+)
diff --git a/packages/postgres-database/src/simcore_postgres_database/models/user_to_projects.py b/packages/postgres-database/src/simcore_postgres_database/models/user_to_projects.py
new file mode 100644
index 00000000000..4c3dde718b0
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/models/user_to_projects.py
@@ -0,0 +1,11 @@
+import sqlalchemy as sa
+
+from .base import metadata
+from .projects import projects
+from .users import users
+
+user_to_projects = sa.Table("user_to_projects", metadata,
+    sa.Column("id", sa.BigInteger, nullable=False, primary_key=True),
+    sa.Column("user_id", sa.BigInteger, sa.ForeignKey(users.c.id), nullable=False),
+    sa.Column("project_id", sa.BigInteger, sa.ForeignKey(projects.c.id), nullable=False)
+)
diff --git a/packages/postgres-database/src/simcore_postgres_database/models/users.py b/packages/postgres-database/src/simcore_postgres_database/models/users.py
new file mode 100644
index 00000000000..5410b11fb74
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/models/users.py
@@ -0,0 +1,76 @@
+""" Users table
+
+    - List of users in the framework
+    - Users they have a role within the framework that provides
+    them different access levels to it
+"""
+import itertools
+from datetime import datetime
+from enum import Enum
+
+import sqlalchemy as sa
+
+from .base import metadata
+
+
+class UserRole(Enum):
+    """ SORTED enumeration of user roles
+
+    A role defines a set of privileges the user can perform
+    Roles are sorted from lower to highest privileges
+    USER is the role assigned by default A user with a higher/lower role is denoted super/infra user
+
+    ANONYMOUS : The user is not logged in
+    GUEST     : Temporary user with very limited access. Main used for demos and for a limited amount of time
+    USER      : Registered user. Basic permissions to use the platform [default]
+    TESTER    : Upgraded user. First level of super-user with privileges to test the framework.
+                Can use everything but does not have an effect in other users or actual data
+
+    See security_access.py
+    """
+    ANONYMOUS = "ANONYMOUS"
+    GUEST = "GUEST"
+    USER = "USER"
+    TESTER = "TESTER"
+
+    @classmethod
+    def super_users(cls):
+        return list(itertools.takewhile(lambda e: e!=cls.USER, cls))
+
+    # TODO: add comparison https://portingguide.readthedocs.io/en/latest/comparisons.html
+
+
+
+class UserStatus(Enum):
+    """
+        pending: user registered but not confirmed
+        active: user is confirmed and can use the platform
+        banned: user is not authorized
+    """
+    CONFIRMATION_PENDING = "PENDING"
+    ACTIVE = "ACTIVE"
+    BANNED = "BANNED"
+
+
+
+
+users = sa.Table("users", metadata,
+    sa.Column("id", sa.BigInteger, nullable=False),
+    sa.Column("name", sa.String, nullable=False),
+    sa.Column("email", sa.String, nullable=False),
+    sa.Column("password_hash", sa.String, nullable=False),
+    sa.Column("status",
+        sa.Enum(UserStatus),
+        nullable=False,
+        default=UserStatus.CONFIRMATION_PENDING),
+    sa.Column("role",
+        sa.Enum(UserRole),
+        nullable=False,
+        default=UserRole.USER),
+    sa.Column("created_at", sa.DateTime(), nullable=False, default=datetime.utcnow),
+    sa.Column("created_ip", sa.String(), nullable=True),
+
+    #
+    sa.PrimaryKeyConstraint("id", name="user_pkey"),
+    sa.UniqueConstraint("email", name="user_login_key"),
+)
diff --git a/packages/postgres-database/src/simcore_postgres_database/settings.py b/packages/postgres-database/src/simcore_postgres_database/settings.py
new file mode 100644
index 00000000000..734106b313f
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/settings.py
@@ -0,0 +1,17 @@
+from . import metadata
+from yarl import URL
+
+# Schemas metadata (pre-loaded in __init__.py)
+target_metadatas = [metadata, ]
+
+def build_url(host, port, database, user=None, password=None) -> URL:
+    """ postgresql+psycopg2://{user}:{password}@{host}:{port}/{database} """
+    return URL.build(scheme="postgresql+psycopg2",
+        user=user, password=password,
+        host=host, port=port,
+        path=f"/{database}")
+
+__all__ = [
+    'target_metadatas',
+    'build_url'
+]
diff --git a/packages/postgres-database/src/simcore_postgres_database/storage_models.py b/packages/postgres-database/src/simcore_postgres_database/storage_models.py
new file mode 100644
index 00000000000..c4f39cdabc8
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/storage_models.py
@@ -0,0 +1,20 @@
+""" Facade for storage service (tables manager)
+
+    - Facade to direct access to models in the database by
+    the storage service
+"""
+from .models.base import metadata
+from .models.file_meta_data import file_meta_data
+from .models.projects import projects
+from .models.tokens import tokens
+from .models.user_to_projects import user_to_projects
+from .models.user_to_projects import users
+
+__all__ = [
+    "tokens",
+    "file_meta_data",
+    "metadata",
+    "projects",
+    "user_to_projects",
+    "users"
+]
diff --git a/packages/postgres-database/src/simcore_postgres_database/webserver_models.py b/packages/postgres-database/src/simcore_postgres_database/webserver_models.py
new file mode 100644
index 00000000000..c22298f5f08
--- /dev/null
+++ b/packages/postgres-database/src/simcore_postgres_database/webserver_models.py
@@ -0,0 +1,23 @@
+""" Facade for webserver service
+
+    Facade to direct access to models in the database by
+    the  webserver service
+
+"""
+from .models.comp_pipeline import comp_pipeline
+from .models.comp_tasks import comp_tasks
+from .models.confirmations import ConfirmationAction, confirmations
+from .models.projects import ProjectType, projects
+from .models.tokens import tokens
+from .models.user_to_projects import user_to_projects
+from .models.users import UserRole, UserStatus, users
+
+__all__ = [
+    "users", "UserRole", "UserStatus",
+    "projects", "ProjectType",
+    "user_to_projects",
+    "confirmations", "ConfirmationAction",
+    "tokens",
+    "comp_tasks",
+    "comp_pipeline"
+]
diff --git a/ops/db/example/docker-compose.yml b/packages/postgres-database/tests/docker-compose.yml
similarity index 61%
rename from ops/db/example/docker-compose.yml
rename to packages/postgres-database/tests/docker-compose.yml
index 664ec292cf1..d495bca069d 100644
--- a/ops/db/example/docker-compose.yml
+++ b/packages/postgres-database/tests/docker-compose.yml
@@ -6,6 +6,10 @@ services:
       - POSTGRES_USER=test
       - POSTGRES_PASSWORD=test
       - POSTGRES_DB=test
+      - POSTGRES_HOST=localhost
+      - POSTGRES_PORT=5432
+    volumes:
+      - test_postgres_database_volume:/var/lib/postgresql/data
     ports:
       - "5432:5432"
   adminer:
@@ -14,3 +18,5 @@ services:
       - 18080:8080
     depends_on:
       - postgres
+volumes:
+  test_postgres_database_volume:
diff --git a/packages/s3wrapper/src/s3wrapper/s3_client.py b/packages/s3wrapper/src/s3wrapper/s3_client.py
index bd5dfe1d3a1..7ffc2307d86 100644
--- a/packages/s3wrapper/src/s3wrapper/s3_client.py
+++ b/packages/s3wrapper/src/s3wrapper/s3_client.py
@@ -16,6 +16,9 @@ class S3Client:
     def __init__(self, endpoint, access_key=None, secret_key=None, secure=False):
         self.__metadata_prefix = "x-amz-meta-"
         self.client = None
+        self.endpoint = endpoint
+        self.access_key = access_key
+        self.secret_key = secret_key
         try:
             self.client = Minio(endpoint,
                 access_key=access_key,
diff --git a/packages/service-library/src/servicelib/decorators.py b/packages/service-library/src/servicelib/decorators.py
new file mode 100644
index 00000000000..ae8e156a284
--- /dev/null
+++ b/packages/service-library/src/servicelib/decorators.py
@@ -0,0 +1,34 @@
+""" General purpose decorators
+
+IMPORTANT: lowest level module
+   I order to avoid cyclic dependences, please
+   DO NOT IMPORT ANYTHING from .
+"""
+import logging
+from copy import deepcopy
+from functools import wraps
+
+log = logging.getLogger(__name__)
+
+
+
+def safe_return(if_fails_return=False, catch=None, logger=None):
+    # defaults
+    if catch is None:
+        catch = (RuntimeError, )
+    if logger is None:
+        logger = log
+
+    def decorate(func):
+        @wraps(func)
+        def safe_func(*args, **kargs):
+            try:
+                res = func(*args, **kargs)
+                return res
+            except catch as err:
+                logger.info("%s failed:  %s", func.__name__, str(err))
+            except Exception: #pylint: disable=broad-except
+                logger.info("%s failed unexpectedly", func.__name__, exc_info=True)
+            return deepcopy(if_fails_return) # avoid issues with default mutables
+        return safe_func
+    return decorate
diff --git a/packages/service-library/tests/test_decorators.py b/packages/service-library/tests/test_decorators.py
new file mode 100644
index 00000000000..69142b6c30c
--- /dev/null
+++ b/packages/service-library/tests/test_decorators.py
@@ -0,0 +1,22 @@
+from servicelib.decorators import safe_return
+
+
+def test_safe_return_decorator():
+    class MyException(Exception):
+        pass
+
+    @safe_return(if_fails_return=False, catch=(MyException,), logger=None)
+    def raise_my_exception():
+        raise MyException()
+
+    assert not raise_my_exception()
+
+def test_safe_return_mutables():
+    some_mutable_return = ['some', 'defaults']
+
+    @safe_return(if_fails_return=some_mutable_return)
+    def return_mutable():
+        raise RuntimeError("Runtime is default")
+
+    assert return_mutable() == some_mutable_return # contains the same
+    assert not (return_mutable() is some_mutable_return) # but is not the same
diff --git a/packages/simcore-sdk/requirements/ci.txt b/packages/simcore-sdk/requirements/ci.txt
index a80098fd923..efdc6c4a751 100644
--- a/packages/simcore-sdk/requirements/ci.txt
+++ b/packages/simcore-sdk/requirements/ci.txt
@@ -10,6 +10,7 @@
 -r _test.txt
 
 # installs this repo's packages
+../postgres-database/
 ../s3wrapper/
 ../../services/storage/client-sdk/python/ # Needed ONLY for testing
 
diff --git a/packages/simcore-sdk/requirements/dev.txt b/packages/simcore-sdk/requirements/dev.txt
index 892e1da2c48..b43d0e601a0 100644
--- a/packages/simcore-sdk/requirements/dev.txt
+++ b/packages/simcore-sdk/requirements/dev.txt
@@ -10,6 +10,7 @@
 -r _test.txt
 
 # installs this repo's packages
+-e ../postgres-database/
 -e ../s3wrapper/
 ../../services/storage/client-sdk/python/ # Needed ONLY for testing
 
diff --git a/packages/simcore-sdk/setup.py b/packages/simcore-sdk/setup.py
index 59a2adc072b..18848fa2792 100644
--- a/packages/simcore-sdk/setup.py
+++ b/packages/simcore-sdk/setup.py
@@ -13,6 +13,7 @@ def read_reqs( reqs_path: Path):
 
 install_requirements = read_reqs( here / "requirements" / "_base.in" )
 test_requirements = read_reqs( here / "requirements" / "_test.txt" ) + [
+    "simcore-postgres-database==0.1.0",
     "s3wrapper==0.1.0",
     "simcore-service-storage-sdk==0.1.0"
 ]
diff --git a/packages/simcore-sdk/src/simcore_sdk/models/DEPRECATED b/packages/simcore-sdk/src/simcore_sdk/models/DEPRECATED
new file mode 100644
index 00000000000..d599b712cfb
--- /dev/null
+++ b/packages/simcore-sdk/src/simcore_sdk/models/DEPRECATED
@@ -0,0 +1 @@
+To get models, use instead  ``import simcore_postgres_database``
diff --git a/packages/simcore-sdk/src/simcore_sdk/models/base.py b/packages/simcore-sdk/src/simcore_sdk/models/base.py
index d202c5683c0..2431525cfa3 100644
--- a/packages/simcore-sdk/src/simcore_sdk/models/base.py
+++ b/packages/simcore-sdk/src/simcore_sdk/models/base.py
@@ -1,7 +1,5 @@
-from sqlalchemy.ext.declarative import declarative_base
+from simcore_postgres_database.models.base import metadata
 
-# TODO: avoid inheriting from Base. Use instead explicit table definitions
-# See https://docs.sqlalchemy.org/en/latest/orm/mapping_styles.html#classical-mappings
-Base = declarative_base()
-
-metadata = Base.metadata
+__all__ = [
+    "metadata"
+]
diff --git a/packages/simcore-sdk/src/simcore_sdk/models/pipeline_models.py b/packages/simcore-sdk/src/simcore_sdk/models/pipeline_models.py
index c91bb7236b1..258534f2d08 100644
--- a/packages/simcore-sdk/src/simcore_sdk/models/pipeline_models.py
+++ b/packages/simcore-sdk/src/simcore_sdk/models/pipeline_models.py
@@ -1,22 +1,27 @@
-import uuid
+# DEPRECATED: Use instead postgres-database
+from sqlalchemy.orm import mapper
 
 import networkx as nx
-from sqlalchemy import JSON, Column, DateTime, ForeignKey, Integer, String
+from simcore_postgres_database.models.comp_pipeline import (FAILED, PENDING,
+                                                            RUNNING, SUCCESS,
+                                                            UNKNOWN,
+                                                            comp_pipeline)
+from simcore_postgres_database.models.comp_tasks import comp_tasks
 
-from .base import Base
+from .base import metadata
 
-UNKNOWN = 0
-PENDING = 1
-RUNNING = 2
-SUCCESS = 3
-FAILED = 4
 
-class ComputationalPipeline(Base):
-    __tablename__ = 'comp_pipeline'
+# NOTE: All this file ises classical mapping to keep LEGACY
+class Base:
+    metadata = metadata
 
-    project_id = Column(String, primary_key=True, default=str(uuid.uuid4()))
-    dag_adjacency_list = Column(JSON)
-    state = Column(String, default=UNKNOWN)
+
+class ComputationalPipeline:
+    #pylint: disable=no-member
+    def __init__(self, **kargs):
+        for key, value in kargs.items():
+            assert key in ComputationalPipeline._sa_class_manager.keys()
+            setattr(self, key, value)
 
     @property
     def execution_graph(self):
@@ -34,25 +39,26 @@ def execution_graph(self):
     def __repr__(self):
         return '<id {}>'.format(self.id)
 
-class ComputationalTask(Base):
-    __tablename__ = 'comp_tasks'
-    # this task db id
-    task_id = Column(Integer, primary_key=True)
-    project_id = Column(String, ForeignKey('comp_pipeline.project_id'))
-    # dag node id
-    node_id = Column(String)
-    # celery task id
-    job_id = Column(String)
-    # internal id (better for debugging, nodes from 1 to N)
-    internal_id = Column(Integer)
-    
-    schema = Column(JSON)
-    inputs = Column(JSON)
-    outputs = Column(JSON)
-    image = Column(JSON)
-    state = Column(Integer, default=UNKNOWN)
-
-    # utc timestamps for submission/start/end
-    submit = Column(DateTime)
-    start = Column(DateTime)
-    end = Column(DateTime)
+mapper(ComputationalPipeline, comp_pipeline)
+
+
+
+
+
+class ComputationalTask:
+    #pylint: disable=no-member
+    def __init__(self, **kargs):
+        for key, value in kargs.items():
+            assert key in ComputationalTask._sa_class_manager.keys()
+            setattr(self, key, value)
+
+
+mapper(ComputationalTask, comp_tasks)
+
+
+__all__ = [
+    "metadata",
+    "ComputationalPipeline",
+    "ComputationalTask",
+    "UNKNOWN", "PENDING", "RUNNING", "SUCCESS", "FAILED"
+]
diff --git a/packages/simcore-sdk/src/simcore_sdk/node_ports/dbmanager.py b/packages/simcore-sdk/src/simcore_sdk/node_ports/dbmanager.py
index a870da6cf4d..a307371c691 100644
--- a/packages/simcore-sdk/src/simcore_sdk/node_ports/dbmanager.py
+++ b/packages/simcore-sdk/src/simcore_sdk/node_ports/dbmanager.py
@@ -55,6 +55,7 @@ def _get_node_from_db(node_uuid: str, session: sqlalchemy.orm.session.Session) -
     log.debug("Reading from database for node uuid %s", node_uuid)
     try:
         # project id should be also defined but was not the case before
+        # pylint: disable=no-member
         criteria = (NodeModel.node_id == node_uuid if config.PROJECT_ID == 'undefined' else and_(NodeModel.node_id == node_uuid, NodeModel.project_id == config.PROJECT_ID))
         return session.query(NodeModel).filter(criteria).one()
     except exc.NoResultFound:
@@ -66,6 +67,7 @@ class DBManager:
     def __init__(self):
         self._db_settings = DbSettings()
         with session_scope(self._db_settings.Session) as session:
+            # pylint: disable=no-member
             # project id should be also defined but was not the case before
             criteria = (NodeModel.node_id == config.NODE_UUID if config.PROJECT_ID == 'undefined' else and_(NodeModel.node_id == config.NODE_UUID, NodeModel.project_id == config.PROJECT_ID))
             node = session.query(NodeModel).filter(criteria).one()
@@ -78,6 +80,7 @@ def write_ports_configuration(self, json_configuration: str, node_uuid: str):
 
         node_configuration = json.loads(json_configuration)
         with session_scope(self._db_settings.Session) as session:
+            # pylint: disable=no-member
             updated_node = NodeModel(schema=node_configuration["schema"], inputs=node_configuration["inputs"], outputs=node_configuration["outputs"])
             node = _get_node_from_db(node_uuid=node_uuid, session=session)
 
diff --git a/packages/simcore-sdk/tests/node_ports/conftest.py b/packages/simcore-sdk/tests/node_ports/conftest.py
index e4adb3c8416..32baf7d285d 100644
--- a/packages/simcore-sdk/tests/node_ports/conftest.py
+++ b/packages/simcore-sdk/tests/node_ports/conftest.py
@@ -159,6 +159,7 @@ def create_config(prev_node_inputs: List[Tuple[str, str, Any]] =None, prev_node_
     postgres.commit()
 
 def _create_new_pipeline(session, project:str)->str:
+    # pylint: disable=no-member
     new_Pipeline = ComputationalPipeline(project_id=project)
     session.add(new_Pipeline)
     session.commit()
diff --git a/packages/simcore-sdk/tests/node_ports/helpers/helpers.py b/packages/simcore-sdk/tests/node_ports/helpers/helpers.py
index 8c2a16a80a9..dbb799e4d77 100644
--- a/packages/simcore-sdk/tests/node_ports/helpers/helpers.py
+++ b/packages/simcore-sdk/tests/node_ports/helpers/helpers.py
@@ -9,14 +9,17 @@
 
 def update_configuration(session, project_id, node_uuid, new_configuration):
     log.debug("Update configuration of pipeline %s, node %s, on session %s", project_id, node_uuid, session)
-    task = session.query(ComputationalTask).filter(ComputationalTask.project_id==str(project_id), ComputationalTask.node_id==str(node_uuid))
+    # pylint: disable=no-member
+    task = session.query(ComputationalTask).filter(
+        ComputationalTask.project_id==str(project_id),
+        ComputationalTask.node_id==str(node_uuid))
     task.update(dict(schema=new_configuration["schema"], inputs=new_configuration["inputs"], outputs=new_configuration["outputs"]))
     session.commit()
     log.debug("Updated configuration")
 
 
 def update_config_file(path, config):
-    
+
     with open(path, "w") as json_file:
         json.dump(config, json_file)
 
diff --git a/packages/simcore-sdk/tests/test_alchemy.py b/packages/simcore-sdk/tests/test_alchemy.py
index 5e160ba57d7..a777a8f2cdc 100644
--- a/packages/simcore-sdk/tests/test_alchemy.py
+++ b/packages/simcore-sdk/tests/test_alchemy.py
@@ -23,7 +23,7 @@ class User(BASE):
 def test_alchemy(engine, session):
     BASE.metadata.create_all(engine)
     users = ['alpha', 'beta', 'gamma']
-    
+
     for u in users:
         data = {}
         data['counter'] = 0
@@ -45,3 +45,39 @@ def test_alchemy(engine, session):
 
     alpha2 = session.query(User).filter(User.name == 'alpha').one()
     assert alpha2.data['counter'] == 42
+
+
+from simcore_sdk.models.pipeline_models import ComputationalPipeline, ComputationalTask, comp_pipeline, comp_tasks
+
+
+def test_legacy_queries_with_mapper_adapter():
+    """Checks to ensure that LEGACY queries still work with
+        mapper adapter
+
+        This test was added to ensure we could `disable no-member`
+        for ComputationalTask and ComputationalPipeline mapped classes
+    """
+    column_type = type(User.name)
+    # pylint: disable=no-member
+
+    assert hasattr(ComputationalTask, "node_id")
+    assert hasattr(ComputationalTask, "project_id")
+    assert isinstance(ComputationalTask.node_id, column_type)
+    assert isinstance(ComputationalTask.project_id, column_type)
+
+    assert hasattr(ComputationalTask, "schema")
+    assert hasattr(ComputationalTask, "inputs")
+    assert hasattr(ComputationalTask, "outputs")
+    assert isinstance(ComputationalTask.schema, column_type)
+    assert isinstance(ComputationalTask.inputs, column_type)
+    assert isinstance(ComputationalTask.outputs, column_type)
+
+    assert hasattr(ComputationalPipeline, "project_id")
+    assert isinstance(ComputationalPipeline.project_id, column_type)
+
+    # pylint: disable=protected-access
+    column_names = set(c.name for c in comp_pipeline.c)
+    assert set(ComputationalPipeline._sa_class_manager.keys()) == column_names
+
+    column_names = set(c.name for c in comp_tasks.c)
+    assert set(ComputationalTask._sa_class_manager.keys()) == column_names
diff --git a/scripts/demo/confirmations-invitations.csv b/scripts/demo/confirmations-invitations.csv
index 9293bf7257e..47c7128bbfa 100644
--- a/scripts/demo/confirmations-invitations.csv
+++ b/scripts/demo/confirmations-invitations.csv
@@ -2,20 +2,20 @@ code,user_id,action,data,created_at
 AOuAejUGDv34i9QtxYK61V7GZmCE4B,1,INVITATION,"{
 ""guest"": ""inviteed@foo.com"" ,
 ""host"" : ""inviter@osparc.io""
-}",2019-06-07 14:38:56.202844
+}",2019-07-08 13:18:16.368438
 uQhnK20tuXWdleIRhZaBcmrWaIrb2p,1,INVITATION,"{
 ""guest"": ""inviteed@foo.com"" ,
 ""host"" : ""inviter@osparc.io""
-}",2019-06-07 14:38:56.202856
+}",2019-07-08 13:18:16.368446
 weedI0YvR6tMA7XEpaxgJZT2Z8SCUy,1,INVITATION,"{
 ""guest"": ""inviteed@foo.com"" ,
 ""host"" : ""inviter@osparc.io""
-}",2019-06-07 14:38:56.202860
+}",2019-07-08 13:18:16.368449
 Q9m5C98ALYZDr1BjilkaaXWSMKxU21,1,INVITATION,"{
 ""guest"": ""inviteed@foo.com"" ,
 ""host"" : ""inviter@osparc.io""
-}",2019-06-07 14:38:56.202864
+}",2019-07-08 13:18:16.368453
 jvhSQfoAAfin4htKgvvRYi3pkYdPhM,1,INVITATION,"{
 ""guest"": ""inviteed@foo.com"" ,
 ""host"" : ""inviter@osparc.io""
-}",2019-06-07 14:38:56.202867
+}",2019-07-08 13:18:16.368459
diff --git a/scripts/demo/create_portal_markdown.py b/scripts/demo/create_portal_markdown.py
index 0885eae01ea..043e9d4cca0 100644
--- a/scripts/demo/create_portal_markdown.py
+++ b/scripts/demo/create_portal_markdown.py
@@ -8,15 +8,15 @@
 import json
 import logging
 import sys
+from contextlib import contextmanager
 from datetime import datetime
 from pathlib import Path
 
-from simcore_service_webserver.login.registration import (URL,
-                                                          get_invitation_url)
-from simcore_service_webserver.login.utils import get_random_string
-from simcore_service_webserver.resources import resources
-from contextlib import contextmanager
+from yarl import URL
 
+from simcore_service_webserver.login.registration import get_invitation_url
+from simcore_service_webserver.login.utils import get_random_string
+#from simcore_service_webserver.resources import resources
 
 CONFIRMATIONS_FILENAME = "confirmations-invitations.csv"
 
@@ -38,10 +38,13 @@
 ]
 
 current_path = Path( sys.argv[0] if __name__ == "__main__" else __file__).resolve()
-logging.basicConfig(level=logging.INFO)
+current_dir = current_path.parent
 
+logging.basicConfig(level=logging.INFO)
 log = logging.getLogger(__name__)
 
+params = {}
+params["154fb4ad-4913-478f-af04-19725db901a7"] = {'stimulation_period_secs': '1200'}
 
 @contextmanager
 def _open(filepath):
@@ -54,17 +57,25 @@ def _open(filepath):
 
 
 def write_list(hostname, url, data, fh):
+    origin = URL(url)
+
     print("## studies available @{}".format(hostname), file=fh)
     print("", file=fh)
     for prj in data:
-        print("- [{name}]({base_url}/study/{uuid})".format(base_url=url, **prj), file=fh)
+        study_url = origin.with_path("study/{uuid}".format(**prj))
+        if prj['uuid'] in params:
+            study_url = study_url.with_query(**params[prj['uuid']])
+        print("- [{name}]({study_url})".format(study_url=str(study_url), **prj), file=fh)
     print("", file=fh)
 
 
 def main(mock_codes):
+    data = {}
+    #with resources.stream('data/fake-template-projects.isan.json') as fp:
+    #    data['localhost'] = json.load(fp)
 
-    with resources.stream('data/fake-template-projects.isan.json') as fp:
-        data = json.load(fp)
+    with open(current_dir / "template-projects/templates_in_master.json") as fp:
+        data['master'] = json.load(fp)
 
     file_path = str(current_path.with_suffix(".md")).replace("create_", "")
     with _open(file_path) as fh:
@@ -72,7 +83,7 @@ def main(mock_codes):
         print("# THE PORTAL Emulator\n", file=fh)
         print("This pages is for testing purposes for issue [#{1}]({0}{1})\n".format(ISSUE, 715), file=fh)
         for hostname, url in HOST_URLS_MAPS:
-            write_list(hostname, url, data, fh)
+            write_list(hostname, url, data.get(hostname, []), fh)
 
         print("---", file=fh)
 
diff --git a/scripts/demo/portal_markdown.md b/scripts/demo/portal_markdown.md
index 2902dc9f3f3..ba32078fcc6 100644
--- a/scripts/demo/portal_markdown.md
+++ b/scripts/demo/portal_markdown.md
@@ -1,35 +1,24 @@
-<!-- Generated by create_portal_markdown.py on 2019-06-07 12:38:56.197106 -->
+<!-- Generated by create_portal_markdown.py on 2019-07-08 15:15:04.106152 -->
 # THE PORTAL Emulator
 
 This pages is for testing purposes for issue [#715](https://github.com/ITISFoundation/osparc-simcore/issues/715)
 
 ## studies available @localhost
 
-- [ISAN: 2D Plot](http://127.0.0.1:9081/study/template-uuid-4d5e-b80e-401c8066782f)
-- [ISAN: 3D Paraview](http://127.0.0.1:9081/study/template-uuid-4d5e-b80e-401c8066781f)
-- [ISAN: MattWard use case](http://127.0.0.1:9081/study/template-uuid-420d-b82d-e80bfa272ebd)
-- [ISAN: UCDavis use case: 0D](http://127.0.0.1:9081/study/template-uuid-1234-a1a7-f7d4f3a8f26b)
 
 ## studies available @master
 
-- [ISAN: 2D Plot](http://master.osparc.io/study/template-uuid-4d5e-b80e-401c8066782f)
-- [ISAN: 3D Paraview](http://master.osparc.io/study/template-uuid-4d5e-b80e-401c8066781f)
-- [ISAN: MattWard use case](http://master.osparc.io/study/template-uuid-420d-b82d-e80bfa272ebd)
-- [ISAN: UCDavis use case: 0D](http://master.osparc.io/study/template-uuid-1234-a1a7-f7d4f3a8f26b)
+- [ISAN2019: 3D Paraview](http://master.osparc.io/study/template-uuid-518d-a25d-8887bcae93f8)
+- [ISAN: MattWard use case](http://master.osparc.io/study/template-uuid-5a9e-9580-c53d92d18803)
+- [ISAN2019 - opencor-py model](http://master.osparc.io/study/154fb4ad-4913-478f-af04-19725db901a7?stimulation_period_secs=1200)
+- [ISAN: 2D Plot](http://master.osparc.io/study/template-uuid-5716-bedd-b409bb021760)
+- [ISAN: UCDavis use case: 0D](http://master.osparc.io/study/template-uuid-5d82-b08d-d39c436ca738)
 
 ## studies available @staging
 
-- [ISAN: 2D Plot](https://staging.osparc.io/study/template-uuid-4d5e-b80e-401c8066782f)
-- [ISAN: 3D Paraview](https://staging.osparc.io/study/template-uuid-4d5e-b80e-401c8066781f)
-- [ISAN: MattWard use case](https://staging.osparc.io/study/template-uuid-420d-b82d-e80bfa272ebd)
-- [ISAN: UCDavis use case: 0D](https://staging.osparc.io/study/template-uuid-1234-a1a7-f7d4f3a8f26b)
 
 ## studies available @production
 
-- [ISAN: 2D Plot](https://osparc.io/study/template-uuid-4d5e-b80e-401c8066782f)
-- [ISAN: 3D Paraview](https://osparc.io/study/template-uuid-4d5e-b80e-401c8066781f)
-- [ISAN: MattWard use case](https://osparc.io/study/template-uuid-420d-b82d-e80bfa272ebd)
-- [ISAN: UCDavis use case: 0D](https://osparc.io/study/template-uuid-1234-a1a7-f7d4f3a8f26b)
 
 ---
 # INVITATIONS Samples:
@@ -51,3 +40,4 @@ This pages is for testing purposes for issue [#715](https://github.com/ITISFound
 - [weedI0YvR6tMA7XEpaxgJZT2Z8SCUy](https://staging.osparc.io/#/registration/?invitation=weedI0YvR6tMA7XEpaxgJZT2Z8SCUy)
 - [Q9m5C98ALYZDr1BjilkaaXWSMKxU21](https://staging.osparc.io/#/registration/?invitation=Q9m5C98ALYZDr1BjilkaaXWSMKxU21)
 - [jvhSQfoAAfin4htKgvvRYi3pkYdPhM](https://staging.osparc.io/#/registration/?invitation=jvhSQfoAAfin4htKgvvRYi3pkYdPhM)
+
diff --git a/scripts/demo/template-projects/converter.py b/scripts/demo/template-projects/converter.py
new file mode 100644
index 00000000000..21e190bd60b
--- /dev/null
+++ b/scripts/demo/template-projects/converter.py
@@ -0,0 +1,74 @@
+import csv
+import json
+import sys
+from pathlib import Path
+from typing import Dict, List
+
+from simcore_service_webserver.projects.projects_db import \
+    _convert_to_schema_names
+
+SEPARATOR=','
+
+current_file = Path(sys.argv[0] if __name__ == "__main__" else __file__).resolve()
+current_dir = current_file.parent
+
+def load_csv(csv_filepath: Path) -> List[Dict]:
+    headers, items = [], []
+    with open(csv_filepath, mode='r', encoding='utf-8-sig') as fhandler:
+        reader = csv.reader(fhandler, delimiter=',', quotechar='"')
+        for row in reader:
+            if row:
+                if not headers:
+                    headers = row
+                else:
+                    item = { key: row[i] for i, key in enumerate(headers) }
+                    items.append(item)
+    return items
+
+
+def load_projects(csv_path:Path ):
+    """ Returns schema-compatible projects
+
+    """
+    db_projects = load_csv(csv_path)
+    _projects = []
+
+    # process
+    for db_prj in db_projects:
+        if int(db_prj['published'])==1:
+            prj = _convert_to_schema_names(db_prj)
+
+            # jsonifies
+            dump = prj['workbench']
+            # TODO: use Encoder instead?
+            dump = dump.replace("False", 'false') \
+                .replace("True", 'true') \
+                .replace("None", 'null')
+            try:
+                prj['workbench'] = json.loads(dump)
+            except json.decoder.JSONDecodeError as err:
+                print(err)
+                # import pdb; pdb.set_trace()
+
+            # TODO: validate against project schema!!
+
+            _projects.append(prj)
+        else:
+            print("skipping {}".format(db_prj['name']))
+
+    return _projects
+
+
+def main():
+    """
+        Converts csv exported from db into project schema-compatible json files
+    """
+    for db_csv_export in current_dir.glob("template*.csv"):
+        data_projects = load_projects(db_csv_export)
+        json_path = db_csv_export.with_suffix('.json')
+        with open(json_path, 'w') as fh:
+            json.dump(data_projects, fh, indent=2)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/demo/template-projects/templates_in_master.csv b/scripts/demo/template-projects/templates_in_master.csv
new file mode 100644
index 00000000000..bd9b6f47909
--- /dev/null
+++ b/scripts/demo/template-projects/templates_in_master.csv
@@ -0,0 +1,9 @@
+type,uuid,name,description,thumbnail,prj_owner,creation_date,last_change_date,workbench,published
+TEMPLATE,template-uuid-5203-915e-1ae8ae0c9991,Sleepers,5 sleepers interconnected,"",maiz@itis.swiss,2019-06-06 14:34:19.631,2019-06-06 14:34:28.647,"{""template-uuid-5f7e-92b0-5a14e84401e9"": {""key"": ""simcore/services/comp/itis/sleeper"", ""version"": ""1.0.0"", ""label"": ""sleeper 0"", ""inputs"": {""in_2"": 2}, ""inputAccess"": {""in_1"": ""Invisible"", ""in_2"": ""ReadOnly""}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 50, ""y"": 300}}, ""template-uuid-5d8a-812c-44dacf56840e"": {""key"": ""simcore/services/comp/itis/sleeper"", ""version"": ""1.0.0"", ""label"": ""sleeper 1"", ""inputs"": {""in_1"": {""nodeUuid"": ""template-uuid-5f7e-92b0-5a14e84401e9"", ""output"": ""out_1""}, ""in_2"": 2}, ""inputNodes"": [""template-uuid-5f7e-92b0-5a14e84401e9""], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 300, ""y"": 200}}, ""template-uuid-5706-b741-4073a4454f0d"": {""key"": ""simcore/services/comp/itis/sleeper"", ""version"": ""1.0.0"", ""label"": ""sleeper 2"", ""inputs"": {""in_1"": {""nodeUuid"": ""template-uuid-5d8a-812c-44dacf56840e"", ""output"": ""out_1""}, ""in_2"": {""nodeUuid"": ""template-uuid-5d8a-812c-44dacf56840e"", ""output"": ""out_2""}}, ""inputNodes"": [""template-uuid-5d8a-812c-44dacf56840e""], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 550, ""y"": 200}}, ""template-uuid-5065-a079-a5a0476e3c10"": {""key"": ""simcore/services/comp/itis/sleeper"", ""version"": ""1.0.0"", ""label"": ""sleeper 3"", ""inputs"": {""in_2"": {""nodeUuid"": ""template-uuid-5f7e-92b0-5a14e84401e9"", ""output"": ""out_2""}}, ""inputNodes"": [""template-uuid-5f7e-92b0-5a14e84401e9""], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 420, ""y"": 400}}, ""template-uuid-559d-aa19-dc9293e10e4c"": {""key"": ""simcore/services/comp/itis/sleeper"", ""version"": ""1.0.0"", ""label"": ""sleeper 4"", ""inputs"": {""in_1"": {""nodeUuid"": ""template-uuid-5706-b741-4073a4454f0d"", ""output"": ""out_1""}, ""in_2"": {""nodeUuid"": ""template-uuid-5065-a079-a5a0476e3c10"", ""output"": ""out_2""}}, ""inputNodes"": [""template-uuid-5706-b741-4073a4454f0d"", ""template-uuid-5065-a079-a5a0476e3c10""], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 800, ""y"": 300}}}",0
+TEMPLATE,template-uuid-54fd-a9d2-d40fcfb89c5f,Kember use case,Kember Cordiac Model with PostPro Viewer,"",maiz@itis.swiss,2019-06-06 14:34:41.832,2019-06-06 14:34:44.981,"{""template-uuid-5f7f-af9c-e91b64c4989e"": {""key"": ""simcore/services/comp/kember-cardiac-model"", ""version"": ""1.0.0"", ""label"": ""Kember cardiac model"", ""inputs"": {""dt"": 0.01, ""T"": 1000, ""forcing_factor"": 0}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 50, ""y"": 100}}, ""template-uuid-50b8-8ae7-b2a10131cc8f"": {""key"": ""simcore/services/dynamic/kember-viewer"", ""version"": ""2.9.0"", ""label"": ""kember-viewer"", ""inputs"": {""outputController"": {""nodeUuid"": ""template-uuid-5f7f-af9c-e91b64c4989e"", ""output"": ""out_1""}}, ""inputNodes"": [""template-uuid-5f7f-af9c-e91b64c4989e""], ""outputNode"": false, ""outputs"": {}, ""progress"": 10, ""thumbnail"": """", ""position"": {""x"": 300, ""y"": 100}}}",0
+TEMPLATE,template-uuid-59c3-a22d-ce2979b88313,"UCDavis use cases: 1D, 2D",Colleen Clancy 1D and 2D use cases with a file picker and PostPro viewers,"",maiz@itis.swiss,2019-06-06 14:34:52.882,2019-06-06 14:34:54.863,"{""template-uuid-5d51-b24e-5f9a34f0478f"": {""key"": ""simcore/services/frontend/file-picker"", ""version"": ""1.0.0"", ""label"": ""File Picker 1&2 D"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 50, ""y"": 300}}, ""template-uuid-547e-8e94-2229dcd0b912"": {""key"": ""simcore/services/frontend/nodes-group"", ""version"": ""1.0.0"", ""label"": ""CC 1D"", ""inputs"": {}, ""inputNodes"": [""template-uuid-5d51-b24e-5f9a34f0478f""], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 300, ""y"": 200}}, ""template-uuid-5b74-aa0b-f646fd835066"": {""key"": ""simcore/services/frontend/nodes-group"", ""version"": ""1.0.0"", ""label"": ""CC 2D"", ""inputs"": {}, ""inputNodes"": [""template-uuid-5d51-b24e-5f9a34f0478f"", ""template-uuid-547e-8e94-2229dcd0b912""], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 550, ""y"": 400}}, ""template-uuid-5b4b-8cdf-ff7770a9f98e"": {""key"": ""simcore/services/comp/ucdavis-1d-cardiac-model"", ""version"": ""1.0.0"", ""label"": ""DBP-Clancy-Rabbit-1-D solver"", ""inputs"": {""Na"": 0, ""Kr"": 0, ""BCL"": 10, ""NBeats"": 1, ""Ligand"": 0, ""cAMKII"": ""WT"", ""tw"": 5, ""tl"": 200, ""homogeneity"": ""heterogeneous"", ""in_10"": {""nodeUuid"": ""template-uuid-5d51-b24e-5f9a34f0478f"", ""output"": ""outFile""}}, ""inputNodes"": [""template-uuid-5d51-b24e-5f9a34f0478f""], ""outputNode"": true, ""outputs"": {}, ""parent"": ""template-uuid-547e-8e94-2229dcd0b912"", ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 100, ""y"": 350}}, ""template-uuid-5bb1-9ce9-8a7be6b86b63"": {""key"": ""simcore/services/dynamic/cc-1d-viewer"", ""version"": ""2.8.0"", ""label"": ""cc-1d-viewer"", ""inputs"": {""ECGs"": {""nodeUuid"": ""template-uuid-5b4b-8cdf-ff7770a9f98e"", ""output"": ""out_1""}, ""y_1D"": {""nodeUuid"": ""template-uuid-5b4b-8cdf-ff7770a9f98e"", ""output"": ""out_3""}}, ""inputNodes"": [""template-uuid-5b4b-8cdf-ff7770a9f98e""], ""outputNode"": false, ""outputs"": {}, ""parent"": ""template-uuid-547e-8e94-2229dcd0b912"", ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 300, ""y"": 200}}, ""template-uuid-56e8-90f3-d0df529a0016"": {""key"": ""simcore/services/comp/ucdavis-2d-cardiac-model"", ""version"": ""1.0.0"", ""label"": ""DBP-Clancy-Rabbit-2-D solver"", ""inputs"": {""Na"": 0, ""Kr"": 0, ""BCL"": 10, ""Ligand"": 0, ""cAMKII"": ""WT"", ""tw"": 5, ""tl"": 200, ""homogeneity"": ""heterogeneous""}, ""inputNodes"": [""template-uuid-5d51-b24e-5f9a34f0478f"", ""template-uuid-547e-8e94-2229dcd0b912""], ""outputNode"": false, ""outputs"": {}, ""parent"": ""template-uuid-5b74-aa0b-f646fd835066"", ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 100, ""y"": 350}}, ""template-uuid-5b92-be80-a7fa7c25a69b"": {""key"": ""simcore/services/dynamic/cc-2d-viewer"", ""version"": ""2.8.0"", ""label"": ""cc-2d-viewer"", ""inputs"": {""ap"": {""nodeUuid"": ""template-uuid-56e8-90f3-d0df529a0016"", ""output"": ""out_1""}}, ""inputNodes"": [""template-uuid-56e8-90f3-d0df529a0016""], ""outputNode"": false, ""outputs"": {}, ""parent"": ""template-uuid-5b74-aa0b-f646fd835066"", ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 300, ""y"": 200}}}",0
+TEMPLATE,template-uuid-518d-a25d-8887bcae93f8,ISAN2019: 3D Paraview,3D Paraview viewer with two inputs,https://user-images.githubusercontent.com/33152403/60168939-073a5580-9806-11e9-8dad-8a7caa3eb5ab.png,maiz@itis.swiss,2019-06-06 14:33:43.065,2019-06-06 14:33:44.747,"{""template-uuid-5753-af37-e6aec8120bf2"": {""key"": ""simcore/services/frontend/file-picker"", ""version"": ""1.0.0"", ""label"": ""File Picker 1"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {""outFile"": {""store"": 1, ""path"": ""Shared Data/HField_Big.vtk""}}, ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 100, ""y"": 100}}, ""template-uuid-522c-a377-dd8d7cd1265b"": {""key"": ""simcore/services/frontend/file-picker"", ""version"": ""1.0.0"", ""label"": ""File Picker 2"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {""outFile"": {""store"": 1, ""path"": ""Shared Data/bunny.vtk""}}, ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 100, ""y"": 250}}, ""template-uuid-9b0f-67677a20996c"": {""key"": ""simcore/services/dynamic/3d-viewer"", ""version"": ""2.10.0"", ""label"": ""3D ParaViewer"", ""inputs"": {""A"": {""nodeUuid"": ""template-uuid-5753-af37-e6aec8120bf2"", ""output"": ""outFile""}, ""B"": {""nodeUuid"": ""template-uuid-522c-a377-dd8d7cd1265b"", ""output"": ""outFile""}}, ""inputNodes"": [""template-uuid-5753-af37-e6aec8120bf2"", ""template-uuid-522c-a377-dd8d7cd1265b""], ""outputNode"": false, ""outputs"": {}, ""progress"": 85, ""thumbnail"": """", ""position"": {""x"": 400, ""y"": 175}}}",1
+TEMPLATE,template-uuid-5a9e-9580-c53d92d18803,ISAN: MattWard use case,MattWard Solver/PostPro viewer,https://user-images.githubusercontent.com/33152403/60168942-073a5580-9806-11e9-9162-3683dcff0711.png,maiz@itis.swiss,2019-06-06 14:33:58.681,2019-06-06 14:34:01.617,"{""template-uuid-523c-8caa-4ca36c927ca2"": {""key"": ""simcore/services/dynamic/mattward-viewer"", ""version"": ""2.9.0"", ""label"": ""MattWard"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {}, ""progress"": 55, ""thumbnail"": """", ""position"": {""x"": 100, ""y"": 100}}}",1
+TEMPLATE,154fb4ad-4913-478f-af04-19725db901a7,ISAN2019 - opencor-py model,Computes the cardiac myocyte action potential for the sympathetic drive input setting on the MAP-Core portal.,https://opencor.ws/res/pics/logo.png,crespo@itis.swiss,2019-06-18 15:20:16.567,2019-06-18 15:59:21.708,"{""template-uuid-4179-bc47-0905e6726758"": {""key"": ""simcore/services/comp/osparc-opencor"", ""version"": ""0.2.1"", ""label"": ""osparc-opencor"", ""inputs"": {""stimulation_period"": ""{{stimulation_period_secs}}"" }, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {}, ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 314, ""y"": 263}}, ""template-uuid-4f4e-a1ae-429146d466b8"": {""key"": ""simcore/services/dynamic/jupyter-base-notebook"", ""version"": ""2.10.0"", ""label"": ""jupyter-base-notebook"", ""inputs"": {""input_1"": {""nodeUuid"": ""template-uuid-4179-bc47-0905e6726758"", ""output"": ""membrane_potential_json""}}, ""inputNodes"": [""template-uuid-4179-bc47-0905e6726758""], ""outputNode"": false, ""outputs"": {}, ""progress"": 100, ""thumbnail"": ""https://opencor.ws/res/pics/logo.png"", ""position"": {""x"": 631, ""y"": 259}}}",1
+TEMPLATE,template-uuid-5716-bedd-b409bb021760,ISAN: 2D Plot,2D RawGraphs viewer with one input,https://user-images.githubusercontent.com/33152403/60168938-06a1bf00-9806-11e9-99ff-20c52d851add.png,maiz@itis.swiss,2019-06-06 14:33:34.008,2019-06-06 14:33:35.825,"{""template-uuid-58e5-884e-2690b3d54f11"": {""key"": ""simcore/services/frontend/file-picker"", ""version"": ""1.0.0"", ""label"": ""File Picker"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {""outFile"": {""store"": 1, ""path"": ""Shared Data/Height-Weight""}}, ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 100, ""y"": 100}}, ""template-uuid-58a5-83d7-57d0feffbfea"": {""key"": ""simcore/services/dynamic/raw-graphs"", ""version"": ""2.8.0"", ""label"": ""2D plot"", ""inputs"": {""input_1"": {""nodeUuid"": ""template-uuid-58e5-884e-2690b3d54f11"", ""output"": ""outFile""}}, ""inputNodes"": [""template-uuid-58e5-884e-2690b3d54f11""], ""outputNode"": false, ""outputs"": {}, ""progress"": 90, ""thumbnail"": """", ""position"": {""x"": 400, ""y"": 100}}}",1
+TEMPLATE,template-uuid-5d82-b08d-d39c436ca738,ISAN: UCDavis use case: 0D,Colleen Clancy Single Cell solver with a file picker and PostPro viewer,https://user-images.githubusercontent.com/33152403/60168940-073a5580-9806-11e9-9a44-ae5266eeb020.png,maiz@itis.swiss,2019-06-06 14:33:51.94,2019-06-06 14:33:54.329,"{""template-uuid-59d6-b1a5-6e7b2773636b"": {""key"": ""simcore/services/frontend/file-picker"", ""version"": ""1.0.0"", ""label"": ""File Picker 0D"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {""outFile"": {""store"": 1, ""path"": ""Shared Data/initial_WStates""}}, ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 50, ""y"": 150}}, ""template-uuid-562f-afd1-cca5105c8844"": {""key"": ""simcore/services/comp/ucdavis-singlecell-cardiac-model"", ""version"": ""1.0.0"", ""label"": ""DBP-Clancy-Rabbit-Single-Cell solver"", ""inputs"": {""Na"": 0, ""Kr"": 0, ""BCL"": 200, ""NBeats"": 5, ""Ligand"": 0, ""cAMKII"": ""WT"", ""initfile"": {""nodeUuid"": ""template-uuid-59d6-b1a5-6e7b2773636b"", ""output"": ""outFile""}}, ""inputAccess"": {""Na"": ""ReadAndWrite"", ""Kr"": ""ReadOnly"", ""BCL"": ""ReadAndWrite"", ""NBeats"": ""ReadOnly"", ""Ligand"": ""Invisible"", ""cAMKII"": ""Invisible""}, ""inputNodes"": [""template-uuid-59d6-b1a5-6e7b2773636b""], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 300, ""y"": 150}}, ""template-uuid-5fdd-9daa-cb03c51d8138"": {""key"": ""simcore/services/dynamic/cc-0d-viewer"", ""version"": ""2.8.0"", ""label"": ""cc-0d-viewer"", ""inputs"": {""vm_1Hz"": {""nodeUuid"": ""template-uuid-562f-afd1-cca5105c8844"", ""output"": ""out_4""}, ""all_results_1Hz"": {""nodeUuid"": ""template-uuid-562f-afd1-cca5105c8844"", ""output"": ""out_1""}}, ""inputNodes"": [""template-uuid-562f-afd1-cca5105c8844""], ""outputNode"": false, ""outputs"": {}, ""progress"": 20, ""thumbnail"": """", ""position"": {""x"": 550, ""y"": 150}}}",1
diff --git a/scripts/demo/template-projects/templates_in_master.json b/scripts/demo/template-projects/templates_in_master.json
new file mode 100644
index 00000000000..11566602d5d
--- /dev/null
+++ b/scripts/demo/template-projects/templates_in_master.json
@@ -0,0 +1,302 @@
+[
+  {
+    "uuid": "template-uuid-518d-a25d-8887bcae93f8",
+    "name": "ISAN2019: 3D Paraview",
+    "description": "3D Paraview viewer with two inputs",
+    "thumbnail": "https://user-images.githubusercontent.com/33152403/60168939-073a5580-9806-11e9-8dad-8a7caa3eb5ab.png",
+    "prjOwner": "maiz@itis.swiss",
+    "creationDate": "2019-06-06 14:33:43.065",
+    "lastChangeDate": "2019-06-06 14:33:44.747",
+    "workbench": {
+      "template-uuid-5753-af37-e6aec8120bf2": {
+        "key": "simcore/services/frontend/file-picker",
+        "version": "1.0.0",
+        "label": "File Picker 1",
+        "inputs": {},
+        "inputNodes": [],
+        "outputNode": false,
+        "outputs": {
+          "outFile": {
+            "store": 1,
+            "path": "Shared Data/HField_Big.vtk"
+          }
+        },
+        "progress": 100,
+        "thumbnail": "",
+        "position": {
+          "x": 100,
+          "y": 100
+        }
+      },
+      "template-uuid-522c-a377-dd8d7cd1265b": {
+        "key": "simcore/services/frontend/file-picker",
+        "version": "1.0.0",
+        "label": "File Picker 2",
+        "inputs": {},
+        "inputNodes": [],
+        "outputNode": false,
+        "outputs": {
+          "outFile": {
+            "store": 1,
+            "path": "Shared Data/bunny.vtk"
+          }
+        },
+        "progress": 100,
+        "thumbnail": "",
+        "position": {
+          "x": 100,
+          "y": 250
+        }
+      },
+      "template-uuid-9b0f-67677a20996c": {
+        "key": "simcore/services/dynamic/3d-viewer",
+        "version": "2.10.0",
+        "label": "3D ParaViewer",
+        "inputs": {
+          "A": {
+            "nodeUuid": "template-uuid-5753-af37-e6aec8120bf2",
+            "output": "outFile"
+          },
+          "B": {
+            "nodeUuid": "template-uuid-522c-a377-dd8d7cd1265b",
+            "output": "outFile"
+          }
+        },
+        "inputNodes": [
+          "template-uuid-5753-af37-e6aec8120bf2",
+          "template-uuid-522c-a377-dd8d7cd1265b"
+        ],
+        "outputNode": false,
+        "outputs": {},
+        "progress": 85,
+        "thumbnail": "",
+        "position": {
+          "x": 400,
+          "y": 175
+        }
+      }
+    }
+  },
+  {
+    "uuid": "template-uuid-5a9e-9580-c53d92d18803",
+    "name": "ISAN: MattWard use case",
+    "description": "MattWard Solver/PostPro viewer",
+    "thumbnail": "https://user-images.githubusercontent.com/33152403/60168942-073a5580-9806-11e9-9162-3683dcff0711.png",
+    "prjOwner": "maiz@itis.swiss",
+    "creationDate": "2019-06-06 14:33:58.681",
+    "lastChangeDate": "2019-06-06 14:34:01.617",
+    "workbench": {
+      "template-uuid-523c-8caa-4ca36c927ca2": {
+        "key": "simcore/services/dynamic/mattward-viewer",
+        "version": "2.9.0",
+        "label": "MattWard",
+        "inputs": {},
+        "inputNodes": [],
+        "outputNode": false,
+        "outputs": {},
+        "progress": 55,
+        "thumbnail": "",
+        "position": {
+          "x": 100,
+          "y": 100
+        }
+      }
+    }
+  },
+  {
+    "uuid": "154fb4ad-4913-478f-af04-19725db901a7",
+    "name": "ISAN2019 - opencor-py model",
+    "description": "Computes the cardiac myocyte action potential for the sympathetic drive input setting on the MAP-Core portal.",
+    "thumbnail": "https://opencor.ws/res/pics/logo.png",
+    "prjOwner": "crespo@itis.swiss",
+    "creationDate": "2019-06-18 15:20:16.567",
+    "lastChangeDate": "2019-06-18 15:59:21.708",
+    "workbench": {
+      "template-uuid-4179-bc47-0905e6726758": {
+        "key": "simcore/services/comp/osparc-opencor",
+        "version": "0.2.1",
+        "label": "osparc-opencor",
+        "inputs": {
+          "stimulation_period": "{{stimulation_period_secs}}"
+        },
+        "inputNodes": [],
+        "outputNode": false,
+        "outputs": {},
+        "progress": 100,
+        "thumbnail": "",
+        "position": {
+          "x": 314,
+          "y": 263
+        }
+      },
+      "template-uuid-4f4e-a1ae-429146d466b8": {
+        "key": "simcore/services/dynamic/jupyter-base-notebook",
+        "version": "2.10.0",
+        "label": "jupyter-base-notebook",
+        "inputs": {
+          "input_1": {
+            "nodeUuid": "template-uuid-4179-bc47-0905e6726758",
+            "output": "membrane_potential_json"
+          }
+        },
+        "inputNodes": [
+          "template-uuid-4179-bc47-0905e6726758"
+        ],
+        "outputNode": false,
+        "outputs": {},
+        "progress": 100,
+        "thumbnail": "https://opencor.ws/res/pics/logo.png",
+        "position": {
+          "x": 631,
+          "y": 259
+        }
+      }
+    }
+  },
+  {
+    "uuid": "template-uuid-5716-bedd-b409bb021760",
+    "name": "ISAN: 2D Plot",
+    "description": "2D RawGraphs viewer with one input",
+    "thumbnail": "https://user-images.githubusercontent.com/33152403/60168938-06a1bf00-9806-11e9-99ff-20c52d851add.png",
+    "prjOwner": "maiz@itis.swiss",
+    "creationDate": "2019-06-06 14:33:34.008",
+    "lastChangeDate": "2019-06-06 14:33:35.825",
+    "workbench": {
+      "template-uuid-58e5-884e-2690b3d54f11": {
+        "key": "simcore/services/frontend/file-picker",
+        "version": "1.0.0",
+        "label": "File Picker",
+        "inputs": {},
+        "inputNodes": [],
+        "outputNode": false,
+        "outputs": {
+          "outFile": {
+            "store": 1,
+            "path": "Shared Data/Height-Weight"
+          }
+        },
+        "progress": 100,
+        "thumbnail": "",
+        "position": {
+          "x": 100,
+          "y": 100
+        }
+      },
+      "template-uuid-58a5-83d7-57d0feffbfea": {
+        "key": "simcore/services/dynamic/raw-graphs",
+        "version": "2.8.0",
+        "label": "2D plot",
+        "inputs": {
+          "input_1": {
+            "nodeUuid": "template-uuid-58e5-884e-2690b3d54f11",
+            "output": "outFile"
+          }
+        },
+        "inputNodes": [
+          "template-uuid-58e5-884e-2690b3d54f11"
+        ],
+        "outputNode": false,
+        "outputs": {},
+        "progress": 90,
+        "thumbnail": "",
+        "position": {
+          "x": 400,
+          "y": 100
+        }
+      }
+    }
+  },
+  {
+    "uuid": "template-uuid-5d82-b08d-d39c436ca738",
+    "name": "ISAN: UCDavis use case: 0D",
+    "description": "Colleen Clancy Single Cell solver with a file picker and PostPro viewer",
+    "thumbnail": "https://user-images.githubusercontent.com/33152403/60168940-073a5580-9806-11e9-9a44-ae5266eeb020.png",
+    "prjOwner": "maiz@itis.swiss",
+    "creationDate": "2019-06-06 14:33:51.94",
+    "lastChangeDate": "2019-06-06 14:33:54.329",
+    "workbench": {
+      "template-uuid-59d6-b1a5-6e7b2773636b": {
+        "key": "simcore/services/frontend/file-picker",
+        "version": "1.0.0",
+        "label": "File Picker 0D",
+        "inputs": {},
+        "inputNodes": [],
+        "outputNode": false,
+        "outputs": {
+          "outFile": {
+            "store": 1,
+            "path": "Shared Data/initial_WStates"
+          }
+        },
+        "progress": 100,
+        "thumbnail": "",
+        "position": {
+          "x": 50,
+          "y": 150
+        }
+      },
+      "template-uuid-562f-afd1-cca5105c8844": {
+        "key": "simcore/services/comp/ucdavis-singlecell-cardiac-model",
+        "version": "1.0.0",
+        "label": "DBP-Clancy-Rabbit-Single-Cell solver",
+        "inputs": {
+          "Na": 0,
+          "Kr": 0,
+          "BCL": 200,
+          "NBeats": 5,
+          "Ligand": 0,
+          "cAMKII": "WT",
+          "initfile": {
+            "nodeUuid": "template-uuid-59d6-b1a5-6e7b2773636b",
+            "output": "outFile"
+          }
+        },
+        "inputAccess": {
+          "Na": "ReadAndWrite",
+          "Kr": "ReadOnly",
+          "BCL": "ReadAndWrite",
+          "NBeats": "ReadOnly",
+          "Ligand": "Invisible",
+          "cAMKII": "Invisible"
+        },
+        "inputNodes": [
+          "template-uuid-59d6-b1a5-6e7b2773636b"
+        ],
+        "outputNode": false,
+        "outputs": {},
+        "progress": 0,
+        "thumbnail": "",
+        "position": {
+          "x": 300,
+          "y": 150
+        }
+      },
+      "template-uuid-5fdd-9daa-cb03c51d8138": {
+        "key": "simcore/services/dynamic/cc-0d-viewer",
+        "version": "2.8.0",
+        "label": "cc-0d-viewer",
+        "inputs": {
+          "vm_1Hz": {
+            "nodeUuid": "template-uuid-562f-afd1-cca5105c8844",
+            "output": "out_4"
+          },
+          "all_results_1Hz": {
+            "nodeUuid": "template-uuid-562f-afd1-cca5105c8844",
+            "output": "out_1"
+          }
+        },
+        "inputNodes": [
+          "template-uuid-562f-afd1-cca5105c8844"
+        ],
+        "outputNode": false,
+        "outputs": {},
+        "progress": 20,
+        "thumbnail": "",
+        "position": {
+          "x": 550,
+          "y": 150
+        }
+      }
+    }
+  }
+]
\ No newline at end of file
diff --git a/scripts/template-projects/create_csv_table.py b/scripts/template-projects/create_csv_table.py
deleted file mode 100644
index d699e30269e..00000000000
--- a/scripts/template-projects/create_csv_table.py
+++ /dev/null
@@ -1,46 +0,0 @@
-""" Produces csv with a table of projects that can be inserted in the postgres db by importing it via adminer website
-
-"""
-
-import json
-
-from change_case import ChangeCase
-
-from simcore_service_webserver.projects.projects_models import ProjectType, projects
-from simcore_service_webserver.resources import resources
-
-TEMPLATE_STUDIES_NAME = "data/fake-template-projects.isan.json"
-TEMPLATE_STUDIES_TABLE = "template-projects-table.csv"
-
-COLS = [c.name for c in projects.columns if c!=projects.c.id] #pylint: disable=not-an-iterable
-PROJECT_KEYS = [ChangeCase.snake_to_camel(key) for key in COLS]
-ROW = ",".join( ["{}", ]*len(PROJECT_KEYS) )
-
-def normalize(key, value):
-    if key == "type":
-        return ProjectType.TEMPLATE.name
-
-    if value is None:
-        return '""'
-
-    value = str(value)
-    value = value.replace("'", '"')
-    value = value.replace('"', '""')
-    value = '"' + value + '"'
-    return value
-
-
-
-def main():
-    with resources.stream(TEMPLATE_STUDIES_NAME) as fp:
-        data = json.load(fp)
-
-    with open(TEMPLATE_STUDIES_TABLE, 'wt') as fh:
-        print(",".join(COLS), file=fh)
-        for project in data:
-            values = [normalize(key, project.get(key)) for key in PROJECT_KEYS]
-            print(ROW.format(*values), file=fh)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/scripts/template-projects/template-projects-table.csv b/scripts/template-projects/template-projects-table.csv
deleted file mode 100644
index 0ac617e2755..00000000000
--- a/scripts/template-projects/template-projects-table.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-type,uuid,name,description,thumbnail,prj_owner,creation_date,last_change_date,workbench
-TEMPLATE,"template-uuid-4d5e-b80e-401c8066782f","ISAN: 2D Plot","2D RawGraphs viewer with one input","","maiz","2019-05-24T10:36:57.813Z","2019-05-24T11:36:12.015Z","{""template-uuid-48eb-a9d2-aaad6b72400a"": {""key"": ""simcore/services/frontend/file-picker"", ""version"": ""1.0.0"", ""label"": ""File Picker"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": False, ""outputs"": {""outFile"": {""store"": 1, ""path"": ""Shared Data/Height-Weight""}}, ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 100, ""y"": 100}}, ""template-uuid-4c63-a705-03a2c339646c"": {""key"": ""simcore/services/dynamic/raw-graphs"", ""version"": ""2.8.0"", ""label"": ""2D plot"", ""inputs"": {""input_1"": {""nodeUuid"": ""template-uuid-48eb-a9d2-aaad6b72400a"", ""output"": ""outFile""}}, ""inputNodes"": [""template-uuid-48eb-a9d2-aaad6b72400a""], ""outputNode"": False, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 400, ""y"": 100}}}"
-TEMPLATE,"template-uuid-4d5e-b80e-401c8066781f","ISAN: 3D Paraview","3D Paraview viewer with two inputs","","maiz","2019-05-24T10:36:57.813Z"," 2019-05-24T10:38:12.888Z","{""template-uuid-403e-865a-8c5ca30671c6"": {""key"": ""simcore/services/frontend/file-picker"", ""version"": ""1.0.0"", ""label"": ""File Picker 1"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": False, ""outputs"": {""outFile"": {""store"": 1, ""path"": ""Shared Data/HField_Big.vtk""}}, ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 100, ""y"": 100}}, ""template-uuid-421f-be24-d44d112cc5c1"": {""key"": ""simcore/services/frontend/file-picker"", ""version"": ""1.0.0"", ""label"": ""File Picker 2"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": False, ""outputs"": {""outFile"": {""store"": 1, ""path"": ""Shared Data/bunny.vtk""}}, ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 100, ""y"": 250}}, ""template-uuid-4ecd-9636-62e619a9ca69"": {""key"": ""simcore/services/dynamic/3d-viewer"", ""version"": ""2.10.0"", ""label"": ""3D ParaViewer"", ""inputs"": {""A"": {""nodeUuid"": ""template-uuid-403e-865a-8c5ca30671c6"", ""output"": ""outFile""}, ""B"": {""nodeUuid"": ""template-uuid-421f-be24-d44d112cc5c1"", ""output"": ""outFile""}}, ""inputNodes"": [""template-uuid-403e-865a-8c5ca30671c6"", ""template-uuid-421f-be24-d44d112cc5c1""], ""outputNode"": False, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 400, ""y"": 175}}}"
-TEMPLATE,"template-uuid-420d-b82d-e80bfa272ebd","ISAN: MattWard use case","MattWard Solver/PostPro viewer","","MattWard","2019-04-30T08:52:20.937Z","2019-04-30T08:59:26.090Z","{""template-uuid-4021-b2ef-b2e163bfbd16"": {""key"": ""simcore/services/dynamic/mattward-viewer"", ""version"": ""2.9.0"", ""label"": ""MattWard"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": False, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 100, ""y"": 100}}}"
-TEMPLATE,"template-uuid-1234-a1a7-f7d4f3a8f26b","ISAN: UCDavis use case: 0D","Colleen Clancy Single Cell solver with a file picker and PostPro viewer","https://placeimg.com/171/96/tech/grayscale/?18.jpg","Colleen Clancy","2018-10-22T09:13:13.360Z","2018-10-22T09:33:41.858Z","{""template-uuid-4674-b758-946151cae351"": {""key"": ""simcore/services/frontend/file-picker"", ""version"": ""1.0.0"", ""label"": ""File Picker 0D"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": False, ""outputs"": {""outFile"": {""store"": 1, ""path"": ""Shared Data/initial_WStates""}}, ""progress"": 100, ""parent"": None, ""position"": {""x"": 50, ""y"": 150}}, ""template-uuid-409d-998c-c1f04de67f8b"": {""key"": ""simcore/services/comp/ucdavis-singlecell-cardiac-model"", ""version"": ""1.0.0"", ""label"": ""DBP-Clancy-Rabbit-Single-Cell solver"", ""inputAccess"": {""Na"": ""ReadAndWrite"", ""Kr"": ""ReadOnly"", ""BCL"": ""ReadAndWrite"", ""NBeats"": ""ReadOnly"", ""Ligand"": ""Invisible"", ""cAMKII"": ""Invisible""}, ""inputs"": {""Na"": 0, ""Kr"": 0, ""BCL"": 200, ""NBeats"": 5, ""Ligand"": 0, ""cAMKII"": ""WT"", ""initfile"": {""nodeUuid"": ""template-uuid-4674-b758-946151cae351"", ""output"": ""outFile""}}, ""inputNodes"": [""template-uuid-4674-b758-946151cae351""], ""outputNode"": False, ""outputs"": {}, ""parent"": None, ""position"": {""x"": 300, ""y"": 150}}, ""template-uuid-43e7-9fda-cf9625e59986"": {""key"": ""simcore/services/dynamic/cc-0d-viewer"", ""version"": ""2.8.0"", ""label"": ""cc-0d-viewer"", ""inputs"": {""vm_1Hz"": {""nodeUuid"": ""template-uuid-409d-998c-c1f04de67f8b"", ""output"": ""out_4""}, ""all_results_1Hz"": {""nodeUuid"": ""template-uuid-409d-998c-c1f04de67f8b"", ""output"": ""out_1""}}, ""inputNodes"": [""template-uuid-409d-998c-c1f04de67f8b""], ""outputNode"": False, ""outputs"": {}, ""parent"": None, ""position"": {""x"": 550, ""y"": 150}}}"
diff --git a/scripts/template-projects/templates_in_master.csv b/scripts/template-projects/templates_in_master.csv
deleted file mode 100644
index 3a542f74e5d..00000000000
--- a/scripts/template-projects/templates_in_master.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-type,uuid,name,description,thumbnail,prj_owner,creation_date,last_change_date,workbench
-TEMPLATE,template-uuid-5716-bedd-b409bb021760,ISAN: 2D Plot,2D RawGraphs viewer with one input,"",maiz@itis.swiss,2019-06-06 14:33:34.008,2019-06-06 14:33:35.825,"{""dd332242-829a-58e5-884e-2690b3d54f11"": {""key"": ""simcore/services/frontend/file-picker"", ""version"": ""1.0.0"", ""label"": ""File Picker"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {""outFile"": {""store"": 1, ""path"": ""Shared Data/Height-Weight""}}, ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 100, ""y"": 100}}, ""e1ddb64b-2935-58a5-83d7-57d0feffbfea"": {""key"": ""simcore/services/dynamic/raw-graphs"", ""version"": ""2.8.0"", ""label"": ""2D plot"", ""inputs"": {""input_1"": {""nodeUuid"": ""dd332242-829a-58e5-884e-2690b3d54f11"", ""output"": ""outFile""}}, ""inputNodes"": [""dd332242-829a-58e5-884e-2690b3d54f11""], ""outputNode"": false, ""outputs"": {}, ""progress"": 90, ""thumbnail"": """", ""position"": {""x"": 400, ""y"": 100}}}"
-TEMPLATE,template-uuid-518d-a25d-8887bcae93f8,ISAN: 3D Paraview,3D Paraview viewer with two inputs,"",maiz@itis.swiss,2019-06-06 14:33:43.065,2019-06-06 14:33:44.747,"{""5e9f85f4-5688-5753-af37-e6aec8120bf2"": {""key"": ""simcore/services/frontend/file-picker"", ""version"": ""1.0.0"", ""label"": ""File Picker 1"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {""outFile"": {""store"": 1, ""path"": ""Shared Data/HField_Big.vtk""}}, ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 100, ""y"": 100}}, ""2cab3689-cb00-522c-a377-dd8d7cd1265b"": {""key"": ""simcore/services/frontend/file-picker"", ""version"": ""1.0.0"", ""label"": ""File Picker 2"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {""outFile"": {""store"": 1, ""path"": ""Shared Data/bunny.vtk""}}, ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 100, ""y"": 250}}, ""556c0607-1d8d-5983-9b0f-67677a20996c"": {""key"": ""simcore/services/dynamic/3d-viewer"", ""version"": ""2.10.0"", ""label"": ""3D ParaViewer"", ""inputs"": {""A"": {""nodeUuid"": ""5e9f85f4-5688-5753-af37-e6aec8120bf2"", ""output"": ""outFile""}, ""B"": {""nodeUuid"": ""2cab3689-cb00-522c-a377-dd8d7cd1265b"", ""output"": ""outFile""}}, ""inputNodes"": [""5e9f85f4-5688-5753-af37-e6aec8120bf2"", ""2cab3689-cb00-522c-a377-dd8d7cd1265b""], ""outputNode"": false, ""outputs"": {}, ""progress"": 85, ""thumbnail"": """", ""position"": {""x"": 400, ""y"": 175}}}"
-TEMPLATE,template-uuid-5d82-b08d-d39c436ca738,ISAN: UCDavis use case: 0D,Colleen Clancy Single Cell solver with a file picker and PostPro viewer,"",maiz@itis.swiss,2019-06-06 14:33:51.94,2019-06-06 14:33:54.329,"{""5ea0e1e8-1421-59d6-b1a5-6e7b2773636b"": {""key"": ""simcore/services/frontend/file-picker"", ""version"": ""1.0.0"", ""label"": ""File Picker 0D"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {""outFile"": {""store"": 1, ""path"": ""Shared Data/initial_WStates""}}, ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 50, ""y"": 150}}, ""b239ac4b-1967-562f-afd1-cca5105c8844"": {""key"": ""simcore/services/comp/ucdavis-singlecell-cardiac-model"", ""version"": ""1.0.0"", ""label"": ""DBP-Clancy-Rabbit-Single-Cell solver"", ""inputs"": {""Na"": 0, ""Kr"": 0, ""BCL"": 200, ""NBeats"": 5, ""Ligand"": 0, ""cAMKII"": ""WT"", ""initfile"": {""nodeUuid"": ""5ea0e1e8-1421-59d6-b1a5-6e7b2773636b"", ""output"": ""outFile""}}, ""inputAccess"": {""Na"": ""ReadAndWrite"", ""Kr"": ""ReadOnly"", ""BCL"": ""ReadAndWrite"", ""NBeats"": ""ReadOnly"", ""Ligand"": ""Invisible"", ""cAMKII"": ""Invisible""}, ""inputNodes"": [""5ea0e1e8-1421-59d6-b1a5-6e7b2773636b""], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 300, ""y"": 150}}, ""aa8cdc10-eab8-5fdd-9daa-cb03c51d8138"": {""key"": ""simcore/services/dynamic/cc-0d-viewer"", ""version"": ""2.8.0"", ""label"": ""cc-0d-viewer"", ""inputs"": {""vm_1Hz"": {""nodeUuid"": ""b239ac4b-1967-562f-afd1-cca5105c8844"", ""output"": ""out_4""}, ""all_results_1Hz"": {""nodeUuid"": ""b239ac4b-1967-562f-afd1-cca5105c8844"", ""output"": ""out_1""}}, ""inputNodes"": [""b239ac4b-1967-562f-afd1-cca5105c8844""], ""outputNode"": false, ""outputs"": {}, ""progress"": 20, ""thumbnail"": """", ""position"": {""x"": 550, ""y"": 150}}}"
-TEMPLATE,template-uuid-5a9e-9580-c53d92d18803,ISAN: MattWard use case,MattWard Solver/PostPro viewer,"",maiz@itis.swiss,2019-06-06 14:33:58.681,2019-06-06 14:34:01.617,"{""4858919c-e0f1-523c-8caa-4ca36c927ca2"": {""key"": ""simcore/services/dynamic/mattward-viewer"", ""version"": ""2.9.0"", ""label"": ""MattWard"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {}, ""progress"": 55, ""thumbnail"": """", ""position"": {""x"": 100, ""y"": 100}}}"
-TEMPLATE,template-uuid-5203-915e-1ae8ae0c9991,Sleepers,"5 sleepers interconnected","",maiz@itis.swiss,2019-06-06 14:34:19.631,2019-06-06 14:34:28.647,"{""f447dd35-b098-5f7e-92b0-5a14e84401e9"": {""key"": ""simcore/services/comp/itis/sleeper"", ""version"": ""1.0.0"", ""label"": ""sleeper 0"", ""inputs"": {""in_2"": 2}, ""inputAccess"": {""in_1"": ""Invisible"", ""in_2"": ""ReadOnly""}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 50, ""y"": 300}}, ""2745b49f-4fc4-5d8a-812c-44dacf56840e"": {""key"": ""simcore/services/comp/itis/sleeper"", ""version"": ""1.0.0"", ""label"": ""sleeper 1"", ""inputs"": {""in_1"": {""nodeUuid"": ""f447dd35-b098-5f7e-92b0-5a14e84401e9"", ""output"": ""out_1""}, ""in_2"": 2}, ""inputNodes"": [""f447dd35-b098-5f7e-92b0-5a14e84401e9""], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 300, ""y"": 200}}, ""d1448b77-84ea-5706-b741-4073a4454f0d"": {""key"": ""simcore/services/comp/itis/sleeper"", ""version"": ""1.0.0"", ""label"": ""sleeper 2"", ""inputs"": {""in_1"": {""nodeUuid"": ""2745b49f-4fc4-5d8a-812c-44dacf56840e"", ""output"": ""out_1""}, ""in_2"": {""nodeUuid"": ""2745b49f-4fc4-5d8a-812c-44dacf56840e"", ""output"": ""out_2""}}, ""inputNodes"": [""2745b49f-4fc4-5d8a-812c-44dacf56840e""], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 550, ""y"": 200}}, ""ab0911be-162d-5065-a079-a5a0476e3c10"": {""key"": ""simcore/services/comp/itis/sleeper"", ""version"": ""1.0.0"", ""label"": ""sleeper 3"", ""inputs"": {""in_2"": {""nodeUuid"": ""f447dd35-b098-5f7e-92b0-5a14e84401e9"", ""output"": ""out_2""}}, ""inputNodes"": [""f447dd35-b098-5f7e-92b0-5a14e84401e9""], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 420, ""y"": 400}}, ""bd0f303e-92c4-559d-aa19-dc9293e10e4c"": {""key"": ""simcore/services/comp/itis/sleeper"", ""version"": ""1.0.0"", ""label"": ""sleeper 4"", ""inputs"": {""in_1"": {""nodeUuid"": ""d1448b77-84ea-5706-b741-4073a4454f0d"", ""output"": ""out_1""}, ""in_2"": {""nodeUuid"": ""ab0911be-162d-5065-a079-a5a0476e3c10"", ""output"": ""out_2""}}, ""inputNodes"": [""d1448b77-84ea-5706-b741-4073a4454f0d"", ""ab0911be-162d-5065-a079-a5a0476e3c10""], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 800, ""y"": 300}}}"
-TEMPLATE,template-uuid-54fd-a9d2-d40fcfb89c5f,Kember use case,Kember Cordiac Model with PostPro Viewer,"",maiz@itis.swiss,2019-06-06 14:34:41.832,2019-06-06 14:34:44.981,"{""32a2b643-42e5-5f7f-af9c-e91b64c4989e"": {""key"": ""simcore/services/comp/kember-cardiac-model"", ""version"": ""1.0.0"", ""label"": ""Kember cardiac model"", ""inputs"": {""dt"": 0.01, ""T"": 1000, ""forcing_factor"": 0}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 50, ""y"": 100}}, ""df5e39cc-f31e-50b8-8ae7-b2a10131cc8f"": {""key"": ""simcore/services/dynamic/kember-viewer"", ""version"": ""2.9.0"", ""label"": ""kember-viewer"", ""inputs"": {""outputController"": {""nodeUuid"": ""32a2b643-42e5-5f7f-af9c-e91b64c4989e"", ""output"": ""out_1""}}, ""inputNodes"": [""32a2b643-42e5-5f7f-af9c-e91b64c4989e""], ""outputNode"": false, ""outputs"": {}, ""progress"": 10, ""thumbnail"": """", ""position"": {""x"": 300, ""y"": 100}}}"
-TEMPLATE,template-uuid-59c3-a22d-ce2979b88313,"UCDavis use cases: 1D, 2D",Colleen Clancy 1D and 2D use cases with a file picker and PostPro viewers,"",maiz@itis.swiss,2019-06-06 14:34:52.882,2019-06-06 14:34:54.863,"{""919cc4b3-973b-5d51-b24e-5f9a34f0478f"": {""key"": ""simcore/services/frontend/file-picker"", ""version"": ""1.0.0"", ""label"": ""File Picker 1&2 D"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 50, ""y"": 300}}, ""aaa65879-adb0-547e-8e94-2229dcd0b912"": {""key"": ""simcore/services/frontend/nodes-group"", ""version"": ""1.0.0"", ""label"": ""CC 1D"", ""inputs"": {}, ""inputNodes"": [""919cc4b3-973b-5d51-b24e-5f9a34f0478f""], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 300, ""y"": 200}}, ""5bd83ddf-582b-5b74-aa0b-f646fd835066"": {""key"": ""simcore/services/frontend/nodes-group"", ""version"": ""1.0.0"", ""label"": ""CC 2D"", ""inputs"": {}, ""inputNodes"": [""919cc4b3-973b-5d51-b24e-5f9a34f0478f"", ""aaa65879-adb0-547e-8e94-2229dcd0b912""], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 550, ""y"": 400}}, ""ea8426ea-f993-5b4b-8cdf-ff7770a9f98e"": {""key"": ""simcore/services/comp/ucdavis-1d-cardiac-model"", ""version"": ""1.0.0"", ""label"": ""DBP-Clancy-Rabbit-1-D solver"", ""inputs"": {""Na"": 0, ""Kr"": 0, ""BCL"": 10, ""NBeats"": 1, ""Ligand"": 0, ""cAMKII"": ""WT"", ""tw"": 5, ""tl"": 200, ""homogeneity"": ""heterogeneous"", ""in_10"": {""nodeUuid"": ""919cc4b3-973b-5d51-b24e-5f9a34f0478f"", ""output"": ""outFile""}}, ""inputNodes"": [""919cc4b3-973b-5d51-b24e-5f9a34f0478f""], ""outputNode"": true, ""outputs"": {}, ""parent"": ""aaa65879-adb0-547e-8e94-2229dcd0b912"", ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 100, ""y"": 350}}, ""b7fc93b3-bf51-5bb1-9ce9-8a7be6b86b63"": {""key"": ""simcore/services/dynamic/cc-1d-viewer"", ""version"": ""2.8.0"", ""label"": ""cc-1d-viewer"", ""inputs"": {""ECGs"": {""nodeUuid"": ""ea8426ea-f993-5b4b-8cdf-ff7770a9f98e"", ""output"": ""out_1""}, ""y_1D"": {""nodeUuid"": ""ea8426ea-f993-5b4b-8cdf-ff7770a9f98e"", ""output"": ""out_3""}}, ""inputNodes"": [""ea8426ea-f993-5b4b-8cdf-ff7770a9f98e""], ""outputNode"": false, ""outputs"": {}, ""parent"": ""aaa65879-adb0-547e-8e94-2229dcd0b912"", ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 300, ""y"": 200}}, ""d4135bd5-02f8-56e8-90f3-d0df529a0016"": {""key"": ""simcore/services/comp/ucdavis-2d-cardiac-model"", ""version"": ""1.0.0"", ""label"": ""DBP-Clancy-Rabbit-2-D solver"", ""inputs"": {""Na"": 0, ""Kr"": 0, ""BCL"": 10, ""Ligand"": 0, ""cAMKII"": ""WT"", ""tw"": 5, ""tl"": 200, ""homogeneity"": ""heterogeneous""}, ""inputNodes"": [""919cc4b3-973b-5d51-b24e-5f9a34f0478f"", ""aaa65879-adb0-547e-8e94-2229dcd0b912""], ""outputNode"": false, ""outputs"": {}, ""parent"": ""5bd83ddf-582b-5b74-aa0b-f646fd835066"", ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 100, ""y"": 350}}, ""0d54e54e-94c7-5b92-be80-a7fa7c25a69b"": {""key"": ""simcore/services/dynamic/cc-2d-viewer"", ""version"": ""2.8.0"", ""label"": ""cc-2d-viewer"", ""inputs"": {""ap"": {""nodeUuid"": ""d4135bd5-02f8-56e8-90f3-d0df529a0016"", ""output"": ""out_1""}}, ""inputNodes"": [""d4135bd5-02f8-56e8-90f3-d0df529a0016""], ""outputNode"": false, ""outputs"": {}, ""parent"": ""5bd83ddf-582b-5b74-aa0b-f646fd835066"", ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 300, ""y"": 200}}}"
-TEMPLATE,template-uuid-5a64-98c2-7912815f9036,4x Colleen Clancy 0Ds,4x Colleen Clancy 0Ds,"",maiz@itis.swiss,2019-06-06 14:34:59.293,2019-06-06 14:34:59.293,"{""4cb1e777-5472-5bd6-8e50-cb5fe6c66527"": {""key"": ""simcore/services/frontend/file-picker"", ""version"": ""1.0.0"", ""label"": ""File Picker 0D"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {}, ""parent"": null, ""position"": {""x"": 50, ""y"": 300}}, ""df846171-37fe-59a0-8cc8-1d45139b73ef"": {""key"": ""simcore/services/frontend/nodes-group"", ""version"": ""1.0.0"", ""label"": ""CC 0D (1)"", ""inputs"": {}, ""outputs"": {}, ""inputNodes"": [""4cb1e777-5472-5bd6-8e50-cb5fe6c66527""], ""outputNode"": false, ""position"": {""x"": 300, ""y"": 100}}, ""1eb2bd66-1ad4-5a46-b772-b5e23f733f97"": {""key"": ""simcore/services/frontend/nodes-group"", ""version"": ""1.0.0"", ""label"": ""CC 0D (2)"", ""inputs"": {}, ""outputs"": {}, ""inputNodes"": [""4cb1e777-5472-5bd6-8e50-cb5fe6c66527""], ""outputNode"": false, ""position"": {""x"": 300, ""y"": 250}}, ""5ffdbaa2-f8c6-5cb0-9abb-ed71c6cecb51"": {""key"": ""simcore/services/frontend/nodes-group"", ""version"": ""1.0.0"", ""label"": ""CC 0D (3)"", ""inputs"": {}, ""outputs"": {}, ""inputNodes"": [""4cb1e777-5472-5bd6-8e50-cb5fe6c66527""], ""outputNode"": false, ""position"": {""x"": 300, ""y"": 400}}, ""cd2b0a83-1f4a-5732-9b3b-4c687870c63f"": {""key"": ""simcore/services/frontend/nodes-group"", ""version"": ""1.0.0"", ""label"": ""CC 0D (4)"", ""inputs"": {}, ""outputs"": {}, ""inputNodes"": [""4cb1e777-5472-5bd6-8e50-cb5fe6c66527""], ""outputNode"": false, ""position"": {""x"": 300, ""y"": 550}}, ""ea8426ea-f993-5b4b-8cdf-ff7770a9f98e"": {""key"": ""simcore/services/comp/ucdavis-singlecell-cardiac-model"", ""version"": ""1.0.0"", ""label"": ""Clancy 0D solver (1)"", ""inputs"": {""Na"": 0, ""Kr"": 0, ""BCL"": 200, ""NBeats"": 5, ""Ligand"": 0, ""cAMKII"": ""WT"", ""initFile"": {""nodeUuid"": ""4cb1e777-5472-5bd6-8e50-cb5fe6c66527"", ""output"": ""outFile""}}, ""inputNodes"": [""4cb1e777-5472-5bd6-8e50-cb5fe6c66527""], ""outputNode"": false, ""outputs"": {}, ""parent"": ""df846171-37fe-59a0-8cc8-1d45139b73ef"", ""position"": {""x"": 100, ""y"": 350}}, ""eaa182e3-8a33-57a8-acbc-43f0e5859e3c"": {""key"": ""simcore/services/dynamic/cc-0d-viewer"", ""version"": ""2.8.0"", ""label"": ""Clancy 0D Viewer (1)"", ""inputs"": {""vm_1Hz"": {""nodeUuid"": ""ea8426ea-f993-5b4b-8cdf-ff7770a9f98e"", ""output"": ""out_4""}, ""all_results_1Hz"": {""nodeUuid"": ""ea8426ea-f993-5b4b-8cdf-ff7770a9f98e"", ""output"": ""out_1""}}, ""inputNodes"": [""ea8426ea-f993-5b4b-8cdf-ff7770a9f98e""], ""outputNode"": true, ""outputs"": {}, ""parent"": ""df846171-37fe-59a0-8cc8-1d45139b73ef"", ""position"": {""x"": 300, ""y"": 200}}, ""bfc3dcda-1a13-556a-b3b4-44c600a20418"": {""key"": ""simcore/services/comp/ucdavis-singlecell-cardiac-model"", ""version"": ""1.0.0"", ""label"": ""Clancy 0D solver (2)"", ""inputs"": {""Na"": 5, ""Kr"": 0, ""BCL"": 200, ""NBeats"": 5, ""Ligand"": 0, ""cAMKII"": ""WT"", ""initFile"": {""nodeUuid"": ""4cb1e777-5472-5bd6-8e50-cb5fe6c66527"", ""output"": ""outFile""}}, ""inputNodes"": [""4cb1e777-5472-5bd6-8e50-cb5fe6c66527""], ""outputNode"": false, ""outputs"": {}, ""parent"": ""1eb2bd66-1ad4-5a46-b772-b5e23f733f97"", ""position"": {""x"": 100, ""y"": 350}}, ""cd64ca6f-00b5-5d67-b4af-caf5e07ccdfe"": {""key"": ""simcore/services/dynamic/cc-0d-viewer"", ""version"": ""2.8.0"", ""label"": ""Clancy 0D Viewer (2)"", ""inputs"": {""vm_1Hz"": {""nodeUuid"": ""bfc3dcda-1a13-556a-b3b4-44c600a20418"", ""output"": ""out_4""}, ""all_results_1Hz"": {""nodeUuid"": ""bfc3dcda-1a13-556a-b3b4-44c600a20418"", ""output"": ""out_1""}}, ""inputNodes"": [""bfc3dcda-1a13-556a-b3b4-44c600a20418""], ""outputNode"": true, ""outputs"": {}, ""parent"": ""1eb2bd66-1ad4-5a46-b772-b5e23f733f97"", ""position"": {""x"": 300, ""y"": 200}}, ""8f7639b7-4f55-5088-a795-2a61bc17f645"": {""key"": ""simcore/services/comp/ucdavis-singlecell-cardiac-model"", ""version"": ""1.0.0"", ""label"": ""Clancy 0D solver (3)"", ""inputs"": {""Na"": 10, ""Kr"": 0, ""BCL"": 200, ""NBeats"": 5, ""Ligand"": 0, ""cAMKII"": ""WT"", ""initFile"": {""nodeUuid"": ""4cb1e777-5472-5bd6-8e50-cb5fe6c66527"", ""output"": ""outFile""}}, ""inputNodes"": [""4cb1e777-5472-5bd6-8e50-cb5fe6c66527""], ""outputNode"": false, ""outputs"": {}, ""parent"": ""5ffdbaa2-f8c6-5cb0-9abb-ed71c6cecb51"", ""position"": {""x"": 100, ""y"": 350}}, ""5e788613-a331-55e1-952e-ca01919c509a"": {""key"": ""simcore/services/dynamic/cc-0d-viewer"", ""version"": ""2.8.0"", ""label"": ""Clancy 0D Viewer (3)"", ""inputs"": {""vm_1Hz"": {""nodeUuid"": ""8f7639b7-4f55-5088-a795-2a61bc17f645"", ""output"": ""out_4""}, ""all_results_1Hz"": {""nodeUuid"": ""8f7639b7-4f55-5088-a795-2a61bc17f645"", ""output"": ""out_1""}}, ""inputNodes"": [""8f7639b7-4f55-5088-a795-2a61bc17f645""], ""outputNode"": true, ""outputs"": {}, ""parent"": ""5ffdbaa2-f8c6-5cb0-9abb-ed71c6cecb51"", ""position"": {""x"": 300, ""y"": 200}}, ""68075437-61e0-5c44-98be-a372584408be"": {""key"": ""simcore/services/comp/ucdavis-singlecell-cardiac-model"", ""version"": ""1.0.0"", ""label"": ""Clancy 0D solver (4)"", ""inputs"": {""Na"": 15, ""Kr"": 0, ""BCL"": 200, ""NBeats"": 5, ""Ligand"": 0, ""cAMKII"": ""WT"", ""initFile"": {""nodeUuid"": ""4cb1e777-5472-5bd6-8e50-cb5fe6c66527"", ""output"": ""outFile""}}, ""inputNodes"": [""4cb1e777-5472-5bd6-8e50-cb5fe6c66527""], ""outputNode"": false, ""outputs"": {}, ""parent"": ""cd2b0a83-1f4a-5732-9b3b-4c687870c63f"", ""position"": {""x"": 100, ""y"": 350}}, ""86c8b7ec-fac9-5d45-8551-5a4bf6dbf594"": {""key"": ""simcore/services/dynamic/cc-0d-viewer"", ""version"": ""2.8.0"", ""label"": ""Clancy 0D Viewer (4)"", ""inputs"": {""vm_1Hz"": {""nodeUuid"": ""68075437-61e0-5c44-98be-a372584408be"", ""output"": ""out_4""}, ""all_results_1Hz"": {""nodeUuid"": ""68075437-61e0-5c44-98be-a372584408be"", ""output"": ""out_1""}}, ""inputNodes"": [""68075437-61e0-5c44-98be-a372584408be""], ""outputNode"": true, ""outputs"": {}, ""parent"": ""cd2b0a83-1f4a-5732-9b3b-4c687870c63f"", ""position"": {""x"": 300, ""y"": 200}}, ""ff1b2149-7401-5d79-b369-ac73ec1e4713"": {""key"": ""simcore/services/frontend/multi-plot"", ""version"": ""1.0.0"", ""label"": ""Multi Plot"", ""inputs"": {}, ""inputNodes"": [""df846171-37fe-59a0-8cc8-1d45139b73ef"", ""1eb2bd66-1ad4-5a46-b772-b5e23f733f97"", ""5ffdbaa2-f8c6-5cb0-9abb-ed71c6cecb51"", ""cd2b0a83-1f4a-5732-9b3b-4c687870c63f""], ""outputNode"": false, ""outputs"": {}, ""parent"": null, ""position"": {""x"": 550, ""y"": 300}}, ""e10b62a8-ae5a-5eb2-9737-932276d0c777"": {""key"": ""simcore/services/dynamic/raw-graphs"", ""version"": ""2.8.0"", ""label"": ""2D plot (1)"", ""inputs"": {""input_1"": {""nodeUuid"": ""eaa182e3-8a33-57a8-acbc-43f0e5859e3c"", ""output"": ""out_1""}, ""input_2"": {""nodeUuid"": ""cd64ca6f-00b5-5d67-b4af-caf5e07ccdfe"", ""output"": ""out_1""}, ""input_3"": {""nodeUuid"": ""5e788613-a331-55e1-952e-ca01919c509a"", ""output"": ""out_1""}, ""input_4"": {""nodeUuid"": ""86c8b7ec-fac9-5d45-8551-5a4bf6dbf594"", ""output"": ""out_1""}}, ""inputNodes"": [""eaa182e3-8a33-57a8-acbc-43f0e5859e3c"", ""cd64ca6f-00b5-5d67-b4af-caf5e07ccdfe"", ""5e788613-a331-55e1-952e-ca01919c509a"", ""86c8b7ec-fac9-5d45-8551-5a4bf6dbf594""], ""outputNode"": true, ""outputs"": {}, ""parent"": ""ff1b2149-7401-5d79-b369-ac73ec1e4713"", ""position"": {""x"": 50, ""y"": 50}}, ""756dc773-fceb-5aa1-a0a2-a7f5c4f41eab"": {""key"": ""simcore/services/dynamic/raw-graphs"", ""version"": ""2.8.0"", ""label"": ""2D plot (2)"", ""inputs"": {""input_1"": {""nodeUuid"": ""eaa182e3-8a33-57a8-acbc-43f0e5859e3c"", ""output"": ""out_1""}, ""input_2"": {""nodeUuid"": ""cd64ca6f-00b5-5d67-b4af-caf5e07ccdfe"", ""output"": ""out_1""}, ""input_3"": {""nodeUuid"": ""5e788613-a331-55e1-952e-ca01919c509a"", ""output"": ""out_1""}, ""input_4"": {""nodeUuid"": ""86c8b7ec-fac9-5d45-8551-5a4bf6dbf594"", ""output"": ""out_1""}}, ""inputNodes"": [""eaa182e3-8a33-57a8-acbc-43f0e5859e3c"", ""cd64ca6f-00b5-5d67-b4af-caf5e07ccdfe"", ""5e788613-a331-55e1-952e-ca01919c509a"", ""86c8b7ec-fac9-5d45-8551-5a4bf6dbf594""], ""outputNode"": true, ""outputs"": {}, ""parent"": ""ff1b2149-7401-5d79-b369-ac73ec1e4713"", ""position"": {""x"": 50, ""y"": 50}}, ""540bf9d0-b2ee-5928-8ff9-e59bdf23a322"": {""key"": ""simcore/services/dynamic/raw-graphs"", ""version"": ""2.8.0"", ""label"": ""2D plot (3)"", ""inputs"": {""input_1"": {""nodeUuid"": ""eaa182e3-8a33-57a8-acbc-43f0e5859e3c"", ""output"": ""out_1""}, ""input_2"": {""nodeUuid"": ""cd64ca6f-00b5-5d67-b4af-caf5e07ccdfe"", ""output"": ""out_1""}, ""input_3"": {""nodeUuid"": ""5e788613-a331-55e1-952e-ca01919c509a"", ""output"": ""out_1""}, ""input_4"": {""nodeUuid"": ""86c8b7ec-fac9-5d45-8551-5a4bf6dbf594"", ""output"": ""out_1""}}, ""inputNodes"": [""eaa182e3-8a33-57a8-acbc-43f0e5859e3c"", ""cd64ca6f-00b5-5d67-b4af-caf5e07ccdfe"", ""5e788613-a331-55e1-952e-ca01919c509a"", ""86c8b7ec-fac9-5d45-8551-5a4bf6dbf594""], ""outputNode"": true, ""outputs"": {}, ""parent"": ""ff1b2149-7401-5d79-b369-ac73ec1e4713"", ""position"": {""x"": 50, ""y"": 50}}, ""4612f8df-2400-578f-8f42-e3bcd9788e46"": {""key"": ""simcore/services/dynamic/raw-graphs"", ""version"": ""2.8.0"", ""label"": ""2D plot (4)"", ""inputs"": {""input_1"": {""nodeUuid"": ""eaa182e3-8a33-57a8-acbc-43f0e5859e3c"", ""output"": ""out_1""}, ""input_2"": {""nodeUuid"": ""cd64ca6f-00b5-5d67-b4af-caf5e07ccdfe"", ""output"": ""out_1""}, ""input_3"": {""nodeUuid"": ""5e788613-a331-55e1-952e-ca01919c509a"", ""output"": ""out_1""}, ""input_4"": {""nodeUuid"": ""86c8b7ec-fac9-5d45-8551-5a4bf6dbf594"", ""output"": ""out_1""}}, ""inputNodes"": [""eaa182e3-8a33-57a8-acbc-43f0e5859e3c"", ""cd64ca6f-00b5-5d67-b4af-caf5e07ccdfe"", ""5e788613-a331-55e1-952e-ca01919c509a"", ""86c8b7ec-fac9-5d45-8551-5a4bf6dbf594""], ""outputNode"": true, ""outputs"": {}, ""parent"": ""ff1b2149-7401-5d79-b369-ac73ec1e4713"", ""position"": {""x"": 50, ""y"": 50}}}"
diff --git a/scripts/template-projects/templates_in_production.csv b/scripts/template-projects/templates_in_production.csv
deleted file mode 100644
index b3a80cdf335..00000000000
--- a/scripts/template-projects/templates_in_production.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-type,uuid,name,description,thumbnail,prj_owner,creation_date,last_change_date,workbench
-TEMPLATE,template-uuid-5716-bedd-b409bb021760,ISAN: 2D Plot,2D RawGraphs viewer with one input,"",maiz@itis.swiss,2019-06-06 14:33:34.008,2019-06-06 14:33:35.825,"{""dd332242-829a-58e5-884e-2690b3d54f11"": {""key"": ""simcore/services/frontend/file-picker"", ""version"": ""1.0.0"", ""label"": ""File Picker"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {""outFile"": {""store"": 1, ""path"": ""Shared Data/Height-Weight""}}, ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 100, ""y"": 100}}, ""e1ddb64b-2935-58a5-83d7-57d0feffbfea"": {""key"": ""simcore/services/dynamic/raw-graphs"", ""version"": ""2.8.0"", ""label"": ""2D plot"", ""inputs"": {""input_1"": {""nodeUuid"": ""dd332242-829a-58e5-884e-2690b3d54f11"", ""output"": ""outFile""}}, ""inputNodes"": [""dd332242-829a-58e5-884e-2690b3d54f11""], ""outputNode"": false, ""outputs"": {}, ""progress"": 90, ""thumbnail"": """", ""position"": {""x"": 400, ""y"": 100}}}"
-TEMPLATE,template-uuid-5d82-b08d-d39c436ca738,ISAN: UCDavis use case: 0D,Colleen Clancy Single Cell solver with a file picker and PostPro viewer,"",maiz@itis.swiss,2019-06-06 14:33:51.94,2019-06-06 14:33:54.329,"{""5ea0e1e8-1421-59d6-b1a5-6e7b2773636b"": {""key"": ""simcore/services/frontend/file-picker"", ""version"": ""1.0.0"", ""label"": ""File Picker 0D"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {""outFile"": {""store"": 1, ""path"": ""Shared Data/initial_WStates""}}, ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 50, ""y"": 150}}, ""b239ac4b-1967-562f-afd1-cca5105c8844"": {""key"": ""simcore/services/comp/ucdavis-singlecell-cardiac-model"", ""version"": ""1.0.0"", ""label"": ""DBP-Clancy-Rabbit-Single-Cell solver"", ""inputs"": {""Na"": 0, ""Kr"": 0, ""BCL"": 200, ""NBeats"": 5, ""Ligand"": 0, ""cAMKII"": ""WT"", ""initfile"": {""nodeUuid"": ""5ea0e1e8-1421-59d6-b1a5-6e7b2773636b"", ""output"": ""outFile""}}, ""inputAccess"": {""Na"": ""ReadAndWrite"", ""Kr"": ""ReadOnly"", ""BCL"": ""ReadAndWrite"", ""NBeats"": ""ReadOnly"", ""Ligand"": ""Invisible"", ""cAMKII"": ""Invisible""}, ""inputNodes"": [""5ea0e1e8-1421-59d6-b1a5-6e7b2773636b""], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 300, ""y"": 150}}, ""aa8cdc10-eab8-5fdd-9daa-cb03c51d8138"": {""key"": ""simcore/services/dynamic/cc-0d-viewer"", ""version"": ""2.8.0"", ""label"": ""cc-0d-viewer"", ""inputs"": {""vm_1Hz"": {""nodeUuid"": ""b239ac4b-1967-562f-afd1-cca5105c8844"", ""output"": ""out_4""}, ""all_results_1Hz"": {""nodeUuid"": ""b239ac4b-1967-562f-afd1-cca5105c8844"", ""output"": ""out_1""}}, ""inputNodes"": [""b239ac4b-1967-562f-afd1-cca5105c8844""], ""outputNode"": false, ""outputs"": {}, ""progress"": 20, ""thumbnail"": """", ""position"": {""x"": 550, ""y"": 150}}}"
-TEMPLATE,template-uuid-5a9e-9580-c53d92d18803,ISAN: MattWard use case,MattWard Solver/PostPro viewer,"",maiz@itis.swiss,2019-06-06 14:33:58.681,2019-06-06 14:34:01.617,"{""4858919c-e0f1-523c-8caa-4ca36c927ca2"": {""key"": ""simcore/services/dynamic/mattward-viewer"", ""version"": ""2.9.0"", ""label"": ""MattWard"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {}, ""progress"": 55, ""thumbnail"": """", ""position"": {""x"": 100, ""y"": 100}}}"
diff --git a/scripts/template-projects/templates_in_staging.csv b/scripts/template-projects/templates_in_staging.csv
deleted file mode 100644
index c7ae3a5182f..00000000000
--- a/scripts/template-projects/templates_in_staging.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-type,uuid,name,description,thumbnail,prj_owner,creation_date,last_change_date,workbench
-TEMPLATE,template-uuid-5716-bedd-b409bb021760,ISAN: 2D Plot,2D RawGraphs viewer with one input,"",maiz@itis.swiss,2019-06-06 14:33:34.008,2019-06-06 14:33:35.825,"{""dd332242-829a-58e5-884e-2690b3d54f11"": {""key"": ""simcore/services/frontend/file-picker"", ""version"": ""1.0.0"", ""label"": ""File Picker"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {""outFile"": {""store"": 1, ""path"": ""Shared Data/Height-Weight""}}, ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 100, ""y"": 100}}, ""e1ddb64b-2935-58a5-83d7-57d0feffbfea"": {""key"": ""simcore/services/dynamic/raw-graphs"", ""version"": ""2.8.0"", ""label"": ""2D plot"", ""inputs"": {""input_1"": {""nodeUuid"": ""dd332242-829a-58e5-884e-2690b3d54f11"", ""output"": ""outFile""}}, ""inputNodes"": [""dd332242-829a-58e5-884e-2690b3d54f11""], ""outputNode"": false, ""outputs"": {}, ""progress"": 90, ""thumbnail"": """", ""position"": {""x"": 400, ""y"": 100}}}"
-TEMPLATE,template-uuid-5d82-b08d-d39c436ca738,ISAN: UCDavis use case: 0D,Colleen Clancy Single Cell solver with a file picker and PostPro viewer,"",maiz@itis.swiss,2019-06-06 14:33:51.94,2019-06-06 14:33:54.329,"{""5ea0e1e8-1421-59d6-b1a5-6e7b2773636b"": {""key"": ""simcore/services/frontend/file-picker"", ""version"": ""1.0.0"", ""label"": ""File Picker 0D"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {""outFile"": {""store"": 1, ""path"": ""Shared Data/initial_WStates""}}, ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 50, ""y"": 150}}, ""b239ac4b-1967-562f-afd1-cca5105c8844"": {""key"": ""simcore/services/comp/ucdavis-singlecell-cardiac-model"", ""version"": ""1.0.0"", ""label"": ""DBP-Clancy-Rabbit-Single-Cell solver"", ""inputs"": {""Na"": 0, ""Kr"": 0, ""BCL"": 200, ""NBeats"": 5, ""Ligand"": 0, ""cAMKII"": ""WT"", ""initfile"": {""nodeUuid"": ""5ea0e1e8-1421-59d6-b1a5-6e7b2773636b"", ""output"": ""outFile""}}, ""inputAccess"": {""Na"": ""ReadAndWrite"", ""Kr"": ""ReadOnly"", ""BCL"": ""ReadAndWrite"", ""NBeats"": ""ReadOnly"", ""Ligand"": ""Invisible"", ""cAMKII"": ""Invisible""}, ""inputNodes"": [""5ea0e1e8-1421-59d6-b1a5-6e7b2773636b""], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 300, ""y"": 150}}, ""aa8cdc10-eab8-5fdd-9daa-cb03c51d8138"": {""key"": ""simcore/services/dynamic/cc-0d-viewer"", ""version"": ""2.8.0"", ""label"": ""cc-0d-viewer"", ""inputs"": {""vm_1Hz"": {""nodeUuid"": ""b239ac4b-1967-562f-afd1-cca5105c8844"", ""output"": ""out_4""}, ""all_results_1Hz"": {""nodeUuid"": ""b239ac4b-1967-562f-afd1-cca5105c8844"", ""output"": ""out_1""}}, ""inputNodes"": [""b239ac4b-1967-562f-afd1-cca5105c8844""], ""outputNode"": false, ""outputs"": {}, ""progress"": 20, ""thumbnail"": """", ""position"": {""x"": 550, ""y"": 150}}}"
-TEMPLATE,template-uuid-5a9e-9580-c53d92d18803,ISAN: MattWard use case,MattWard Solver/PostPro viewer,"",maiz@itis.swiss,2019-06-06 14:33:58.681,2019-06-06 14:34:01.617,"{""4858919c-e0f1-523c-8caa-4ca36c927ca2"": {""key"": ""simcore/services/dynamic/mattward-viewer"", ""version"": ""2.9.0"", ""label"": ""MattWard"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {}, ""progress"": 55, ""thumbnail"": """", ""position"": {""x"": 100, ""y"": 100}}}"
-TEMPLATE,template-uuid-5203-915e-1ae8ae0c9991,Sleepers,"5 sleepers interconnected","",maiz@itis.swiss,2019-06-06 14:34:19.631,2019-06-06 14:34:28.647,"{""f447dd35-b098-5f7e-92b0-5a14e84401e9"": {""key"": ""simcore/services/comp/itis/sleeper"", ""version"": ""1.0.0"", ""label"": ""sleeper 0"", ""inputs"": {""in_2"": 2}, ""inputAccess"": {""in_1"": ""Invisible"", ""in_2"": ""ReadOnly""}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 50, ""y"": 300}}, ""2745b49f-4fc4-5d8a-812c-44dacf56840e"": {""key"": ""simcore/services/comp/itis/sleeper"", ""version"": ""1.0.0"", ""label"": ""sleeper 1"", ""inputs"": {""in_1"": {""nodeUuid"": ""f447dd35-b098-5f7e-92b0-5a14e84401e9"", ""output"": ""out_1""}, ""in_2"": 2}, ""inputNodes"": [""f447dd35-b098-5f7e-92b0-5a14e84401e9""], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 300, ""y"": 200}}, ""d1448b77-84ea-5706-b741-4073a4454f0d"": {""key"": ""simcore/services/comp/itis/sleeper"", ""version"": ""1.0.0"", ""label"": ""sleeper 2"", ""inputs"": {""in_1"": {""nodeUuid"": ""2745b49f-4fc4-5d8a-812c-44dacf56840e"", ""output"": ""out_1""}, ""in_2"": {""nodeUuid"": ""2745b49f-4fc4-5d8a-812c-44dacf56840e"", ""output"": ""out_2""}}, ""inputNodes"": [""2745b49f-4fc4-5d8a-812c-44dacf56840e""], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 550, ""y"": 200}}, ""ab0911be-162d-5065-a079-a5a0476e3c10"": {""key"": ""simcore/services/comp/itis/sleeper"", ""version"": ""1.0.0"", ""label"": ""sleeper 3"", ""inputs"": {""in_2"": {""nodeUuid"": ""f447dd35-b098-5f7e-92b0-5a14e84401e9"", ""output"": ""out_2""}}, ""inputNodes"": [""f447dd35-b098-5f7e-92b0-5a14e84401e9""], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 420, ""y"": 400}}, ""bd0f303e-92c4-559d-aa19-dc9293e10e4c"": {""key"": ""simcore/services/comp/itis/sleeper"", ""version"": ""1.0.0"", ""label"": ""sleeper 4"", ""inputs"": {""in_1"": {""nodeUuid"": ""d1448b77-84ea-5706-b741-4073a4454f0d"", ""output"": ""out_1""}, ""in_2"": {""nodeUuid"": ""ab0911be-162d-5065-a079-a5a0476e3c10"", ""output"": ""out_2""}}, ""inputNodes"": [""d1448b77-84ea-5706-b741-4073a4454f0d"", ""ab0911be-162d-5065-a079-a5a0476e3c10""], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 800, ""y"": 300}}}"
-TEMPLATE,template-uuid-54fd-a9d2-d40fcfb89c5f,Kember use case,Kember Cordiac Model with PostPro Viewer,"",maiz@itis.swiss,2019-06-06 14:34:41.832,2019-06-06 14:34:44.981,"{""32a2b643-42e5-5f7f-af9c-e91b64c4989e"": {""key"": ""simcore/services/comp/kember-cardiac-model"", ""version"": ""1.0.0"", ""label"": ""Kember cardiac model"", ""inputs"": {""dt"": 0.01, ""T"": 1000, ""forcing_factor"": 0}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 50, ""y"": 100}}, ""df5e39cc-f31e-50b8-8ae7-b2a10131cc8f"": {""key"": ""simcore/services/dynamic/kember-viewer"", ""version"": ""2.9.0"", ""label"": ""kember-viewer"", ""inputs"": {""outputController"": {""nodeUuid"": ""32a2b643-42e5-5f7f-af9c-e91b64c4989e"", ""output"": ""out_1""}}, ""inputNodes"": [""32a2b643-42e5-5f7f-af9c-e91b64c4989e""], ""outputNode"": false, ""outputs"": {}, ""progress"": 10, ""thumbnail"": """", ""position"": {""x"": 300, ""y"": 100}}}"
diff --git a/services/director/src/simcore_service_director/producer.py b/services/director/src/simcore_service_director/producer.py
index ca91704af76..a3ee24f426e 100644
--- a/services/director/src/simcore_service_director/producer.py
+++ b/services/director/src/simcore_service_director/producer.py
@@ -407,18 +407,18 @@ async def _start_docker_service(app: aiohttp.web.Application,
 
     except exceptions.ServiceStartTimeoutError as err:
         log.exception("Service failed to start")
-        await _silent_service_cleanup(node_uuid)
+        await _silent_service_cleanup(app, node_uuid)
         raise
     except aiodocker.exceptions.DockerError as err:
         log.exception("Unexpected error")
-        await _silent_service_cleanup(node_uuid)
+        await _silent_service_cleanup(app, node_uuid)
         raise exceptions.ServiceNotAvailableError(
             service_key, service_tag) from err
 
 
-async def _silent_service_cleanup(node_uuid):
+async def _silent_service_cleanup(app: aiohttp.web.Application, node_uuid):
     try:
-        await stop_service(node_uuid)
+        await stop_service(app, node_uuid)
     except exceptions.DirectorException:
         pass
 
@@ -544,7 +544,8 @@ async def get_service_details(app: aiohttp.web.Application, node_uuid: str) -> D
                 "Error while accessing container", err) from err
 
 
-async def stop_service(node_uuid: str):
+async def stop_service(app: aiohttp.web.Application, node_uuid: str):
+    log.debug("stopping service with uuid %s", node_uuid)
     # get the docker client
     async with _docker_client() as client: # pylint: disable=not-async-context-manager
         try:
@@ -557,11 +558,33 @@ async def stop_service(node_uuid: str):
         # error if no service with such an id exists
         if not list_running_services_with_uuid:
             raise exceptions.ServiceUUIDNotFoundError(node_uuid)
+        log.debug("found service(s) with uuid %s", list_running_services_with_uuid)
+        # save the state of the main service if it can        
+        service_details = await get_service_details(app, node_uuid)
+        service_host_name = "{}:{}{}".format(service_details["service_host"], 
+                                            service_details["service_port"] if service_details["service_port"] else "80",
+                                            service_details["service_basepath"])
+        log.debug("saving state of service %s...", service_host_name)
+        try:
+            async with aiohttp.ClientSession() as session:
+                service_url = "http://" + service_host_name + "/" + "state"
+                async with session.post(service_url) as response:
+                    if 199 < response.status < 300:
+                        log.debug("service %s successfully saved its state", service_host_name)                    
+                    else:
+                        log.warning("service %s does not allow saving state, answered %s", service_host_name, await response.text())
+        except aiohttp.ClientConnectionError:
+            log.exception("service %s could not be contacted, state not saved")
+        
+                    
         # remove the services
         try:
+            log.debug("removing services...")
             for service in list_running_services_with_uuid:
                 await client.services.delete(service["Spec"]["Name"])
+            log.debug("removed services, now removing network...")
         except aiodocker.exceptions.DockerError as err:
             raise exceptions.GenericDockerError("Error while removing services", err)
         # remove network(s)
         await _remove_overlay_network_of_swarm(client, node_uuid)
+        log.debug("removed network")
diff --git a/services/director/src/simcore_service_director/rest/handlers.py b/services/director/src/simcore_service_director/rest/handlers.py
index e662a2691bf..fd041fb8553 100644
--- a/services/director/src/simcore_service_director/rest/handlers.py
+++ b/services/director/src/simcore_service_director/rest/handlers.py
@@ -83,7 +83,7 @@ async def running_interactive_services_get(request, service_uuid):  # pylint:dis
 async def running_interactive_services_delete(request, service_uuid):  # pylint:disable=unused-argument
     log.debug("Client does running_interactive_services_delete request %s with service_uuid %s", request, service_uuid)
     try:
-        await producer.stop_service(service_uuid)
+        await producer.stop_service(request.app, service_uuid)
     except exceptions.ServiceUUIDNotFoundError as err:
         raise web_exceptions.HTTPNotFound(reason=str(err))
     except Exception as err:
diff --git a/services/director/tests/fixtures/fake_services.py b/services/director/tests/fixtures/fake_services.py
index c6f74a93e7b..0b7390dc8f4 100644
--- a/services/director/tests/fixtures/fake_services.py
+++ b/services/director/tests/fixtures/fake_services.py
@@ -83,7 +83,7 @@ def _build_push_image(docker_dir, registry_url, service_type, name, tag, depende
     additional_docker_labels = [{"name": "constraints", "type": "string", "value": ["node.role==manager"]}]
     internal_port = None
     if service_type == "dynamic":
-        internal_port = random.randint(1, 100000)
+        internal_port = random.randint(1, 65535)
         additional_docker_labels.append({"name": "ports", "type": "int", "value": internal_port})
     docker_labels["simcore.service.settings"] = json.dumps(additional_docker_labels)
     if bad_json_format:
diff --git a/services/director/tests/test_handlers.py b/services/director/tests/test_handlers.py
index bbc1aa6b618..11a208b9e74 100644
--- a/services/director/tests/test_handlers.py
+++ b/services/director/tests/test_handlers.py
@@ -211,7 +211,8 @@ async def _start_get_stop_services(client, push_services, user_id, project_id):
 
         # stop the service
         web_response = await client.delete("/v0/running_interactive_services/{}".format(params["service_uuid"]))
-        assert web_response.status == 204
+        text = await web_response.text()
+        assert web_response.status == 204, text
         assert web_response.content_type == "application/json"
         data = await web_response.json()
         assert data is None
diff --git a/services/director/tests/test_producer.py b/services/director/tests/test_producer.py
index 6a4659df383..f151c2f0932 100644
--- a/services/director/tests/test_producer.py
+++ b/services/director/tests/test_producer.py
@@ -62,7 +62,7 @@ async def push_start_services(number_comp, number_dyn, dependant=False):
     #teardown stop the services
     for service in started_services:
         service_uuid = service["service_uuid"]
-        await producer.stop_service(service_uuid)
+        await producer.stop_service(aiohttp_mock_app, service_uuid)
         with pytest.raises(exceptions.ServiceUUIDNotFoundError):
             await producer.get_service_details(aiohttp_mock_app, service_uuid)
 
diff --git a/services/docker-compose.tools.yml b/services/docker-compose-tools.yml
similarity index 82%
rename from services/docker-compose.tools.yml
rename to services/docker-compose-tools.yml
index eaa73a46e35..20a2c9ae621 100644
--- a/services/docker-compose.tools.yml
+++ b/services/docker-compose-tools.yml
@@ -1,6 +1,6 @@
-version: '3.4'
+# Tooling stack
+version: '3.7'
 services:
-  # Maintenance services
   #--------------------------------------------------------------------
   # By default disabled: celery workers monitor
   flower:
@@ -27,11 +27,5 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - portainer_data:/data
-  #----------------------------------------------
-  # TODO: Pedro reviews
-  # wdb:
-  #  image: kozea/wdb
-  #  ports:
-  #    - "1984:1984"
 volumes:
   portainer_data:
diff --git a/services/docker-compose.cache.yml b/services/docker-compose.cache.yml
index ccf268dc9e1..4ddd03e5f46 100644
--- a/services/docker-compose.cache.yml
+++ b/services/docker-compose.cache.yml
@@ -1,4 +1,4 @@
-version: '3.4'
+version: '3.7'
 services:
   apihub:
     image: ${DOCKER_REGISTRY:-itisfoundation}/apihub:cache
diff --git a/services/docker-compose.devel.yml b/services/docker-compose.devel.yml
index 2b8c063da9e..918d552454e 100644
--- a/services/docker-compose.devel.yml
+++ b/services/docker-compose.devel.yml
@@ -1,5 +1,8 @@
-# USAGE:  docker-compose -f docker-compose.yml -f docker-compose.devel.yml ...
-version: '3.4'
+# Overrides docker-compose.yml for development mode
+# Usage:
+#   docker-compose -f docker-compose.yml -f docker-compose.devel.yml ...
+#
+version: '3.7'
 services:
   apihub:
     image: services_apihub:dev
@@ -62,3 +65,8 @@ services:
       - ../packages:/devel/packages
     stdin_open: true
     tty: true
+  #--------------------------------------------------------------------
+  maintenance:
+    image: services_maintenance:dev
+    volumes:
+      - ./maintenance/notebooks:/home/jovyan/work
diff --git a/services/docker-compose.yml b/services/docker-compose.yml
index bf827417372..a6847d006b6 100644
--- a/services/docker-compose.yml
+++ b/services/docker-compose.yml
@@ -1,4 +1,5 @@
-version: '3.4'
+# osparc-simcore stack (framework stack)
+version: '3.7'
 services:
   apihub:
     image: ${DOCKER_REGISTRY:-itisfoundation}/apihub:${DOCKER_IMAGE_TAG:-latest}
@@ -248,6 +249,28 @@ services:
     ports:
       - "9000"
     command: server /data
+  #--------------------------------------------------------------------
+  maintenance:
+    image: ${DOCKER_REGISTRY:-itisfoundation}/maintenance:${DOCKER_IMAGE_TAG:-latest}
+    build:
+      context: ../
+      dockerfile: services/maintenance/Dockerfile
+      labels:
+        org.label-schema.schema-version: "1.0"
+        org.label-schema.build-date: "${BUILD_DATE}"
+        org.label-schema.vcs-url: "https://github.com/ITISFoundation/osparc-simcore"
+        org.label-schema.vcs-ref: "${VCS_REF}"
+    ports:
+      - "8888"
+    env_file:
+      - ../.env
+    depends_on:
+      - postgres
+    deploy:
+      placement:
+        constraints:
+          - node.platform.os == linux
+          - node.role == manager
 volumes:
   input:
   output:
diff --git a/services/maintenance/Dockerfile b/services/maintenance/Dockerfile
new file mode 100644
index 00000000000..693383573cb
--- /dev/null
+++ b/services/maintenance/Dockerfile
@@ -0,0 +1,25 @@
+#FROM nbgallery/jupyter-alpine:7.8.4
+FROM jupyter/base-notebook:python-3.7.3 AS base
+
+COPY --chown=jovyan:users scripts/docker/healthcheck_curl_host.py /healthcheck/healthcheck_curl_host.py
+HEALTHCHECK --interval=10s \
+            --timeout=30s \
+            --start-period=1s \
+            --retries=3 \
+            CMD ["python3", "/healthcheck/healthcheck_curl_host.py", "http://localhost:8888"]
+
+
+# enable single-user server
+RUN unset JUPYTERHUB_API_TOKEN
+
+COPY --chown=jovyan:users packages/postgres-database $HOME/postgres-database
+RUN pip install --upgrade pip wheel setuptools && \
+    pip install $HOME/postgres-database[migration] && \
+    rm -rf $HOME/postgres-database
+
+WORKDIR $HOME/work
+COPY --chown=jovyan:users services/maintenance/notebooks .
+RUN jupyter trust $HOME/work/*
+
+COPY --chown=jovyan:users services/maintenance/boot.sh /usr/local/bin/
+CMD [ "boot.sh" ]
diff --git a/services/maintenance/README.md b/services/maintenance/README.md
new file mode 100644
index 00000000000..f20da627b49
--- /dev/null
+++ b/services/maintenance/README.md
@@ -0,0 +1,6 @@
+# Maintenance service
+
+TODO: light [jupyter](https://github.com/nbgallery/jupyter-alpine) notebook for maintenance operations
+
+
+```
diff --git a/services/maintenance/boot.sh b/services/maintenance/boot.sh
new file mode 100755
index 00000000000..4687be8e171
--- /dev/null
+++ b/services/maintenance/boot.sh
@@ -0,0 +1 @@
+exec start-notebook.sh --NotebookApp.password=$(python -c "from notebook.auth import passwd; print(passwd('${MAINTENANCE_PASSWORD}'))")
diff --git a/services/maintenance/notebooks/db-migration.ipynb b/services/maintenance/notebooks/db-migration.ipynb
new file mode 100644
index 00000000000..70351c50bee
--- /dev/null
+++ b/services/maintenance/notebooks/db-migration.ipynb
@@ -0,0 +1,146 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# simcore postgres database\n",
+    "\n",
+    "Contains database **models** served by the ``postgres`` service and adds an extension with **migration** tools (e.g. entrypoint that wraps [alembic]'s CLI in a similar way to [flask-migrate]).\n",
+    "\n",
+    "\n",
+    "To install migration tools add ``[migration]`` extra\n",
+    "```console\n",
+    "  pip install .[migration]\n",
+    "```\n",
+    "and to call the CLI use\n",
+    "```console\n",
+    "  simcore-postgres-database --help\n",
+    "\n",
+    "  # or a short alias\n",
+    "\n",
+    "  sc-pg --help\n",
+    "```\n",
+    "This entrypoing wraps calls to [alembic] commands and customizes it for ``simcore_postgres_database`` models and `postgres` online database.\n",
+    "\n",
+    "\n",
+    "A typical workflow:\n",
+    "\n",
+    "### Discover\n",
+    "\n",
+    "```console\n",
+    "  simcore-postgres-database discover -u simcore -p simcore\n",
+    "```\n",
+    "\n",
+    "```console\n",
+    "  simcore-postgres-database info\n",
+    "```\n",
+    "\n",
+    "### Review\n",
+    "\n",
+    "```console\n",
+    "  simcore-postgres-database review -m \"some message about changes\"\n",
+    "```\n",
+    "Auto-generates some scripts under [migration/versions](packages/postgres-database/migration/versions). The migration script **needs to be reviewed and edited**, as Alembic currently does not detect every change you\n",
+    "make to your models. In particular, Alembic is currently unable to detect:\n",
+    "- table name changes,\n",
+    "- column name changes,\n",
+    "- or anonymously named constraints\n",
+    "A detailed summary of limitations can be found in the Alembic autogenerate documentation.\n",
+    "Once finalized, the migration script also needs to be added to version control.\n",
+    "\n",
+    "### Upgrade\n",
+    "\n",
+    "Upgrades to given revision (get ``info`` to check history)\n",
+    "```console\n",
+    "  simcore-postgres-database upgrade head\n",
+    "```\n",
+    "\n",
+    "\n",
+    "[alembic]:https://alembic.sqlalchemy.org/en/latest/\n",
+    "[flask-migrate]:https://flask-migrate.readthedocs.io/en/latest/\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import os\n",
+    "import simcore_postgres_database as scpg\n",
+    "\n",
+    "alembic_ini = os.path.join( os.path.dirname(scpg.__file__), 'alembic.ini')"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "! echo $alembic_ini\n",
+    "!alembic -c $alembic_ini history\n",
+    "#!alembic --help\n",
+    "#"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "!alembic -c $alembic_ini stamp --sql 645807399320"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "!sc-pg --help"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "!sc-pg discover"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "!sc-pg upgrade head"
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.7.3"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 2
+}
diff --git a/services/sidecar/requirements/dev.txt b/services/sidecar/requirements/dev.txt
index 69b94b613d0..77ec3e359ba 100644
--- a/services/sidecar/requirements/dev.txt
+++ b/services/sidecar/requirements/dev.txt
@@ -12,6 +12,7 @@
 # installs this repo's packages
 -e ../../services/storage/client-sdk/python/
 -e ../../packages/s3wrapper/
+-e ../../packages/postgres-database/
 -e ../../packages/simcore-sdk/
 
 # installs current package
diff --git a/services/sidecar/requirements/prod.txt b/services/sidecar/requirements/prod.txt
index 533f86e6b1b..c26a540f09b 100644
--- a/services/sidecar/requirements/prod.txt
+++ b/services/sidecar/requirements/prod.txt
@@ -12,6 +12,7 @@
 # installs this repo's packages
 ../../services/storage/client-sdk/python/
 ../../packages/s3wrapper/
+../../packages/postgres-database/
 ../../packages/simcore-sdk/
 
 # installs current package
diff --git a/services/sidecar/src/sidecar/_deprecated.py b/services/sidecar/src/sidecar/_deprecated.py
index 56fb5bd71d3..31e9d694f39 100644
--- a/services/sidecar/src/sidecar/_deprecated.py
+++ b/services/sidecar/src/sidecar/_deprecated.py
@@ -95,8 +95,11 @@ def _process_task_input(self, port, input_ports):
                 other_task = None
                 _session = self._db.Session()
                 try:
-                    other_task =_session.query(ComputationalTask).filter(and_(ComputationalTask.node_id==other_node_id,
-                                    ComputationalTask.project_id==self._task.project_id)).one()
+                    # pylint: disable=no-member
+                    other_task =_session.query(ComputationalTask).filter(
+                        and_( ComputationalTask.node_id==other_node_id,
+                              ComputationalTask.project_id==self._task.project_id )
+                    ).one()
                 except exc.SQLAlchemyError:
                     log.exception("Could not find other task")
                     _session.rollback()
@@ -392,8 +395,13 @@ def inspect(self, celery_task, project_id, node_id):
                 do_process = True
                 # find the for the current node_id, skip if there is already a job_id around
                 # pylint: disable=assignment-from-no-return
-                query =_session.query(ComputationalTask).filter(and_(ComputationalTask.node_id==node_id,
-                    ComputationalTask.project_id==project_id, ComputationalTask.job_id==None))
+                # pylint: disable=no-member
+                query =_session.query(ComputationalTask).filter(
+                    and_(
+                        ComputationalTask.node_id==node_id,
+                        ComputationalTask.project_id==project_id,
+                        ComputationalTask.job_id==None)
+                    )
                 # Use SELECT FOR UPDATE TO lock the row
                 query.with_for_update()
                 task = query.one()
diff --git a/services/sidecar/src/sidecar/core.py b/services/sidecar/src/sidecar/core.py
index e5428f48508..dcb29dacdaf 100644
--- a/services/sidecar/src/sidecar/core.py
+++ b/services/sidecar/src/sidecar/core.py
@@ -388,8 +388,12 @@ def inspect(self, celery_task, user_id, project_id, node_id):
                 do_process = True
                 # find the for the current node_id, skip if there is already a job_id around
                 # pylint: disable=assignment-from-no-return
-                query =_session.query(ComputationalTask).filter(and_(ComputationalTask.node_id==node_id,
-                    ComputationalTask.project_id==project_id, ComputationalTask.job_id==None))
+                # pylint: disable=no-member
+                query =_session.query(ComputationalTask).filter(
+                    and_(   ComputationalTask.node_id==node_id,
+                            ComputationalTask.project_id==project_id,
+                            ComputationalTask.job_id==None )
+                )
                 # Use SELECT FOR UPDATE TO lock the row
                 query.with_for_update()
                 task = query.one()
diff --git a/services/sidecar/src/sidecar/utils.py b/services/sidecar/src/sidecar/utils.py
index c4e99a53455..edad99f32c9 100644
--- a/services/sidecar/src/sidecar/utils.py
+++ b/services/sidecar/src/sidecar/utils.py
@@ -39,9 +39,11 @@ def find_entry_point(g):
     return result
 
 def is_node_ready(task, graph, _session, _logger):
+    #pylint: disable=no-member
     tasks = _session.query(ComputationalTask).filter(and_(
         ComputationalTask.node_id.in_(list(graph.predecessors(task.node_id))),
         ComputationalTask.project_id==task.project_id)).all()
+
     _logger.debug("TASK %s ready? Checking ..", task.internal_id)
     for dep_task in tasks:
         job_id = dep_task.job_id
diff --git a/services/sidecar/tests/utils.py b/services/sidecar/tests/utils.py
index a3fdb5d0eb1..9d4ad5cf0ef 100644
--- a/services/sidecar/tests/utils.py
+++ b/services/sidecar/tests/utils.py
@@ -75,6 +75,7 @@ def setup_sleepers(url):
     pipeline = ComputationalPipeline(dag_adjacency_list=dag_adjacency_list, state=0)
     db_session.add(pipeline)
     db_session.flush()
+    # pylint: disable=no-member
     project_id = pipeline.project_id
 
     node_id_1 = "e609a68c-d743-4a12-9745-f31734d1b911"
@@ -83,29 +84,29 @@ def setup_sleepers(url):
     node_schema = {
         "inputs":{
             "in_1":{
-                "label": "Number of seconds to sleep", 
-                "description": "Number of seconds to sleep", 
+                "label": "Number of seconds to sleep",
+                "description": "Number of seconds to sleep",
                 "displayOrder":0,
                 "type": "data:*/*"
             },
             "in_2": {
-                "label": "Number of seconds to sleep", 
-                "description": "Number of seconds to sleep", 
+                "label": "Number of seconds to sleep",
+                "description": "Number of seconds to sleep",
                 "displayOrder":1,
-                "type": "integer", 
+                "type": "integer",
                 "defaultValue": 4
             }
         },
         "outputs":{
             "out_1":{
-                "label": "Number of seconds to sleep", 
-                "description": "Number of seconds to sleep", 
+                "label": "Number of seconds to sleep",
+                "description": "Number of seconds to sleep",
                 "displayOrder":0,
                 "type": "data:*/*"
             },
             "out_2": {
-                "label": "Number of seconds to sleep", 
-                "description": "Number of seconds to sleep", 
+                "label": "Number of seconds to sleep",
+                "description": "Number of seconds to sleep",
                 "displayOrder":1,
                 "type": "integer"
             }
diff --git a/services/storage/Dockerfile b/services/storage/Dockerfile
index e4716eeb65e..24f39c61d2d 100644
--- a/services/storage/Dockerfile
+++ b/services/storage/Dockerfile
@@ -1,4 +1,5 @@
-FROM python:3.6-alpine as base
+#FROM python:3.6-alpine as base
+FROM itisfoundation/python-with-pandas:3.6-alpine as base
 #
 #  USAGE:
 #     cd sercices/storage
diff --git a/services/storage/README.md b/services/storage/README.md
index fe14edcf893..03661c06084 100644
--- a/services/storage/README.md
+++ b/services/storage/README.md
@@ -5,3 +5,4 @@
 [![](https://images.microbadger.com/badges/commit/itisfoundation/storage.svg)](https://microbadger.com/images/itisfoundation/storage "More on service image in registry")
 
 Service to manage data storage in simcore
+
diff --git a/services/storage/requirements/_base.in b/services/storage/requirements/_base.in
index 1051e4c8a35..05797e2fce7 100644
--- a/services/storage/requirements/_base.in
+++ b/services/storage/requirements/_base.in
@@ -1,12 +1,15 @@
 #
 # Specifies third-party dependencies for 'storage'
 #
+-r python-with-pandas_89f709.txt # TODO: add reference to git@github.com:ITISFoundation/dockerfiles.git/requirements
 
 urllib3~=1.24.2         # See https://nvd.nist.gov/vuln/detail/CVE-2019-11324
 psycopg2-binary~=2.7.5  # See http://initd.org/psycopg/docs/install.html#binary-install-from-pypi
 sqlalchemy~=1.3.3       # https://nvd.nist.gov/vuln/detail/CVE-2019-7164
 jsonschema<3            # openapi-spec-validator from service-libs has requirement jsonschema<3
+boto3==1.9.91           # do not use lastest version, this would require botocore<1.13.0,>=1.12.179 but aiobotocore[boto3]==0.10.2 hardcodes boto3==1.9.91 that requires botocore<1.12.92,>=1.12.91
 
+aioboto3
 aiohttp
 aiofiles
 aiopg[sa]~=0.15.0     # Fixes 0.16.0 https://github.com/aio-libs/aiopg/issues/535
diff --git a/services/storage/requirements/_base.txt b/services/storage/requirements/_base.txt
index b5a7f5b3a94..ebe7485d662 100644
--- a/services/storage/requirements/_base.txt
+++ b/services/storage/requirements/_base.txt
@@ -4,15 +4,18 @@
 #
 #    pip-compile --output-file=_base.txt _base.in
 #
+aioboto3==6.4.1
+aiobotocore[boto3]==0.10.2  # via aioboto3
 aiofiles==0.4.0
 aiohttp==3.5.4
 aiopg[sa]==0.15.0
 apipkg==1.5               # via execnet
+async-generator==1.10     # via aiobotocore
 async-timeout==3.0.1      # via aiohttp
 attrs==19.1.0             # via aiohttp
 blackfynn==2.11.1
-boto3==1.9.153            # via blackfynn
-botocore==1.12.153        # via boto3, s3transfer
+boto3==1.9.91
+botocore==1.12.91         # via aiobotocore, boto3, s3transfer
 certifi==2019.3.9         # via requests
 chardet==3.0.4            # via aiohttp, requests
 configparser==3.7.4       # via blackfynn
@@ -27,20 +30,20 @@ jmespath==0.9.4           # via boto3, botocore
 jsonschema==2.6.0
 marshmallow==2.19.2
 multidict==4.5.2          # via aiohttp, yarl
-numpy==1.16.3             # via blackfynn, pandas
-pandas==0.24.2            # via blackfynn
+numpy==1.16.3
+pandas==0.24.2
 protobuf==3.2.0           # via blackfynn
 psutil==5.6.2             # via blackfynn
 psycopg2-binary==2.7.7
 psycopg2==2.8.2           # via aiopg
-python-dateutil==2.8.0    # via botocore, pandas
-pytz==2019.1              # via blackfynn, pandas
+python-dateutil==2.8.0
+pytz==2019.1
 pyyaml==5.1               # via trafaret-config
 requests==2.22.0          # via blackfynn
 s3transfer==0.2.0         # via boto3
 semantic-version==2.6.0
 semver==2.8.1             # via blackfynn
-six==1.12.0               # via protobuf, python-dateutil, tenacity, websocket-client
+six==1.12.0
 sqlalchemy==1.3.3
 tenacity==5.0.4
 trafaret-config==2.0.2
@@ -48,5 +51,8 @@ trafaret==1.2.0
 typing-extensions==3.7.2  # via aiohttp
 urllib3==1.24.3
 websocket-client==0.56.0  # via blackfynn
-wrapt==1.11.1             # via deprecated
+wrapt==1.11.1             # via aiobotocore, deprecated
 yarl==1.3.0               # via aiohttp
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools==41.0.1        # via protobuf
diff --git a/services/storage/requirements/_test.txt b/services/storage/requirements/_test.txt
index a12a497adc5..ededf0a18d9 100644
--- a/services/storage/requirements/_test.txt
+++ b/services/storage/requirements/_test.txt
@@ -4,17 +4,20 @@
 #
 #    pip-compile --output-file=_test.txt _test.in
 #
+aioboto3==6.4.1
+aiobotocore[boto3]==0.10.2
 aiofiles==0.4.0
 aiohttp==3.5.4
 aiopg[sa]==0.15.0
 apipkg==1.5
 astroid==2.2.5            # via pylint
+async-generator==1.10
 async-timeout==3.0.1
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0
 blackfynn==2.11.1
-boto3==1.9.153
-botocore==1.12.153
+boto3==1.9.91
+botocore==1.12.91
 certifi==2019.3.9
 chardet==3.0.4
 codecov==2.0.15
@@ -71,3 +74,6 @@ wcwidth==0.1.7            # via pytest
 websocket-client==0.56.0
 wrapt==1.11.1
 yarl==1.3.0
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools==41.0.1        # via protobuf, pytest
diff --git a/services/storage/requirements/ci.txt b/services/storage/requirements/ci.txt
index a3eaeebdd85..57e41ff2850 100644
--- a/services/storage/requirements/ci.txt
+++ b/services/storage/requirements/ci.txt
@@ -11,6 +11,7 @@
 
 # installs this repo's packages
 ../../packages/s3wrapper/
+../../packages/postgres-database/
 ../../packages/simcore-sdk/
 ../../packages/service-library/
 
diff --git a/services/storage/requirements/dev.txt b/services/storage/requirements/dev.txt
index 38dc54c399b..6c5e1bd9203 100644
--- a/services/storage/requirements/dev.txt
+++ b/services/storage/requirements/dev.txt
@@ -11,6 +11,7 @@
 
 # installs this repo's packages
 -e ../../packages/s3wrapper/
+-e ../../packages/postgres-database/
 -e ../../packages/simcore-sdk/
 -e ../../packages/service-library
 
diff --git a/services/storage/requirements/prod.txt b/services/storage/requirements/prod.txt
index 42b2cd08ea9..6457146ed07 100644
--- a/services/storage/requirements/prod.txt
+++ b/services/storage/requirements/prod.txt
@@ -11,6 +11,7 @@
 
 # installs this repo's packages
 ../../packages/s3wrapper/
+../../packages/postgres-database/
 ../../packages/simcore-sdk/
 ../../packages/service-library
 
diff --git a/services/storage/requirements/python-with-pandas_89f709.txt b/services/storage/requirements/python-with-pandas_89f709.txt
new file mode 100644
index 00000000000..9adaccff774
--- /dev/null
+++ b/services/storage/requirements/python-with-pandas_89f709.txt
@@ -0,0 +1,8 @@
+#
+# Taken from https://github.com/ITISFoundation/dockerfiles/blob/89f70938b66c0e4c1966c9a62da7a6dc89778f45/python-with-pandas/3.6-alpine/requirements.txt
+#
+numpy==1.16.3
+pandas==0.24.2
+python-dateutil==2.8.0    # via pandas
+pytz==2019.1              # via pandas
+six==1.12.0               # via python-dateutil
diff --git a/services/storage/setup.py b/services/storage/setup.py
index 8f05193ad76..be5f9090c40 100644
--- a/services/storage/setup.py
+++ b/services/storage/setup.py
@@ -16,6 +16,7 @@ def read_reqs( reqs_path: Path):
 
 install_requirements = read_reqs( here / "requirements" / "_base.txt" ) + [
     "s3wrapper==0.1.0",
+    "simcore-postgres-database==0.1.0",
     "simcore-sdk==0.1.0",
     "simcore-service-library==0.1.0"
 ]
diff --git a/services/storage/src/simcore_service_storage/config_schema.py b/services/storage/src/simcore_service_storage/config_schema.py
index 4f3fd12db88..5f518b1650e 100644
--- a/services/storage/src/simcore_service_storage/config_schema.py
+++ b/services/storage/src/simcore_service_storage/config_schema.py
@@ -9,7 +9,6 @@
     "port": T.Int(),
     "log_level": T.Enum("DEBUG", "WARNING", "INFO", "ERROR", "CRITICAL", "FATAL", "NOTSET"),
     "testing": T.Bool(),
-    "python2": T.String(),
     T.Key("max_workers", default=8, optional=True) : T.Int(),
     T.Key("test_datcore", optional=True): T.Dict({
         "token_key": T.String(),
diff --git a/services/storage/src/simcore_service_storage/data/docker-dev-config.yaml b/services/storage/src/simcore_service_storage/data/docker-dev-config.yaml
index 5dfc18cc8c6..8f4ddb239f8 100644
--- a/services/storage/src/simcore_service_storage/data/docker-dev-config.yaml
+++ b/services/storage/src/simcore_service_storage/data/docker-dev-config.yaml
@@ -3,9 +3,8 @@ main:
   host: 0.0.0.0
   log_level: INFO
   port: 8080
-  testing: True
+  testing: False
   max_workers: 8
-  python2: /usr/bin/python2
   test_datcore:
      token_key: ${BF_API_KEY}
      token_secret: ${BF_API_SECRET}
diff --git a/services/storage/src/simcore_service_storage/data/docker-prod-config.yaml b/services/storage/src/simcore_service_storage/data/docker-prod-config.yaml
index 7339e702984..ed77ca0897f 100644
--- a/services/storage/src/simcore_service_storage/data/docker-prod-config.yaml
+++ b/services/storage/src/simcore_service_storage/data/docker-prod-config.yaml
@@ -3,8 +3,7 @@ main:
   host: 0.0.0.0
   log_level: INFO
   port: 8080
-  testing: True
-  python2: /usr/bin/python2
+  testing: False
   test_datcore:
      token_key: ${BF_API_KEY}
      token_secret: ${BF_API_SECRET}
diff --git a/services/storage/src/simcore_service_storage/data/host-dev-config.yaml b/services/storage/src/simcore_service_storage/data/host-dev-config.yaml
index ad93bc1134a..690475f584c 100644
--- a/services/storage/src/simcore_service_storage/data/host-dev-config.yaml
+++ b/services/storage/src/simcore_service_storage/data/host-dev-config.yaml
@@ -4,8 +4,7 @@ main:
   host: 127.0.0.1
   log_level: INFO
   port: 8080
-  testing: true
-  python2: ${VENV2}/bin/python2
+  testing: False
   test_datcore:
      token_key: ${BF_API_KEY}
      token_secret: ${BF_API_SECRET}
diff --git a/services/storage/src/simcore_service_storage/datcore.py b/services/storage/src/simcore_service_storage/datcore.py
index 58e34cbdb06..a9785cb3bc4 100644
--- a/services/storage/src/simcore_service_storage/datcore.py
+++ b/services/storage/src/simcore_service_storage/datcore.py
@@ -6,8 +6,14 @@
 # pylint: skip-file
 import os
 import urllib
+from pathlib import Path
+from typing import List
 
 from blackfynn import Blackfynn
+from blackfynn.models import BaseCollection, Collection, DataPackage
+
+from simcore_service_storage.models import FileMetaData
+from simcore_service_storage.settings import DATCORE_ID, DATCORE_STR
 
 #FIXME: W0611:Unused IOAPI imported from blackfynn.api.transfers
 #from blackfynn.api.transfers import IOAPI
@@ -16,16 +22,29 @@
 #FIXME: W0212:Access to a protected member _api of a client class
 # pylint: disable=W0212
 
+def _get_collection_id(folder: BaseCollection, _collections: List[str], collection_id: str)-> str:
+    if not len(_collections):
+        return collection_id
+
+    current = _collections.pop(0)
+    found = False
+    for item in folder:
+        if isinstance(item, Collection) and item.name == current:
+            collection_id = item.id
+            folder = item
+            found = True
+            break
+
+    if found:
+        return _get_collection_id(folder, _collections, collection_id)
+
+    return ""
+
 
 class DatcoreClient(object):
     def __init__(self, api_token=None, api_secret=None, host=None, streaming_host=None):
         self.client = Blackfynn(profile=None, api_token=api_token, api_secret=api_secret,
                                 host=host, streaming_host=streaming_host)
-    def _context(self):
-        """
-        Returns current organizational context
-        """
-        return self.client.context
 
     def profile(self):
         """
@@ -33,28 +52,68 @@ def profile(self):
         """
         return self.client.profile
 
-    def organization(self):
-        """
-        Returns organization name
-        """
-        return self.client.context.name
+    def _collection_from_destination(self, destination: str):
+        destination_path = Path(destination)
+        parts = destination_path.parts
 
-    def list_datasets(self):
-        ds = []
-        for item in self.client.datasets():
-            ds.append(item.name)
+        dataset_name = parts[0]
+        dataset = self.get_dataset(dataset_name)
+        if dataset is None:
+            return None, None
 
-        return ds
+        collection_id = dataset.id
+        collection = dataset
+        collections = []
+        if len(parts) > 1:
+            object_path = Path(*parts[1:])
+            collections = list(object_path.parts)
+            collection_id = ""
+            collection_id = _get_collection_id(dataset, collections, collection_id)
+            collection = self.client.get(collection_id)
+
+        return collection, collection_id
 
 
-    def list_files(self):
+    def list_files_recursively(self, dataset_filter: str=""):
         files = []
-        for ds in self.client.datasets():
-            for item in ds:
-                files.append(os.path.join(ds.name, item.name))
+
+        for dataset in self.client.datasets():
+            if not dataset_filter or dataset_filter in dataset.name:
+                self.list_dataset_files_recursively(files, dataset, Path(dataset.name))
 
         return files
 
+    def list_dataset_files_recursively(self, files: List[FileMetaData], base: BaseCollection, current_root: Path):
+        for item in base:
+            if isinstance(item, Collection):
+                _current_root = current_root  / Path(item.name)
+                self.list_dataset_files_recursively(files, item, _current_root)
+            else:
+                parts = current_root.parts
+                bucket_name = parts[0]
+                file_name = item.name
+                file_size = 0
+                # lets assume we have only one file
+                if item.files:
+                    file_name = Path(item.files[0].as_dict()['content']['s3key']).name
+                    file_size = item.files[0].as_dict()['content']['size']
+                # if this is in the root directory, the object_name is the filename only
+                if len(parts) > 1:
+                    object_name = str(Path(*list(parts)[1:])/ Path(file_name))
+                else:
+                    object_name = str(Path(file_name))
+
+                file_uuid = str(Path(bucket_name) / Path(object_name))
+                file_id = item.id
+                created_at = item.created_at
+                last_modified = item.updated_at
+                fmd = FileMetaData(bucket_name=bucket_name, file_name=file_name, object_name=object_name,
+                        location=DATCORE_STR, location_id=DATCORE_ID, file_uuid=file_uuid, file_id=file_id,
+                        raw_file_path=file_uuid, display_file_path=file_uuid, created_at=created_at,
+                        last_modified=last_modified, file_size=file_size)
+                files.append(fmd)
+
+
     def create_dataset(self, ds_name, force_delete=False):
         """
         Creates a new dataset for the current user and returns it. Returns existing one
@@ -123,9 +182,9 @@ def exists_dataset(self, ds_name):
         ds = self.get_dataset(ds_name)
         return ds is not None
 
-    def upload_file(self, dataset, filepath, meta_data = None):
+    def upload_file(self, destination: str, filepath: str, meta_data = None):
         """
-        Uploads a file to a given dataset given its filepath on the host. Optionally
+        Uploads a file to a given dataset/collection given its filepath on the host. Optionally
         adds some meta data
 
         Args:
@@ -135,23 +194,27 @@ def upload_file(self, dataset, filepath, meta_data = None):
 
         Note:
             Blackfynn postprocesses data based on filendings. If it can do that
-            the filenames on the server change. This makes it difficult to retrieve
-            them back by name (see get_sources below). Also, for now we assume we have
-            only single file data.
+            the filenames on the server change.
         """
+        # parse the destination and try to find the package_id to upload to
+        collection, collection_id = self._collection_from_destination(destination)
 
-
+        if collection is None:
+            return False
 
         files = [filepath]
         # pylint: disable = E1101
-        self.client._api.io.upload_files(dataset, files, display_progress=True)
-        dataset.update()
+        self.client._api.io.upload_files(collection, files, display_progress=True)
+        collection.update()
 
         if meta_data is not None:
-            filename = os.path.basename(filepath)
-            package = self.get_package(dataset, filename)
-            if package is not None:
-                self._update_meta_data(package, meta_data)
+            for f in files:
+                filename = os.path.basename(f)
+                package = self.get_package(collection, filename)
+                if package is not None:
+                    self._update_meta_data(package, meta_data)
+
+        return True
 
     def _update_meta_data(self, package, meta_data):
         """
@@ -186,24 +249,24 @@ def download_file(self, source, filename, destination_path):
             return True
         return False
 
-    def download_link(self, source, filename):
+    def download_link(self, destination, filename):
         """
-            returns presigned url for download, source is a dataset
+            returns presigned url for download, destination is a dataset or collection
         """
-
+        collection, collection_id = self._collection_from_destination(destination)
         # pylint: disable = E1101
-
-        for item in source:
-            if item.name == filename:
-                file_desc = self.client._api.packages.get_sources(item.id)[0]
-                url = self.client._api.packages.get_presigned_url_for_file(item.id, file_desc.id)
-                return url
+        for item in collection:
+            if isinstance(item, DataPackage):
+                if Path(item.files[0].as_dict()['content']['s3key']).name == filename:
+                    file_desc = self.client._api.packages.get_sources(item.id)[0]
+                    url = self.client._api.packages.get_presigned_url_for_file(item.id, file_desc.id)
+                    return url
 
         return ""
 
-    def exists_file(self, source, filename):
+    def get_package(self, source, filename):
         """
-        Checks if file exists in source
+        Returns package from source by name if exists
 
         Args:
             source (dataset/collection): The dataset or collection to donwload from
@@ -213,49 +276,56 @@ def exists_file(self, source, filename):
         source.update()
         for item in source:
             if item.name == filename:
-                return True
+                return item
 
-        return False
+        return None
 
-    def get_package(self, source, filename):
+    def delete_file(self, destination, filename):
         """
-        Returns package from source by name if exists
+        Deletes file by name from destination by name
 
         Args:
-            source (dataset/collection): The dataset or collection to donwload from
+            destination (dataset/collection): The dataset or collection to delete from
             filename (str): Name of the file
         """
+        collection, collection_id = self._collection_from_destination(destination)
 
-        source.update()
-        for item in source:
-            if item.name == filename:
-                return item
+        if collection is None:
+            return False
 
-        return None
+        collection.update()
+        for item in collection:
+            if isinstance(item, DataPackage):
+                if Path(item.files[0].as_dict()['content']['s3key']).name == filename:
+                    self.client.delete(item)
+                    return True
 
-    def delete_file(self, source, filename):
+        return False
+
+    def delete_file_by_id(self, id: str):
         """
-        Deletes file by name from source by name
+        Deletes file by id
 
         Args:
-            source (dataset/collection): The dataset or collection to donwload from
-            filename (str): Name of the file
+            datcore id for the file
         """
-        source.update()
-        for item in source:
-            if item.name == filename:
-                self.client.delete(item)
+        self.client.delete(id)
 
-    def delete_files(self, source):
+    def delete_files(self, destination):
         """
-        Deletes all files in source
+        Deletes all files in destination
 
         Args:
-            source (dataset/collection): The dataset or collection to donwload from
+            destination (dataset/collection): The dataset or collection to delete
         """
 
-        source.update()
-        for item in source:
+        collection, collection_id = self._collection_from_destination(destination)
+
+        if collection is None:
+            return False
+
+        collection.update()
+        for item in collection:
             self.client.delete(item)
 
     def update_meta_data(self, dataset, filename, meta_data):
diff --git a/services/storage/src/simcore_service_storage/datcore_wrapper.py b/services/storage/src/simcore_service_storage/datcore_wrapper.py
index f51053bb96a..89b3af5f92d 100644
--- a/services/storage/src/simcore_service_storage/datcore_wrapper.py
+++ b/services/storage/src/simcore_service_storage/datcore_wrapper.py
@@ -1,57 +1,26 @@
 import asyncio
 import json
 import logging
-import os
 from concurrent.futures import ThreadPoolExecutor
-from functools import partial, wraps
+from functools import wraps
 from pathlib import Path
-from textwrap import dedent
 from typing import List
 
 import attr
-import execnet
 
+from .datcore import DatcoreClient
 from .models import FileMetaData
-from .settings import DATCORE_ID, DATCORE_STR
 
 FileMetaDataVec = List[FileMetaData]
 
 CURRENT_DIR = Path(__file__).resolve().parent
 logger = logging.getLogger(__name__)
 
+#FIXME: W0703: Catching too general exception Exception (broad-except)
+# pylint: disable=W0703
 
-#TODO: Use async callbacks for retreival of progress and pass via rabbit to server
-
-def call_python_2(module, function, args, python_exec: Path):
-    """ calls a module::function from python2 with the arguments list
-    """
-    # pylint: disable=E1101
-    # "E1101:Module 'execnet' has no 'makegateway' member",
-    gw = execnet.makegateway("popen//python=%s" % python_exec)
-    channel = gw.remote_exec("""
-        from %s import %s as the_function
-        channel.send(the_function(*channel.receive()))
-    """ % (module, function))
-    channel.send(args)
-    return channel.receive()
-
-def call_python_2_script(script: str, python_exec: Path):
-    """ calls an arbitrary script with remote interpreter
-
-        MaG: I wonder how secure it is to pass the tokens that way...
-
-    """
-    prefix = "import sys\n" \
-             "sys.path.append('%s')\n" % CURRENT_DIR
-    script = prefix + dedent(script)
-
-    # pylint: disable=E1101
-    # for now keep the Pool mechanims for asynchronizity but switch to python3
-    python_exec = "python3"
-    gw = execnet.makegateway("popen//python=%s" % python_exec)
-    channel = gw.remote_exec(script)
-    return channel.receive()
 
+#TODO: Use async callbacks for retreival of progress and pass via rabbit to server
 def make_async(func):
     @wraps(func)
     async def async_wrapper(self, *args, **kwargs):
@@ -65,213 +34,95 @@ async def async_wrapper(self, *args, **kwargs):
 class DatcoreWrapper:
     """ Wrapper to call the python2 api from datcore
 
-        Assumes that python 2 is installed in a virtual env
+        This can go away now. Next cleanup round...
 
     """
     # pylint: disable=R0913
     # Too many arguments
-    def __init__(self, api_token: str, api_secret: str, python2_exec: Path, loop: object, pool: ThreadPoolExecutor):
+    def __init__(self, api_token: str, api_secret: str, loop: object, pool: ThreadPoolExecutor):
         self.api_token = api_token
         self.api_secret = api_secret
 
         self.loop = loop
         self.pool = pool
-        #TODO: guarantee that python2_exec is a valid
-        self._py2_call = partial(call_python_2_script, python_exec=python2_exec)
 
+        self.d_client =  DatcoreClient(api_token=api_token, api_secret=api_secret,
+                host='https://api.blackfynn.io')
 
     @make_async
-    def list_files(self, regex = "", sortby = "")->FileMetaDataVec: #pylint: disable=W0613
-        # FIXME: W0613:Unused argument 'regex', sortby!!!
-        script = """
-            from datcore import DatcoreClient
-            try:
-                api_token = "%s"
-                api_secret = "%s"
-
-                d_client = DatcoreClient(api_token=api_token, api_secret=api_secret,
-                    host='https://api.blackfynn.io')
-
-                files = d_client.list_files()
-
-                channel.send(files)
-            except Exception as e:
-                channel.send([])
-
-            """%(self.api_token, self.api_secret)
+    def list_files_recursively(self, regex = "", sortby = "")->FileMetaDataVec: #pylint: disable=W0613
+        files = []
+        try:
+            files = self.d_client.list_files_recursively()
+        except Exception as e:
+            logger.exception("Error listing datcore files %s", e)
 
-
-        files = self._py2_call(script)
-
-        data = []
-        for f in files:
-            # extract bucket name, object name and filename
-            parts = f.strip("/").split("/")
-            file_name = parts[-1]
-            if len(parts) > 1:
-                bucket_name = parts[0]
-                object_name = "/".join(parts[1:])
-            else:
-                bucket_name = ""
-                object_name = file_name
-
-            file_uuid = os.path.join(bucket_name, object_name)
-            # at the moment, no metadata there
-            fmd = FileMetaData(bucket_name=bucket_name, file_name=file_name, object_name=object_name,
-             location=DATCORE_STR, location_id=DATCORE_ID, file_uuid=file_uuid)
-            data.append(fmd)
-
-        return data
+        return files
 
     @make_async
-    def delete_file(self, dataset: str, filename: str):
+    def delete_file(self, destination: str, filename: str):
         # the object can be found in dataset/filename <-> bucket_name/object_name
-        script = """
-            from datcore import DatcoreClient
-
-            api_token = "{0}"
-            api_secret = "{1}"
-            try:
-                d_client = DatcoreClient(api_token=api_token, api_secret=api_secret,
-                    host='https://api.blackfynn.io')
-
-                ds = d_client.get_dataset("{2}")
-                if ds is not None:
-                    d_client.delete_file(ds, "{3}")
-
-                channel.send(True)
-
-            except Exception as e:
-                channel.send(False)
-            """.format(self.api_token, self.api_secret, dataset, filename)
-
-        return self._py2_call(script)
+        try:
+            self.d_client.delete_file(destination, filename)
+        except Exception as e:
+            logger.exception("Error deleting datcore file %s", e)
 
     @make_async
-    def download_link(self, dataset: str, filename: str):
-        script = """
-            from datcore import DatcoreClient
-
-            api_token = "{0}"
-            api_secret = "{1}"
-            try:
-                d_client = DatcoreClient(api_token=api_token, api_secret=api_secret,
-                    host='https://api.blackfynn.io')
-
-                ds = d_client.get_dataset("{2}")
-                url = ""
-                if ds is not None:
-                    url = d_client.download_link(ds, "{3}")
-
-                channel.send(url)
+    def download_link(self, destination: str, filename: str):
+        url = ""
+        try:
+            url = self.d_client.download_link(destination, filename)
+        except Exception as e:
+            logger.exception("Error getting datcore download link %s", e)
 
-            except Exception as e:
-                channel.send("")
-            """.format(self.api_token, self.api_secret, dataset, filename)
+        return url
 
-        return self._py2_call(script)
 
     @make_async
     def create_test_dataset(self, dataset):
-        script = """
-            from datcore import DatcoreClient
-
-            api_token = "{0}"
-            api_secret = "{1}"
-            try:
-                d_client = DatcoreClient(api_token=api_token, api_secret=api_secret,
-                    host='https://api.blackfynn.io')
-
-                ds = d_client.get_dataset("{2}")
-                if ds is not None:
-                    d_client.delete_files(ds)
-                else:
-                    d_client.create_dataset("{2}")
-
-                channel.send(None)
-            except Exception as e:
-                channel.send(False)
-            """.format(self.api_token, self.api_secret, dataset)
+        try:
+            ds = self.d_client.get_dataset(dataset)
+            if ds is not None:
+                self.d_client.delete_files(dataset)
+            else:
+                self.d_client.create_dataset(dataset)
+        except Exception as e:
+            logger.exception("Error creating test dataset %s", e)
 
-        return self._py2_call(script)
 
     @make_async
     def delete_test_dataset(self, dataset):
-        script = """
-            from datcore import DatcoreClient
-
-            api_token = "{0}"
-            api_secret = "{1}"
-            try:
-                d_client = DatcoreClient(api_token=api_token, api_secret=api_secret,
-                    host='https://api.blackfynn.io')
-
-                ds = d_client.get_dataset("{2}")
-                if ds is not None:
-                    d_client.delete_files(ds)
-
-                channel.send(True)
-            except Exception as e:
-                channel.send(False)
-
-            """.format(self.api_token, self.api_secret, dataset)
-
-        return self._py2_call(script)
+        try:
+            ds = self.d_client.get_dataset(dataset)
+            if ds is not None:
+                self.d_client.delete_files(dataset)
+        except Exception as e:
+            logger.exception("Error deleting test dataset %s", e)
 
     @make_async
-    def upload_file(self, dataset: str, local_path: str, meta_data: FileMetaData = None):
+    def upload_file(self, destination: str, local_path: str, meta_data: FileMetaData = None):
         json_meta = ""
         if meta_data:
             json_meta = json.dumps(attr.asdict(meta_data))
-
-        script = """
-            from datcore import DatcoreClient
-            import json
-
-            api_token = "{0}"
-            api_secret = "{1}"
-
-            try:
-                d_client = DatcoreClient(api_token=api_token, api_secret=api_secret,
-                    host='https://api.blackfynn.io')
-
-                ds = d_client.get_dataset("{2}")
-
-                str_meta = '{4}'
-                if str_meta :
-                    meta_data = json.loads(str_meta)
-                    d_client.upload_file(ds, "{3}", meta_data)
-                else:
-                    d_client.upload_file(ds, "{3}")
-
-                channel.send(True)
-
-            except Exception as e:
-                channel.send(False)
-
-            """.format(self.api_token, self.api_secret, dataset, local_path, json_meta)
-
-        return self._py2_call(script)
+        try:
+            str_meta = json_meta
+            result = False
+            if str_meta :
+                meta_data = json.loads(str_meta)
+                result = self.d_client.upload_file(destination, local_path, meta_data)
+            else:
+                result = self.d_client.upload_file(destination, local_path)
+            return result
+        except Exception as e:
+            logger.exception("Error uploading file to datcore %s", e)
+            return False
 
     @make_async
     def ping(self):
-        script = """
-            from datcore import DatcoreClient
-
-            api_token = "{0}"
-            api_secret = "{1}"
-
-            try:
-                d_client = DatcoreClient(api_token=api_token, api_secret=api_secret,
-                    host='https://api.blackfynn.io')
-
-                profile = d_client.profile()
-                ok = profile is not None
-                channel.send(ok)
-
-            except Exception as e:
-                channel.send(False)
-
-            """.format(self.api_token, self.api_secret)
-
-        return self._py2_call(script)
+        try:
+            profile = self.d_client.profile()
+            ok = profile is not None
+            return ok
+        except Exception as e:
+            logger.exception("Error pinging %s", e)
+            return False
diff --git a/services/storage/src/simcore_service_storage/db_tokens.py b/services/storage/src/simcore_service_storage/db_tokens.py
index 2880d66e057..b3f31f8f2f9 100644
--- a/services/storage/src/simcore_service_storage/db_tokens.py
+++ b/services/storage/src/simcore_service_storage/db_tokens.py
@@ -7,6 +7,7 @@
 from psycopg2 import Error as DbApiError
 from tenacity import before_sleep_log, retry, stop_after_attempt, wait_random
 
+from .models import tokens
 from .settings import APP_CONFIG_KEY, APP_DB_ENGINE_KEY
 
 log = logging.getLogger(__name__)
@@ -14,16 +15,6 @@
 RETRY_WAIT_SECS = {"min":1, "max":3}
 RETRY_COUNT = 3
 
-# FIXME: this is a temporary solution DO NOT USE. This table needs to be in sync
-# with services/web/server/src/simcore_service_webserver/db_models.py
-_metadata = sa.MetaData()
-_tokens = sa.Table("tokens", _metadata,
-    sa.Column("token_id", sa.BigInteger, nullable=False, primary_key=True),
-    sa.Column("user_id", sa.BigInteger, nullable=False),
-    sa.Column("token_service", sa.String, nullable=False),
-    sa.Column("token_data", sa.JSON, nullable=False),
-)
-
 
 @retry(wait=wait_random(**RETRY_WAIT_SECS),
        stop=stop_after_attempt(RETRY_COUNT),
@@ -31,7 +22,7 @@
        reraise=True)
 async def _get_tokens_from_db(engine, userid):
     async with engine.acquire() as conn:
-        stmt = sa.select([_tokens, ]).where(_tokens.c.user_id == userid)
+        stmt = sa.select([tokens, ]).where(tokens.c.user_id == userid)
         result = await conn.execute(stmt)
         row = await result.first()
         data = dict(row) if row else {}
diff --git a/services/storage/src/simcore_service_storage/dsm.py b/services/storage/src/simcore_service_storage/dsm.py
index 8bcf25b55bb..b9a284d7a8b 100644
--- a/services/storage/src/simcore_service_storage/dsm.py
+++ b/services/storage/src/simcore_service_storage/dsm.py
@@ -1,3 +1,4 @@
+import asyncio
 import logging
 import os
 import re
@@ -6,12 +7,12 @@
 from concurrent.futures import ThreadPoolExecutor
 from operator import itemgetter
 from pathlib import Path
-from typing import List, Tuple, Dict
+from typing import Dict, List, Tuple
 
+import aiobotocore
 import aiofiles
 import aiohttp
 import attr
-import asyncio
 import sqlalchemy as sa
 from aiohttp import web
 from aiopg.sa import Engine
@@ -19,16 +20,16 @@
 from yarl import URL
 
 from s3wrapper.s3_client import S3Client
+from servicelib.aiopg_utils import DBAPIError
 
 from .datcore_wrapper import DatcoreWrapper
 from .models import (FileMetaData, _location_from_id, _parse_datcore,
-                     file_meta_data)
+                     file_meta_data, projects, user_to_projects)
+from .s3 import get_config_s3
 from .settings import (APP_CONFIG_KEY, APP_DB_ENGINE_KEY, APP_DSM_KEY,
                        APP_S3_KEY, DATCORE_ID, DATCORE_STR, SIMCORE_S3_ID,
                        SIMCORE_S3_STR)
 
-from .s3 import get_config_s3
-
 #pylint: disable=W0212
 #FIXME: W0212:Access to a protected member _result_proxy of a client class
 
@@ -42,10 +43,8 @@
 
 async def _setup_dsm(app: web.Application):
     cfg = app[APP_CONFIG_KEY]
-    main_cfg = cfg["main"]
 
     main_cfg = cfg["main"]
-    python27_exec = Path(main_cfg["python2"])
 
     engine = app.get(APP_DB_ENGINE_KEY)
     loop = asyncio.get_event_loop()
@@ -57,7 +56,8 @@ async def _setup_dsm(app: web.Application):
     s3_cfg = get_config_s3(app)
     bucket_name = s3_cfg["bucket_name"]
 
-    dsm = DataStorageManager(s3_client, python27_exec, engine, loop, pool, bucket_name)
+    testing = main_cfg["testing"]
+    dsm = DataStorageManager(s3_client, engine, loop, pool, bucket_name, not testing)
 
     app[APP_DSM_KEY] = dsm
 
@@ -108,11 +108,12 @@ class DataStorageManager:
             https://docs.minio.io/docs/minio-bucket-notification-guide.html
     """
     s3_client: S3Client
-    python27_exec: Path
     engine: Engine
     loop: object
     pool: ThreadPoolExecutor
     simcore_bucket_name: str
+    has_project_db: bool
+
     datcore_tokens: Dict[str, DatCoreApiToken]=attr.Factory(dict)
     # TODO: perhaps can be used a cache? add a lifetime?
 
@@ -155,13 +156,15 @@ async def ping_datcore(self, user_id: str) -> bool:
         api_token, api_secret = self._get_datcore_tokens(user_id)
         logger.info("token: %s, secret %s", api_token, api_secret)
         if api_token:
-            dcw = DatcoreWrapper(api_token, api_secret, self.python27_exec, self.loop, self.pool)
+            dcw = DatcoreWrapper(api_token, api_secret, self.loop, self.pool)
             profile = await dcw.ping()
             if profile:
                 return True
         return False
 
     # pylint: disable=too-many-arguments
+    # pylint: disable=too-many-branches
+    # pylint: disable=too-many-statements
     async def list_files(self, user_id: str, location: str, uuid_filter: str ="", regex: str="", sortby: str="") -> FileMetaDataVec:
         """ Returns a list of file paths
 
@@ -183,10 +186,81 @@ async def list_files(self, user_id: str, location: str, uuid_filter: str ="", re
                     result_dict = dict(zip(row._result_proxy.keys, row._row))
                     d = FileMetaData(**result_dict)
                     data.append(d)
+
+            if self.has_project_db:
+                uuid_name_dict = {}
+                # now parse the project to search for node/project names
+                try:
+                    async with self.engine.acquire() as conn:
+                        joint_table = user_to_projects.join(projects)
+                        query = sa.select([projects]).select_from(joint_table)\
+                            .where(user_to_projects.c.user_id == user_id)
+
+                        async for row in conn.execute(query):
+                            proj_data = {key:value for key,value in row.items()}
+
+                            uuid_name_dict[proj_data["uuid"]] = proj_data["name"]
+                            wb = proj_data['workbench']
+                            for node in wb.keys():
+                                uuid_name_dict[node] = wb[node]['label']
+                except DBAPIError as _err:
+                    logger.exception("Error querying database for project names")
+
+                if not uuid_name_dict:
+                    # there seems to be no project whatsoever for user_id
+                    return []
+
+                # only keep files from non-deleted project --> This needs to be fixed
+                clean_data = []
+                for d in data:
+                    if d.project_id in uuid_name_dict:
+                        d.project_name = uuid_name_dict[d.project_id]
+                        if d.node_id in uuid_name_dict:
+                            d.node_name = uuid_name_dict[d.node_id]
+
+                        d.raw_file_path = str(Path(d.project_id) / Path(d.node_id) / Path(d.file_name))
+                        d.display_file_path = d.raw_file_path
+                        if d.node_name and d.project_name:
+                            d.display_file_path = str(Path(d.project_name) / Path(d.node_name) / Path(d.file_name))
+                        async with self.engine.acquire() as conn:
+                            query = file_meta_data.update().\
+                            where(and_(file_meta_data.c.node_id==d.node_id,
+                                    file_meta_data.c.user_id==d.user_id)).\
+                            values(project_name=d.project_name,
+                                    node_name = d.node_name,
+                                    raw_file_path=d.raw_file_path,
+                                    display_file_path=d.display_file_path)
+                            await conn.execute(query)
+                            clean_data.append(d)
+
+                data = clean_data
+
+                # same as above, make sure file is physically present on s3
+                clean_data = []
+                # MaG: This is inefficient: Do this automatically when file is modified
+                _loop = asyncio.get_event_loop()
+                session = aiobotocore.get_session(loop=_loop)
+                async with session.create_client('s3', endpoint_url="http://"+self.s3_client.endpoint, aws_access_key_id=self.s3_client.access_key,
+                        aws_secret_access_key=self.s3_client.secret_key) as client:
+                    responses = await asyncio.gather(*[client.list_objects_v2(Bucket=d.bucket_name, Prefix=_d) for _d in [__d.object_name for __d in data]])
+                    for d, resp in zip(data, responses):
+                        if 'Contents' in resp:
+                            clean_data.append(d)
+                            d.file_size = resp['Contents'][0]['Size']
+                            d.last_modified = str(resp['Contents'][0]['LastModified'])
+                            async with self.engine.acquire() as conn:
+                                query = file_meta_data.update().\
+                                where(and_(file_meta_data.c.node_id==d.node_id,
+                                        file_meta_data.c.user_id==d.user_id)).\
+                                values(file_size=d.file_size,
+                                        last_modified=d.last_modified)
+                                await conn.execute(query)
+                data = clean_data
+
         elif location == DATCORE_STR:
             api_token, api_secret = self._get_datcore_tokens(user_id)
-            dcw = DatcoreWrapper(api_token, api_secret, self.python27_exec, self.loop, self.pool)
-            data = await dcw.list_files()
+            dcw = DatcoreWrapper(api_token, api_secret, self.loop, self.pool)
+            data = await dcw.list_files_recursively()
 
         if sortby:
             data = sorted(data, key=itemgetter(sortby))
@@ -226,8 +300,8 @@ async def list_file(self, user_id: str, location: str, file_uuid: str) -> FileMe
                     return d
         elif location == DATCORE_STR:
             api_token, api_secret = self._get_datcore_tokens(user_id)
-            _dcw = DatcoreWrapper(api_token, api_secret, self.python27_exec, self.loop, self.pool)
-            data = await _dcw.list_files
+            _dcw = DatcoreWrapper(api_token, api_secret, self.loop, self.pool)
+            data = [] #await _dcw.list_file(file_uuid)
             return data
 
     async def delete_file(self, user_id: str, location: str, file_uuid: str):
@@ -255,16 +329,15 @@ async def delete_file(self, user_id: str, location: str, file_uuid: str):
 
         elif location == DATCORE_STR:
             api_token, api_secret = self._get_datcore_tokens(user_id)
-            dcw = DatcoreWrapper(api_token, api_secret, self.python27_exec, self.loop, self.pool)
-            dataset, filename = _parse_datcore(file_uuid)
-#            return await dcw.delete_file(dataset=dataset, filename=filename)
-            return await dcw.delete_file(dataset, filename)
+            dcw = DatcoreWrapper(api_token, api_secret, self.loop, self.pool)
+            destination, filename = _parse_datcore(file_uuid)
+            return await dcw.delete_file(destination, filename)
 
-    async def upload_file_to_datcore(self, user_id: str, local_file_path: str, datcore_bucket: str, fmd: FileMetaData = None): # pylint: disable=W0613
+    async def upload_file_to_datcore(self, user_id: str, local_file_path: str, destination: str, fmd: FileMetaData = None): # pylint: disable=W0613
         # uploads a locally available file to dat core given the storage path, optionally attached some meta data
         api_token, api_secret = self._get_datcore_tokens(user_id)
-        dcw = DatcoreWrapper(api_token, api_secret, self.python27_exec, self.loop, self.pool)
-        await dcw.upload_file(datcore_bucket, local_file_path, fmd)
+        dcw = DatcoreWrapper(api_token, api_secret, self.loop, self.pool)
+        await dcw.upload_file(destination, local_file_path, fmd)
 
         # actually we have to query the master db
     async def upload_link(self, user_id: str, file_uuid: str):
@@ -289,10 +362,9 @@ async def copy_file(self, user_id: str, dest_location: str, dest_uuid: str, sour
                 # source is s3, get link and copy to datcore
                 bucket_name = self.simcore_bucket_name
                 object_name = source_uuid
-                datcore_bucket, file_path = _parse_datcore(dest_uuid)
-                filename = file_path.split("/")[-1]
+                destination, filename = _parse_datcore(dest_uuid)
                 tmp_dirpath = tempfile.mkdtemp()
-                local_file_path = os.path.join(tmp_dirpath,filename)
+                local_file_path = os.path.join(tmp_dirpath, filename)
                 url = self.s3_client.create_presigned_get_url(bucket_name, object_name)
                 async with aiohttp.ClientSession() as session:
                     async with session.get(url) as resp:
@@ -302,7 +374,7 @@ async def copy_file(self, user_id: str, dest_location: str, dest_uuid: str, sour
                             await f.close()
                             # and then upload
                             await self.upload_file_to_datcore(user_id=user_id, local_file_path=local_file_path,
-                                datcore_bucket=datcore_bucket)
+                                destination=destination)
                 shutil.rmtree(tmp_dirpath)
             elif dest_location == SIMCORE_S3_STR:
                 # source is s3, location is s3
@@ -350,7 +422,7 @@ async def download_link(self, user_id: str, location: str, file_uuid: str)->str:
             link = self.s3_client.create_presigned_get_url(bucket_name, object_name)
         elif location == DATCORE_STR:
             api_token, api_secret = self._get_datcore_tokens(user_id)
-            dcw = DatcoreWrapper(api_token, api_secret, self.python27_exec, self.loop, self.pool)
-            dataset, filename = _parse_datcore(file_uuid)
-            link = await dcw.download_link(dataset, filename)
+            dcw = DatcoreWrapper(api_token, api_secret, self.loop, self.pool)
+            destination, filename = _parse_datcore(file_uuid)
+            link = await dcw.download_link(destination, filename)
         return link
diff --git a/services/storage/src/simcore_service_storage/models.py b/services/storage/src/simcore_service_storage/models.py
index c3abcd7fbea..2c6f8b2b9bf 100644
--- a/services/storage/src/simcore_service_storage/models.py
+++ b/services/storage/src/simcore_service_storage/models.py
@@ -1,12 +1,17 @@
 """ Database models
 
 """
+import datetime
+import uuid
+from pathlib import Path
 from typing import Tuple
 
 import attr
-import sqlalchemy as sa
 
-from .settings import DATCORE_STR, SIMCORE_S3_ID, SIMCORE_S3_STR
+from simcore_postgres_database.storage_models import (file_meta_data, metadata,
+                                                      projects, tokens, user_to_projects, users)
+from simcore_service_storage.settings import (DATCORE_STR, SIMCORE_S3_ID,
+                                              SIMCORE_S3_STR)
 
 #FIXME: W0611:Unused UUID imported from sqlalchemy.dialects.postgresql
 #from sqlalchemy.dialects.postgresql import UUID
@@ -14,40 +19,15 @@
 #FIXME: R0902: Too many instance attributes (11/7) (too-many-instance-attributes)
 #pylint: disable=R0902
 
-metadata = sa.MetaData()
-
-# File meta data
-file_meta_data = sa.Table(
-    "file_meta_data", metadata,
-    sa.Column("file_uuid", sa.String, primary_key=True),
-    sa.Column("location_id", sa.String),
-    sa.Column("location", sa.String),
-    sa.Column("bucket_name", sa.String),
-    sa.Column("object_name", sa.String),
-    sa.Column("project_id", sa.String),
-    sa.Column("project_name", sa.String),
-    sa.Column("node_id", sa.String),
-    sa.Column("node_name", sa.String),
-    sa.Column("file_name", sa.String),
-    sa.Column("user_id", sa.String),
-    sa.Column("user_name", sa.String)
-#    sa.Column("state", sa.String())
-)
-
 
 def _parse_datcore(file_uuid: str) -> Tuple[str, str]:
-    # we should have 12/123123123/111.txt
-
-    object_name = "invalid"
-    dataset_name = "invalid"
-
-    parts = file_uuid.split("/")
+    # we should have 12/123123123/111.txt and return (12/123123123, 111.txt)
 
-    if len(parts) > 1:
-        dataset_name = parts[0]
-        object_name = "/".join(parts[1:])
+    file_path = Path(file_uuid)
+    destination = file_path.parent
+    file_name = file_path.name
 
-    return dataset_name, object_name
+    return destination, file_name
 
 def _locations():
     # TODO: so far this is hardcoded
@@ -81,7 +61,6 @@ def _location_from_str(location : str) ->str:
     return intstr
 
 
-@attr.s(auto_attribs=True)
 class FileMetaData:
     """ This is a proposal, probably no everything is needed.
         It is actually an overkill
@@ -102,23 +81,32 @@ class FileMetaData:
 
             bucket_name/project_id/node_id/file_name = /bucket_name/object_name
 
+        file_id         : unique uuid for the file
+
+            simcore.s3: uuid created upon insertion
+            datcore: datcore uuid
+
+        raw_file_path   : raw path to file
 
+            simcore.s3: proj_id/node_id/filename.ending
+            emailaddress/...
+            datcore: dataset/collection/filename.ending
+
+        display_file_path: human readlable  path to file
+
+            simcore.s3: proj_name/node_name/filename.ending
+            my_documents/...
+            datcore: dataset/collection/filename.ending
+
+        created_at          : time stamp
+        last_modified       : time stamp
+        file_size           : size in bytes
+
+        TODO:
         state:  on of OK, UPLOADING, DELETED
 
         """
-    file_uuid: str=""
-    location_id: str=""
-    location: str=""
-    bucket_name: str=""
-    object_name: str=""
-    project_id: str=""
-    project_name: str=""
-    node_id: str=""
-    node_name: str=""
-    file_name: str=""
-    user_id: str=""
-    user_name: str=""
-
+    #pylint: disable=attribute-defined-outside-init
     def simcore_from_uuid(self, file_uuid: str, bucket_name: str):
         parts = file_uuid.split("/")
         assert len(parts) == 3
@@ -131,3 +119,33 @@ def simcore_from_uuid(self, file_uuid: str, bucket_name: str):
             self.project_id = parts[0]
             self.node_id = parts[1]
             self.file_uuid = file_uuid
+            self.file_id = str(uuid.uuid4())
+            self.raw_file_path = self.file_uuid
+            self.display_file_path = str(Path("not") / Path("yet") / Path("implemented"))
+            self.created_at = str(datetime.datetime.now())
+            self.last_modified = self.created_at
+            self.file_size = -1
+
+    def __str__(self):
+        d = attr.asdict(self)
+        _str =""
+        for _d in d:
+            _str += "  {0: <25}: {1}\n".format(_d, str(d[_d]))
+        return _str
+
+
+attr.s(
+    these={c.name:attr.ib(default=None) for c in file_meta_data.c},
+    init=True,
+    kw_only=True)(FileMetaData)
+
+
+__all__ = [
+    "file_meta_data",
+    "tokens",
+    "metadata",
+    "FileMetaData",
+    "projects",
+    "users",
+    "user_to_projects"
+]
diff --git a/services/storage/tests/_test_rawdatcore.py b/services/storage/tests/_test_rawdatcore.py
new file mode 100644
index 00000000000..c4e4930319d
--- /dev/null
+++ b/services/storage/tests/_test_rawdatcore.py
@@ -0,0 +1,83 @@
+import os
+import typing
+from pathlib import Path
+
+from blackfynn import Blackfynn
+from blackfynn.models import Collection
+
+import utils
+from simcore_service_storage.datcore import DatcoreClient
+from simcore_service_storage.models import FileMetaData
+
+import tempfile
+
+dir_path = os.path.dirname(os.path.realpath(__file__))
+api_token = os.environ.get("BF_API_KEY")
+api_secret = os.environ.get("BF_API_SECRET")
+
+
+if utils.has_datcore_tokens():
+    client = DatcoreClient(api_token=api_token, api_secret=api_secret)
+    api_secret = os.environ.get("BF_API_SECRET", "none")
+    destination = str(Path("MaG/level1/level2"))
+    fd, path = tempfile.mkstemp()
+
+    try:
+        with os.fdopen(fd, 'w') as tmp:
+            # do stuff with temp file
+            tmp.write('stuff')
+
+        f = client.upload_file(destination, path)
+        f = client.delete_file(destination,Path(path).name)
+    finally:
+        os.remove(path)
+
+    aa
+    files =  []
+    if True:
+        dataset = client.get_dataset("mag")
+       # dataset.print_tree()
+        client.list_dataset_files_recursively(files, dataset, Path(dataset.name))
+    else:
+        files = client.list_files_recursively()
+
+    fd, path = tempfile.mkstemp()
+
+    try:
+        with os.fdopen(fd, 'w') as tmp:
+            # do stuff with temp file
+            tmp.write('stuff')
+
+
+        print(fd,path)
+        destination_path = Path("mag/level1/level2/bla.txt")
+        parts = destination_path.parts
+        assert len(parts) > 1
+        dataset_name = parts[0]
+        object_path = Path(*parts[1:])
+        file_name = object_path.name
+        collections = list(object_path.parent.parts)
+        destination = client.get_dataset(dataset_name)
+
+        # check if dataset exists
+        def _get_collection_id(folder, _collections, collection_id):
+            if not len(_collections):
+                return collection_id
+
+            current = _collections.pop(0)
+            for item in folder:
+                if isinstance(item, Collection) and item.name == current:
+                    collection_id = item.id
+                    folder = item
+                    break
+
+            return _get_collection_id(folder, _collections, collection_id)
+
+        my_id = ""
+        my_id =_get_collection_id(destination, collections, my_id)
+        package = client.client.get(my_id)
+        client.upload_file(package, path)
+        print(my_id)
+
+    finally:
+        os.remove(path)
diff --git a/services/storage/tests/conftest.py b/services/storage/tests/conftest.py
index e64bcc3afa9..49966ead860 100644
--- a/services/storage/tests/conftest.py
+++ b/services/storage/tests/conftest.py
@@ -6,6 +6,7 @@
 # pylint:disable=unsupported-assignment-operation
 
 import asyncio
+import datetime
 import os
 import subprocess
 import sys
@@ -25,8 +26,8 @@
 from simcore_service_storage.models import FileMetaData
 from simcore_service_storage.settings import (DATCORE_ID, DATCORE_STR,
                                               SIMCORE_S3_ID, SIMCORE_S3_STR)
-from utils import ACCESS_KEY, BUCKET_NAME, DATABASE, PASS, SECRET_KEY, USER_ID, USER
-
+from utils import (ACCESS_KEY, BUCKET_NAME, DATABASE, PASS, SECRET_KEY, USER,
+                   USER_ID)
 
 
 @pytest.fixture(scope='session')
@@ -54,17 +55,6 @@ def osparc_api_specs_dir(osparc_simcore_root_dir):
     assert dirpath.exists()
     return dirpath
 
-@pytest.fixture(scope='session')
-def python27_exec(osparc_simcore_root_dir, tmpdir_factory, here):
-    python27_exec = "python3"
-    return python27_exec
-
-
-@pytest.fixture(scope='session')
-def python27_path(python27_exec):
-    return Path(python27_exec).parent.parent
-    # Assumes already created with make .venv27
-
 
 @pytest.fixture(scope='session')
 def docker_compose_file(here):
@@ -189,6 +179,22 @@ def _create_files(count):
         return filepaths
     return _create_files
 
+@pytest.fixture(scope="function")
+def dsm_mockup_complete_db(postgres_service_url, s3_client):
+    utils.create_full_tables(url=postgres_service_url)
+    bucket_name = BUCKET_NAME
+    s3_client.create_bucket(bucket_name, delete_contents_if_exists=True)
+
+    f = utils.data_dir() /Path("outputController.dat")
+    object_name = "161b8782-b13e-5840-9ae2-e2250c231001/ad9bda7f-1dc5-5480-ab22-5fef4fc53eac/outputController.dat"
+    s3_client.upload_file(bucket_name, object_name, f)
+
+    f = utils.data_dir() /Path("notebooks.zip")
+    object_name = "161b8782-b13e-5840-9ae2-e2250c231001/a3941ea0-37c4-5c1d-a7b3-01b5fd8a80c8/notebooks.zip"
+    s3_client.upload_file(bucket_name, object_name, f)
+    yield
+    utils.drop_all_tables(url=postgres_service_url)
+
 
 @pytest.fixture(scope="function")
 def dsm_mockup_db(postgres_service_url, s3_client, mock_files_factory):
@@ -226,7 +232,10 @@ def dsm_mockup_db(postgres_service_url, s3_client, mock_files_factory):
         object_name = Path(str(project_id), str(
             node_id), str(counter)).as_posix()
         file_uuid = Path(object_name).as_posix()
-
+        raw_file_path = file_uuid
+        display_file_path = str(Path(project_name)/Path(node)/Path(file_name))
+        created_at = str(datetime.datetime.now())
+        file_size = 1234
         assert s3_client.upload_file(bucket_name, object_name, _file)
 
         d = {'file_uuid': file_uuid,
@@ -240,7 +249,13 @@ def dsm_mockup_db(postgres_service_url, s3_client, mock_files_factory):
              'node_name': node,
              'file_name': file_name,
              'user_id': str(user_id),
-             'user_name': user_name
+             'user_name': user_name,
+             "file_id": str(uuid.uuid4()),
+             "raw_file_path": file_uuid,
+             "display_file_path": display_file_path,
+             "created_at": created_at,
+             "last_modified": created_at,
+             "file_size": file_size,
              }
 
         counter = counter + 1
@@ -251,6 +266,7 @@ def dsm_mockup_db(postgres_service_url, s3_client, mock_files_factory):
         utils.insert_metadata(postgres_service_url,
                               data[object_name])
 
+
     total_count = 0
     for _obj in s3_client.list_objects_v2(bucket_name, recursive=True):
         total_count = total_count + 1
@@ -266,41 +282,33 @@ def dsm_mockup_db(postgres_service_url, s3_client, mock_files_factory):
 
 
 @pytest.fixture(scope="function")
-async def datcore_testbucket(loop, python27_exec, mock_files_factory):
+async def datcore_testbucket(loop, mock_files_factory):
     # TODO: what if I do not have an app to the the config from?
     api_token = os.environ.get("BF_API_KEY")
     api_secret = os.environ.get("BF_API_SECRET")
+
     if api_secret is None:
         yield "no_bucket"
         return
 
     pool = ThreadPoolExecutor(2)
-    dcw = DatcoreWrapper(api_token, api_secret, python27_exec, loop, pool)
+    dcw = DatcoreWrapper(api_token, api_secret, loop, pool)
 
     await dcw.create_test_dataset(BUCKET_NAME)
-
     tmp_files = mock_files_factory(2)
     for f in tmp_files:
         await dcw.upload_file(BUCKET_NAME, os.path.normpath(f))
 
-    ready = False
-    counter = 0
-    while not ready and counter < 5:
-        data = await dcw.list_files()
-        ready = len(data) == 2
-        await asyncio.sleep(10)
-        counter = counter + 1
-
     yield BUCKET_NAME
 
     await dcw.delete_test_dataset(BUCKET_NAME)
 
 
 @pytest.fixture(scope="function")
-def dsm_fixture(s3_client, python27_exec, postgres_engine, loop):
+def dsm_fixture(s3_client, postgres_engine, loop):
     pool = ThreadPoolExecutor(3)
     dsm_fixture = DataStorageManager(
-        s3_client, python27_exec, postgres_engine, loop, pool, BUCKET_NAME)
+        s3_client, postgres_engine, loop, pool, BUCKET_NAME, False)
 
     api_token = os.environ.get("BF_API_KEY", "none")
     api_secret = os.environ.get("BF_API_SECRET", "none")
diff --git a/services/storage/tests/data/file_meta_data.csv b/services/storage/tests/data/file_meta_data.csv
new file mode 100644
index 00000000000..e9a8fb3f582
--- /dev/null
+++ b/services/storage/tests/data/file_meta_data.csv
@@ -0,0 +1,3 @@
+file_uuid,location_id,location,bucket_name,object_name,project_id,project_name,node_id,node_name,file_name,user_id,user_name
+161b8782-b13e-5840-9ae2-e2250c231001/ad9bda7f-1dc5-5480-ab22-5fef4fc53eac/outputController.dat,0,simcore.s3,simcore-testing,161b8782-b13e-5840-9ae2-e2250c231001/ad9bda7f-1dc5-5480-ab22-5fef4fc53eac/outputController.dat,161b8782-b13e-5840-9ae2-e2250c231001,"",ad9bda7f-1dc5-5480-ab22-5fef4fc53eac,"",outputController.dat,21,""
+161b8782-b13e-5840-9ae2-e2250c231001/a3941ea0-37c4-5c1d-a7b3-01b5fd8a80c8/notebooks.zip,0,simcore.s3,simcore-testing,161b8782-b13e-5840-9ae2-e2250c231001/a3941ea0-37c4-5c1d-a7b3-01b5fd8a80c8/notebooks.zip,161b8782-b13e-5840-9ae2-e2250c231001,"",a3941ea0-37c4-5c1d-a7b3-01b5fd8a80c8,"",notebooks.zip,21,""
diff --git a/services/storage/tests/data/notebooks.zip b/services/storage/tests/data/notebooks.zip
new file mode 100644
index 00000000000..94ebaf90016
--- /dev/null
+++ b/services/storage/tests/data/notebooks.zip
@@ -0,0 +1,4 @@
+1
+2
+3
+4
diff --git a/services/storage/tests/data/outputController.dat b/services/storage/tests/data/outputController.dat
new file mode 100644
index 00000000000..94ebaf90016
--- /dev/null
+++ b/services/storage/tests/data/outputController.dat
@@ -0,0 +1,4 @@
+1
+2
+3
+4
diff --git a/services/storage/tests/data/projects.csv b/services/storage/tests/data/projects.csv
new file mode 100644
index 00000000000..c233e10d2a3
--- /dev/null
+++ b/services/storage/tests/data/projects.csv
@@ -0,0 +1,3 @@
+id,type,uuid,name,description,thumbnail,prj_owner,creation_date,last_change_date,workbench,published
+151,STANDARD,161b8782-b13e-5840-9ae2-e2250c231001,Kember use case,Kember Cordiac Model with PostPro Viewer,"",devops@itis.swiss,2019-06-27 11:42:03.168,2019-06-27 11:43:49.128,"{""ad9bda7f-1dc5-5480-ab22-5fef4fc53eac"": {""key"": ""simcore/services/comp/kember-cardiac-model"", ""version"": ""1.0.0"", ""label"": ""Kember cardiac model"", ""inputs"": {""dt"": 0.01, ""T"": 1000, ""forcing_factor"": 0}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {}, ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 50, ""y"": 100}}, ""a3941ea0-37c4-5c1d-a7b3-01b5fd8a80c8"": {""key"": ""simcore/services/dynamic/kember-viewer"", ""version"": ""2.9.0"", ""label"": ""kember-viewer"", ""inputs"": {""outputController"": {""nodeUuid"": ""ad9bda7f-1dc5-5480-ab22-5fef4fc53eac"", ""output"": ""out_1""}}, ""inputNodes"": [""ad9bda7f-1dc5-5480-ab22-5fef4fc53eac""], ""outputNode"": false, ""outputs"": {}, ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 300, ""y"": 100}}}",False
+150,STANDARD,69f16620-eeb3-520a-a3b8-08d78e36c70d,"UCDavis use cases: 1D, 2D",Colleen Clancy 1D and 2D use cases with a file picker and PostPro viewers,"",devops@itis.swiss,2019-06-27 11:36:29.605,2019-06-27 11:41:57.861,"{""78b56cc9-020b-5d89-bbf2-75922360d255"": {""key"": ""simcore/services/frontend/file-picker"", ""version"": ""1.0.0"", ""label"": ""File Picker 1&2 D"", ""inputs"": {}, ""inputNodes"": [], ""outputNode"": false, ""outputs"": {""outFile"": {""store"": 1, ""path"": ""Shared Data/initial_WTstates""}}, ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 177, ""y"": 282}}, ""eb9793d9-c80b-5b67-a41c-66a09bb2ee8f"": {""key"": ""simcore/services/frontend/nodes-group"", ""version"": ""1.0.0"", ""label"": ""CC 1D"", ""inputs"": {}, ""inputNodes"": [""78b56cc9-020b-5d89-bbf2-75922360d255""], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 477, ""y"": 145}}, ""8a0fbea5-0a2a-58e5-b27c-8d41d51726fb"": {""key"": ""simcore/services/frontend/nodes-group"", ""version"": ""1.0.0"", ""label"": ""CC 2D"", ""inputs"": {}, ""inputNodes"": [""78b56cc9-020b-5d89-bbf2-75922360d255"", ""eb9793d9-c80b-5b67-a41c-66a09bb2ee8f""], ""outputNode"": false, ""outputs"": {}, ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 645, ""y"": 370}}, ""83761fa1-4572-5660-b069-9f6f3ddda3d9"": {""key"": ""simcore/services/comp/ucdavis-1d-cardiac-model"", ""version"": ""1.0.0"", ""label"": ""DBP-Clancy-Rabbit-1-D solver"", ""inputs"": {""Na"": 0, ""Kr"": 0, ""BCL"": 10, ""NBeats"": 1, ""Ligand"": 0, ""cAMKII"": ""WT"", ""tw"": 5, ""tl"": 200, ""homogeneity"": ""heterogeneous"", ""in_10"": {""nodeUuid"": ""78b56cc9-020b-5d89-bbf2-75922360d255"", ""output"": ""outFile""}}, ""inputNodes"": [""78b56cc9-020b-5d89-bbf2-75922360d255""], ""outputNode"": true, ""outputs"": {}, ""parent"": ""eb9793d9-c80b-5b67-a41c-66a09bb2ee8f"", ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 100, ""y"": 350}}, ""e7e903ad-d6ad-522f-90de-8e4098bdf1e6"": {""key"": ""simcore/services/dynamic/cc-1d-viewer"", ""version"": ""2.8.0"", ""label"": ""cc-1d-viewer"", ""inputs"": {""ECGs"": {""nodeUuid"": ""83761fa1-4572-5660-b069-9f6f3ddda3d9"", ""output"": ""out_1""}, ""y_1D"": {""nodeUuid"": ""83761fa1-4572-5660-b069-9f6f3ddda3d9"", ""output"": ""out_3""}}, ""inputNodes"": [""83761fa1-4572-5660-b069-9f6f3ddda3d9""], ""outputNode"": false, ""outputs"": {}, ""parent"": ""eb9793d9-c80b-5b67-a41c-66a09bb2ee8f"", ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 300, ""y"": 200}}, ""8b632db9-d1ca-57b2-aed1-9cbe35fece93"": {""key"": ""simcore/services/comp/ucdavis-2d-cardiac-model"", ""version"": ""1.0.0"", ""label"": ""DBP-Clancy-Rabbit-2-D solver"", ""inputs"": {""Na"": 0, ""Kr"": 0, ""BCL"": 10, ""Ligand"": 0, ""cAMKII"": ""WT"", ""tw"": 5, ""tl"": 200, ""homogeneity"": ""heterogeneous""}, ""inputNodes"": [""78b56cc9-020b-5d89-bbf2-75922360d255"", ""eb9793d9-c80b-5b67-a41c-66a09bb2ee8f""], ""outputNode"": false, ""outputs"": {}, ""parent"": ""8a0fbea5-0a2a-58e5-b27c-8d41d51726fb"", ""progress"": 0, ""thumbnail"": """", ""position"": {""x"": 100, ""y"": 350}}, ""dcbcb225-f79a-5606-a4cd-fe0e327c7bc0"": {""key"": ""simcore/services/dynamic/cc-2d-viewer"", ""version"": ""2.8.0"", ""label"": ""cc-2d-viewer"", ""inputs"": {""ap"": {""nodeUuid"": ""8b632db9-d1ca-57b2-aed1-9cbe35fece93"", ""output"": ""out_1""}}, ""inputNodes"": [""8b632db9-d1ca-57b2-aed1-9cbe35fece93""], ""outputNode"": false, ""outputs"": {}, ""parent"": ""8a0fbea5-0a2a-58e5-b27c-8d41d51726fb"", ""progress"": 100, ""thumbnail"": """", ""position"": {""x"": 300, ""y"": 200}}}",False
diff --git a/services/storage/tests/data/user_to_projects.csv b/services/storage/tests/data/user_to_projects.csv
new file mode 100644
index 00000000000..1e2821bfb4b
--- /dev/null
+++ b/services/storage/tests/data/user_to_projects.csv
@@ -0,0 +1,3 @@
+id,user_id,project_id
+121,21,150
+122,21,151
diff --git a/services/storage/tests/data/users.csv b/services/storage/tests/data/users.csv
new file mode 100644
index 00000000000..58476f95d52
--- /dev/null
+++ b/services/storage/tests/data/users.csv
@@ -0,0 +1,2 @@
+id,name,email,password_hash,status,role,created_at,created_ip
+21,devops,devops@itis.swiss,$5$rounds=1000$jjUWjHSG5F2dMKw.$9VRlE4YLl4bPfIrWkDz/8GtEx1XkzTpuZzyc/uiBFE4,ACTIVE,USER,2019-06-27 11:35:44.828696,172.16.8.64
diff --git a/services/storage/tests/test_configs.py b/services/storage/tests/test_configs.py
index 5ac4bbc674d..e22bcc3e385 100644
--- a/services/storage/tests/test_configs.py
+++ b/services/storage/tests/test_configs.py
@@ -54,7 +54,6 @@ def container_environ(services_docker_compose_file, devel_environ, osparc_simcor
 
     container_environ = create_environ(skip_system_environ=True)
     container_environ.update({
-        'VENV2': '/home/scu/.venv27/', # defined in Dockerfile
         'OSPARC_SIMCORE_REPO_ROOTDIR':str(osparc_simcore_root_dir)
     })
 
diff --git a/services/storage/tests/test_datcore.py b/services/storage/tests/test_datcore.py
index 1dc7d51016f..946755a196d 100644
--- a/services/storage/tests/test_datcore.py
+++ b/services/storage/tests/test_datcore.py
@@ -7,29 +7,45 @@
 from concurrent.futures import ThreadPoolExecutor
 
 import pytest
-import utils
 
+import utils
 from simcore_service_storage.datcore_wrapper import DatcoreWrapper
 
+from pathlib import Path
 
-async def test_datcore_list_files(loop, python27_exec):
+async def test_datcore_ping(loop):
     if not utils.has_datcore_tokens():
         return
 
     api_token = os.environ.get("BF_API_KEY", "none")
     api_secret = os.environ.get("BF_API_SECRET", "none")
     pool = ThreadPoolExecutor(2)
-    dcw = DatcoreWrapper(api_token, api_secret, python27_exec, loop, pool)
-    f = await dcw.list_files()
-    print(f)
+    dcw = DatcoreWrapper(api_token, api_secret, loop, pool)
+    responsive = await dcw.ping()
+    assert responsive
 
-async def test_datcore_ping(loop, python27_exec):
+async def test_datcore_list_files_recursively(loop):
     if not utils.has_datcore_tokens():
         return
 
     api_token = os.environ.get("BF_API_KEY", "none")
     api_secret = os.environ.get("BF_API_SECRET", "none")
     pool = ThreadPoolExecutor(2)
-    dcw = DatcoreWrapper(api_token, api_secret, python27_exec, loop, pool)
-    f = await dcw.ping()
-    print(f)
+    dcw = DatcoreWrapper(api_token, api_secret, loop, pool)
+    f = await dcw.list_files_recursively()
+    assert len(f)
+
+
+async def test_datcore_nested_download_link(loop):
+    if not utils.has_datcore_tokens():
+        return
+
+    api_token = os.environ.get("BF_API_KEY", "none")
+    api_secret = os.environ.get("BF_API_SECRET", "none")
+    pool = ThreadPoolExecutor(2)
+    dcw = DatcoreWrapper(api_token, api_secret, loop, pool)
+    destination = str(Path("Shared Data/ISAN/UCDavis use case 0D/inputs/"))
+    filename = "initial_WTstates.txt"
+
+    f = await dcw.download_link(destination, filename)
+    assert(f)
diff --git a/services/storage/tests/test_dsm.py b/services/storage/tests/test_dsm.py
index 37ac590dced..19dc6372ba4 100644
--- a/services/storage/tests/test_dsm.py
+++ b/services/storage/tests/test_dsm.py
@@ -5,6 +5,7 @@
 # pylint:disable=redefined-outer-name
 # pylint: disable=too-many-arguments
 
+import datetime
 import filecmp
 import io
 import json
@@ -22,7 +23,7 @@
 from simcore_service_storage.models import FileMetaData
 from simcore_service_storage.settings import (DATCORE_STR, SIMCORE_S3_ID,
                                               SIMCORE_S3_STR)
-from utils import BUCKET_NAME, has_datcore_tokens, USER_ID
+from utils import BUCKET_NAME, USER_ID, has_datcore_tokens
 
 
 def test_mockup(dsm_mockup_db):
@@ -95,6 +96,7 @@ async def test_dsm_s3(dsm_mockup_db, dsm_fixture):
     assert len(dsm_mockup_db) == new_size + len(bobs_biostromy_files)
     assert len(dsm_mockup_db) == new_size + len(bobs_biostromy_files)
 
+
 def _create_file_meta_for_s3(postgres_url, s3_client, tmp_file):
     utils.create_tables(url=postgres_url)
     bucket_name = BUCKET_NAME
@@ -104,9 +106,14 @@ def _create_file_meta_for_s3(postgres_url, s3_client, tmp_file):
     # create file and upload
     filename = os.path.basename(tmp_file)
     project_id = "22"
+    project_name = "battlestar"
+    node_name = "galactica"
     node_id = "1006"
     file_name = filename
     file_uuid = os.path.join(str(project_id), str(node_id), str(file_name))
+    display_name = os.path.join(str(project_name), str(node_name), str(file_name))
+    created_at = str(datetime.datetime.now())
+    file_size = 1234
 
     d = {   'object_name' : os.path.join(str(project_id), str(node_id), str(file_name)),
             'bucket_name' : bucket_name,
@@ -114,11 +121,18 @@ def _create_file_meta_for_s3(postgres_url, s3_client, tmp_file):
             'user_id' : USER_ID,
             'user_name' : "starbucks",
             'location' : SIMCORE_S3_STR,
+            'location_id' : SIMCORE_S3_ID,
             'project_id' : project_id,
-            'project_name' : "battlestar",
+            'project_name' : project_name,
             'node_id' : node_id,
-            'node_name' : "this is the name of the node",
-            'file_uuid' : file_uuid
+            'node_name' : node_name,
+            'file_uuid' : file_uuid,
+            'file_id' : str(uuid.uuid4()),
+            'raw_file_path' : file_uuid,
+            'display_file_path' : display_name,
+            'created_at' : created_at,
+            'last_modified' : created_at,
+            'file_size' : file_size
         }
 
     fmd = FileMetaData(**d)
@@ -228,7 +242,7 @@ async def test_dsm_s3_to_datcore(postgres_service_url, s3_client, mock_files_fac
     urllib.request.urlretrieve(down_url, tmp_file2)
     assert filecmp.cmp(tmp_file2, tmp_file)
     # now we have the file locally, upload the file
-    await dsm.upload_file_to_datcore(user_id, tmp_file2, datcore_testbucket, fmd)
+    await dsm.upload_file_to_datcore(user_id=user_id, local_file_path=tmp_file2, destination=datcore_testbucket, fmd=fmd)
 
     data = await dsm.list_files(user_id=user_id, location=DATCORE_STR, uuid_filter=BUCKET_NAME)
 
@@ -336,3 +350,17 @@ def test_fmd_build():
     assert fmd.location == SIMCORE_S3_STR
     assert fmd.location_id == SIMCORE_S3_ID
     assert fmd.bucket_name == "test-bucket"
+
+
+async def test_dsm_complete_db(dsm_fixture, dsm_mockup_complete_db):
+    dsm = dsm_fixture
+    _id = "21"
+    dsm.has_project_db = True
+    data = await dsm.list_files(user_id=_id, location=SIMCORE_S3_STR)
+
+    assert len(data) == 2
+    for d in data:
+        assert d.display_file_path
+        assert d.node_name
+        assert d.project_name
+        assert d.raw_file_path
diff --git a/services/storage/tests/test_rest.py b/services/storage/tests/test_rest.py
index b8485646898..8b058d2d389 100644
--- a/services/storage/tests/test_rest.py
+++ b/services/storage/tests/test_rest.py
@@ -28,7 +28,7 @@ def parse_db(dsm_mockup_db):
     return id_file_count, id_name_map
 
 @pytest.fixture
-def client(loop, aiohttp_unused_port, aiohttp_client, python27_path, postgres_service, minio_service, osparc_api_specs_dir):
+def client(loop, aiohttp_unused_port, aiohttp_client, postgres_service, minio_service, osparc_api_specs_dir):
     app = web.Application()
 
     api_token = os.environ.get("BF_API_KEY", "none")
@@ -37,8 +37,8 @@ def client(loop, aiohttp_unused_port, aiohttp_client, python27_path, postgres_se
     main_cfg = {
         'port': aiohttp_unused_port(),
         'host': 'localhost',
-        'python2': python27_path,
         "max_workers" : 4,
+        "testing" : True,
         "test_datcore" : { 'api_token' : api_token, 'api_secret' : api_secret}
     }
     rest_cfg = {
diff --git a/services/storage/tests/utils.py b/services/storage/tests/utils.py
index 1196f00a089..8b71c4957e4 100644
--- a/services/storage/tests/utils.py
+++ b/services/storage/tests/utils.py
@@ -1,11 +1,15 @@
 import logging
 import os
+from pathlib import Path
 
+import pandas as pd
 import pytest
 import requests
 import sqlalchemy as sa
+import sys
 
-from simcore_service_storage.models import FileMetaData, file_meta_data
+from simcore_service_storage.models import (FileMetaData, file_meta_data,
+                                            projects, user_to_projects, users)
 
 log = logging.getLogger(__name__)
 
@@ -20,6 +24,12 @@
 BUCKET_NAME ="simcore-testing"
 USER_ID = '0'
 
+def current_dir():
+    return Path(sys.argv[0] if __name__ == "__main__" else __file__).resolve().parent
+
+def data_dir():
+    return current_dir() / Path("data")
+
 def has_datcore_tokens()->bool:
     token = os.environ.get("BF_API_KEY", "none")
     if token == "none":
@@ -79,8 +89,63 @@ def insert_metadata(url: str, fmd: FileMetaData):
         node_name = fmd.node_name,
         file_name = fmd.file_name,
         user_id = fmd.user_id,
-        user_name= fmd.user_name)
+        user_name= fmd.user_name,
+        file_id = fmd.file_id,
+        raw_file_path = fmd.raw_file_path,
+        display_file_path = fmd.display_file_path,
+        created_at = fmd.created_at,
+        last_modified = fmd.last_modified,
+        file_size = fmd.file_size)
+
 
     engine = sa.create_engine(url)
     conn = engine.connect()
     conn.execute(ins)
+
+def create_full_tables(url):
+    meta = sa.MetaData()
+    engine = sa.create_engine(url)
+
+    meta.drop_all(bind=engine, tables=[file_meta_data, projects, user_to_projects, users])
+    meta.create_all(bind=engine, tables=[file_meta_data, projects, user_to_projects, users])
+
+    for t in ["file_meta_data", "projects", "users", "user_to_projects"]:
+        filename = t + ".csv"
+        csv_file = str(data_dir() / Path(filename))
+        with open(csv_file, 'r') as file:
+            data_df = pd.read_csv(file)
+            data_df.to_sql(t, con=engine, index=False, index_label="id", if_exists='append')
+
+    # Leave here as a reference
+    # import psycopg2
+    # conn = psycopg2.connect(url)
+    # cur = conn.cursor()
+    # columns = [["file_uuid","location_id","location","bucket_name","object_name","project_id","project_name","node_id","node_name","file_name","user_id","user_name"],[],[],[]]
+    # if False:
+    #     import pdb; pdb.set_trace()
+    #     for t in ["file_meta_data", "projects", "users", "user_to_projects"]:
+    #         filename = t + ".sql"
+    #         sqlfile = str(data_dir() / Path(filename))
+    #         cur.execute(open(sqlfile, "r").read())
+    # else:
+    #     for t in ["file_meta_data", "projects", "users", "user_to_projects"]:
+    #         filename = t + ".csv"
+    #         csv_file = str(data_dir() / Path(filename))
+    #         if False:
+    #             with open(csv_file, 'r') as file:
+    #                 next(file)
+    #                 if t == "file_meta_data":
+    #                     cur.copy_from(file, t, sep=',', columns=columns[0])
+    #                 else:
+    #                     cur.copy_from(file, t, sep=',')
+    #                 conn.commit()
+    #         else:
+    #             with open(csv_file, 'r') as file:
+    #                 data_df = pd.read_csv(file)
+    #                 data_df.to_sql(t, con=engine, index=False, index_label="id", if_exists='append')
+
+def drop_all_tables(url):
+    meta = sa.MetaData()
+    engine = sa.create_engine(url)
+
+    meta.drop_all(bind=engine, tables=[file_meta_data, projects, user_to_projects, users])
diff --git a/services/web/client/compile.json b/services/web/client/compile.json
index 0fa76ee68e9..0ada6b85cb9 100644
--- a/services/web/client/compile.json
+++ b/services/web/client/compile.json
@@ -73,6 +73,12 @@
     "add-css": [
       {
         "uri": "resource/jsontreeviewer/jsonTree.css"
+      },
+      {
+        "uri": "resource/hint/hint.css"
+      },
+      {
+        "uri": "resource/common/common.css"
       }
     ],
     "add-script": [
diff --git a/services/web/client/source/class/qxapp/Application.js b/services/web/client/source/class/qxapp/Application.js
index 1c875b3521d..ba5e1ee936d 100644
--- a/services/web/client/source/class/qxapp/Application.js
+++ b/services/web/client/source/class/qxapp/Application.js
@@ -21,6 +21,7 @@
  * This is the main application class of "qxapp"
  *
  * @asset(qxapp/*)
+ * @asset(common/common.css)
  */
 
 qx.Class.define("qxapp.Application", {
@@ -68,6 +69,7 @@ qx.Class.define("qxapp.Application", {
       }, this);
 
       this.__initRouting();
+      this.__loadCommonCss();
     },
 
     __initRouting: function() {
@@ -200,6 +202,11 @@ qx.Class.define("qxapp.Application", {
           "transition: background-color 0s linear 100000s, color 0s linear 100000s"
         );
       }
+    },
+
+    __loadCommonCss: function() {
+      const commonCssUri = qx.util.ResourceManager.getInstance().toUri("common/common.css");
+      qx.module.Css.includeStylesheet(commonCssUri);
     }
   }
 });
diff --git a/services/web/client/source/class/qxapp/auth/LoginPage.js b/services/web/client/source/class/qxapp/auth/LoginPage.js
index 41a6299d8ee..7e5139fb301 100644
--- a/services/web/client/source/class/qxapp/auth/LoginPage.js
+++ b/services/web/client/source/class/qxapp/auth/LoginPage.js
@@ -32,7 +32,7 @@ qx.Class.define("qxapp.auth.LoginPage", {
     this.base(arguments);
 
     // Layout guarantees it gets centered in parent's page
-    let layout = new qx.ui.layout.Grid();
+    const layout = new qx.ui.layout.Grid();
     layout.setRowFlex(0, 1);
     layout.setColumnFlex(0, 1);
     this._setLayout(layout);
diff --git a/services/web/client/source/class/qxapp/component/filter/TextFilter.js b/services/web/client/source/class/qxapp/component/filter/TextFilter.js
index 1a91c0152f2..08e817f947e 100644
--- a/services/web/client/source/class/qxapp/component/filter/TextFilter.js
+++ b/services/web/client/source/class/qxapp/component/filter/TextFilter.js
@@ -49,6 +49,9 @@ qx.Class.define("qxapp.component.filter.TextFilter", {
   members: {
     __textField: null,
 
+    /**
+     * Function that resets the field and dispatches the update.
+     */
     reset: function() {
       this.__textField.resetValue();
       this.__textField.fireDataEvent("input", "");
diff --git a/services/web/client/source/class/qxapp/component/form/Auto.js b/services/web/client/source/class/qxapp/component/form/Auto.js
index d3fe5965545..e89709dda4d 100644
--- a/services/web/client/source/class/qxapp/component/form/Auto.js
+++ b/services/web/client/source/class/qxapp/component/form/Auto.js
@@ -573,6 +573,7 @@ qx.Class.define("qxapp.component.form.Auto", {
         control.set(s.set);
       }
       control.key = key;
+      control.description = s.description;
       this.__ctrlMap[key] = control;
 
       let controlLink = new qx.ui.form.TextField().set({
diff --git a/services/web/client/source/class/qxapp/component/form/FieldWHint.js b/services/web/client/source/class/qxapp/component/form/FieldWHint.js
new file mode 100644
index 00000000000..ff369a5dd12
--- /dev/null
+++ b/services/web/client/source/class/qxapp/component/form/FieldWHint.js
@@ -0,0 +1,94 @@
+/* ************************************************************************
+
+   qxapp - the simcore frontend
+
+   https://osparc.io
+
+   Copyright:
+     2019 IT'IS Foundation, https://itis.swiss
+
+   License:
+     MIT: https://opensource.org/licenses/MIT
+
+   Authors:
+     * Ignacio Pascual (ignapas)
+
+************************************************************************ */
+
+/**
+ * @asset(hint/hint.css)
+ */
+
+qx.Class.define("qxapp.component.form.FieldWHint", {
+  extend: qx.ui.core.Widget,
+
+  /**
+   * Text field with a hint tooltip
+   *
+   * @extends qx.ui.core.Widget
+   */
+  construct: function(value, hint, field) {
+    this.base(arguments);
+    this._setLayout(new qx.ui.layout.Canvas());
+
+    const hintCssUri = qx.util.ResourceManager.getInstance().toUri("hint/hint.css");
+    qx.module.Css.includeStylesheet(hintCssUri);
+
+    this.__field = field || new qx.ui.form.TextField();
+    if (value) {
+      this.__field.setValue(value);
+    }
+    this.getContentElement().addClass("hint-input");
+    this.__field.getContentElement().addClass("hint-field");
+    this._add(this.__field, {
+      top: 0,
+      right: 0,
+      bottom: 0,
+      left: 0
+    });
+
+    if (hint) {
+      this.__hintText = hint;
+    }
+    this.__infoButton = this.getChildControl("infobutton");
+
+    this.__attachEventHandlers();
+  },
+
+  members: {
+    __field: null,
+    __hint: null,
+    __hintText: null,
+    __infoButton: null,
+
+    _createChildControlImpl: function(id) {
+      let control;
+      switch (id) {
+        case "infobutton":
+          control = new qxapp.component.form.IconButton("@FontAwesome5Solid/info-circle/14");
+          control.getContentElement().addClass("hint-button");
+          this._add(control, {
+            right: 0,
+            bottom: 5
+          });
+          break;
+      }
+      return control || this.base(arguments, id);
+    },
+
+    __attachEventHandlers: function() {
+      if (this.__hintText) {
+        this.addListener("mouseover", () => this.__field.setPaddingRight(18), this);
+        this.addListener("mouseout", () => this.__field.resetPaddingRight(), this);
+        this.__infoButton.addListener("mouseover", () => this.__hint = new qxapp.ui.hint.Hint(this.__infoButton, this.__hintText), this);
+        this.__infoButton.addListener("mouseout", () => this.__hint.destroy(), this);
+
+        this.__field.bind("visibility", this, "visibility");
+      }
+    },
+
+    getField: function() {
+      return this.__field;
+    }
+  }
+});
diff --git a/services/web/client/source/class/qxapp/component/form/IconButton.js b/services/web/client/source/class/qxapp/component/form/IconButton.js
index 9fd8e770058..85b3bd8c5d9 100644
--- a/services/web/client/source/class/qxapp/component/form/IconButton.js
+++ b/services/web/client/source/class/qxapp/component/form/IconButton.js
@@ -29,9 +29,11 @@ qx.Class.define("qxapp.component.form.IconButton", {
    * @param {function} cb Callback function to be executed on tap.
    * @param {object} context Execution context (this) of the callback function.
    */
-  construct: function(icon, cb, context = null) {
+  construct: function(icon, cb, context) {
     this.base(arguments, icon);
-    this.addListener("tap", cb, context);
+    if (cb) {
+      this.addListener("tap", cb, context);
+    }
     this.setCursor("pointer");
   }
 });
diff --git a/services/web/client/source/class/qxapp/component/form/renderer/PropForm.js b/services/web/client/source/class/qxapp/component/form/renderer/PropForm.js
index b58b13505e2..e45635e2cf8 100644
--- a/services/web/client/source/class/qxapp/component/form/renderer/PropForm.js
+++ b/services/web/client/source/class/qxapp/component/form/renderer/PropForm.js
@@ -84,7 +84,7 @@ qx.Class.define("qxapp.component.form.renderer.PropForm", {
           column: 0
         });
         label.setBuddy(item);
-        this._add(item, {
+        this._add(new qxapp.component.form.FieldWHint(null, item.description, item), {
           row: this._row,
           column: 1
         });
@@ -147,16 +147,14 @@ qx.Class.define("qxapp.component.form.renderer.PropForm", {
       let children = this._getChildren();
       for (let i=0; i<children.length; i++) {
         let child = children[i];
-        if ("key" in child && child.key === portId) {
+        if (child.getField && child.getField().key === portId) {
           const layoutProps = child.getLayoutProperties();
           this._remove(child);
           let hBox = new qx.ui.container.Composite(new qx.ui.layout.HBox(5));
           hBox.add(this._form.getControlLink(portId), {
             flex: 1
           });
-          let unlinkBtn = new qx.ui.form.Button().set({
-            icon: "@FontAwesome5Solid/unlink/16"
-          });
+          let unlinkBtn = new qx.ui.form.Button(this.tr("Unlink"), "@FontAwesome5Solid/unlink/14");
           unlinkBtn.addListener("execute", function() {
             this.fireDataEvent("removeLink", portId);
           }, this);
@@ -177,7 +175,7 @@ qx.Class.define("qxapp.component.form.renderer.PropForm", {
         if ("key" in child && child.key === portId) {
           const layoutProps = child.getLayoutProperties();
           this._remove(child);
-          this._addAt(this._form.getControl(portId), i, {
+          this._addAt(new qxapp.component.form.FieldWHint(null, this._form.getControl(portId).description, this._form.getControl(portId)), i, {
             row: layoutProps.row,
             column: 1
           });
@@ -238,22 +236,22 @@ qx.Class.define("qxapp.component.form.renderer.PropForm", {
     },
 
     __getCompatibleInputs: function(output) {
-      return this._getChildren().filter(child => child.nodeId && this.__arePortsCompatible(output.nodeId, output.portId, child.nodeId, child.portId));
+      return this._getChildren().filter(child => child.getField && this.__arePortsCompatible(output.nodeId, output.portId, child.getField().nodeId, child.getField().portId));
     },
 
     __highlightCompatibles: function(output) {
       const inputs = this.__getCompatibleInputs(output);
       for (let i in inputs) {
-        const input = inputs[i];
+        const input = inputs[i].getField();
         input.setDecorator("material-textfield-focused");
       }
     },
 
     __unhighlightAll: function() {
-      const inputs = this._getChildren().filter(child => child.nodeId);
+      const inputs = this._getChildren().filter(child => child.getField);
       for (let i in inputs) {
         const input = inputs[i];
-        input.resetDecorator();
+        input.getField().resetDecorator();
       }
     },
 
diff --git a/services/web/client/source/class/qxapp/component/metadata/ServiceInfo.js b/services/web/client/source/class/qxapp/component/metadata/ServiceInfo.js
new file mode 100644
index 00000000000..d1f41404e89
--- /dev/null
+++ b/services/web/client/source/class/qxapp/component/metadata/ServiceInfo.js
@@ -0,0 +1,97 @@
+/*
+ * oSPARC - The SIMCORE frontend - https://osparc.io
+ * Copyright: 2019 IT'IS Foundation - https://itis.swiss
+ * License: MIT - https://opensource.org/licenses/MIT
+ * Authors: Ignacio Pascual (ignapas)
+ */
+
+qx.Class.define("qxapp.component.metadata.ServiceInfo", {
+  extend: qx.ui.core.Widget,
+  construct: function(metadata) {
+    this.base(arguments);
+
+    this.set({
+      padding: 5,
+      backgroundColor: "background-main"
+    });
+    this._setLayout(new qx.ui.layout.VBox(8));
+
+    this.__metadata = metadata;
+
+    const main = new qx.ui.container.Composite(new qx.ui.layout.HBox(8));
+    main.add(this.__createServiceThumbnail());
+    main.add(this.__createMainInfo(), {
+      flex: 1
+    });
+    this._add(main);
+
+    const authors = this.__createAuthors();
+    this._add(authors);
+
+    const rawMetadata = this.__createRawMetadata();
+    const more = new qxapp.desktop.PanelView(this.tr("raw metadata"), rawMetadata).set({
+      caretSize: 14
+    });
+    this._add(more, {
+      flex: 1
+    });
+    more.setCollapsed(true);
+    more.getChildControl("title").setFont("text-12");
+  },
+
+  members: {
+    __service: null,
+    __metadata: null,
+
+    __createMainInfo: function() {
+      const container = new qx.ui.container.Composite(new qx.ui.layout.VBox(8).set({
+        alignY: "middle"
+      }));
+
+      const title = new qx.ui.basic.Label(this.__metadata.name).set({
+        font: "title-16",
+        rich: true
+      });
+      container.add(title);
+
+      const description = new qx.ui.basic.Label(this.__metadata.description).set({
+        rich: true
+      });
+      container.add(description);
+
+      const author = new qx.ui.basic.Label(this.tr("Contact") + ": <b>" + this.__metadata.contact + "</b>").set({
+        rich: true
+      });
+      container.add(author);
+
+      return container;
+    },
+
+    __createServiceThumbnail: function() {
+      return new qx.ui.basic.Image(this.__metadata.thumbnail || qxapp.utils.Utils.getThumbnailFromString(this.__metadata.key)).set({
+        scale: true,
+        width: 200,
+        height: 120
+      });
+    },
+
+    __createRawMetadata: function() {
+      const container = new qx.ui.container.Scroll();
+      container.add(new qxapp.component.widget.JsonTreeWidget(this.__metadata, "serviceDescriptionSettings"));
+      return container;
+    },
+
+    __createAuthors: function() {
+      const container = new qx.ui.container.Composite(new qx.ui.layout.VBox(5));
+      container.add(new qx.ui.basic.Label(this.tr("Authors")).set({
+        font: "title-12"
+      }));
+      for (let i in this.__metadata.authors) {
+        const author = this.__metadata.authors[i];
+        const authorLine = `${author.name} · ${author.affiliation} · ${author.email}`;
+        container.add(new qx.ui.basic.Label(authorLine));
+      }
+      return container;
+    }
+  }
+});
diff --git a/services/web/client/source/class/qxapp/component/metadata/ServiceInfoWindow.js b/services/web/client/source/class/qxapp/component/metadata/ServiceInfoWindow.js
new file mode 100644
index 00000000000..97732712006
--- /dev/null
+++ b/services/web/client/source/class/qxapp/component/metadata/ServiceInfoWindow.js
@@ -0,0 +1,30 @@
+/*
+ * oSPARC - The SIMCORE frontend - https://osparc.io
+ * Copyright: 2019 IT'IS Foundation - https://itis.swiss
+ * License: MIT - https://opensource.org/licenses/MIT
+ * Authors: Ignacio Pascual (ignapas)
+ */
+
+qx.Class.define("qxapp.component.metadata.ServiceInfoWindow", {
+  extend: qx.ui.window.Window,
+  construct: function(metadata) {
+    this.base(arguments, this.tr("Service information") + " · " + metadata.name);
+
+    this.set({
+      layout: new qx.ui.layout.Grow(),
+      contentPadding: 0,
+      showMinimize: false,
+      resizable: false,
+      modal: true
+    });
+
+    this.add(new qxapp.component.metadata.ServiceInfo(metadata));
+  },
+
+  properties: {
+    appearance: {
+      refine: true,
+      init: "info-service-window"
+    }
+  }
+});
diff --git a/services/web/client/source/class/qxapp/component/metadata/StudyInfo.js b/services/web/client/source/class/qxapp/component/metadata/StudyInfo.js
new file mode 100644
index 00000000000..de9d8442160
--- /dev/null
+++ b/services/web/client/source/class/qxapp/component/metadata/StudyInfo.js
@@ -0,0 +1,104 @@
+/*
+ * oSPARC - The SIMCORE frontend - https://osparc.io
+ * Copyright: 2019 IT'IS Foundation - https://itis.swiss
+ * License: MIT - https://opensource.org/licenses/MIT
+ * Authors: Ignacio Pascual (ignapas)
+ */
+
+qx.Class.define("qxapp.component.metadata.StudyInfo", {
+  extend: qx.ui.core.Widget,
+  construct: function(study) {
+    this.base(arguments);
+
+    this.set({
+      padding: 5,
+      backgroundColor: "background-main"
+    });
+    this._setLayout(new qx.ui.layout.VBox(8));
+
+    this.__study = study;
+
+    const main = new qx.ui.container.Composite(new qx.ui.layout.HBox(8));
+    main.add(this.__createStudyThumbnail());
+    main.add(this.__createMainInfo(), {
+      flex: 1
+    });
+    this._add(main);
+
+    const extraInfo = this.__createExtraInfo();
+    const more = new qxapp.desktop.PanelView(this.tr("more information"), extraInfo).set({
+      caretSize: 14,
+      collapsed: true
+    });
+    more.getChildControl("title").setFont("text-12");
+    this._add(more);
+  },
+
+  members: {
+    __study: null,
+
+    __createMainInfo: function() {
+      const container = new qx.ui.container.Composite(new qx.ui.layout.VBox(8).set({
+        alignY: "middle"
+      }));
+
+      const title = new qx.ui.basic.Label(this.__study.getName()).set({
+        font: "title-16",
+        rich: true
+      });
+      container.add(title);
+
+      const description = new qx.ui.basic.Label(this.__study.getDescription()).set({
+        rich: true
+      });
+      container.add(description);
+
+      const author = new qx.ui.basic.Label(this.tr("Owner") + ": <b>" + this.__study.getPrjOwner() + "</b>").set({
+        rich: true
+      });
+      container.add(author);
+
+      return container;
+    },
+
+    __createStudyThumbnail: function() {
+      return new qx.ui.basic.Image(qxapp.utils.Utils.getThumbnailFromUuid(this.__study.getUuid())).set({
+        scale: true,
+        width: 200,
+        height: 120
+      });
+    },
+
+    __createExtraInfo: function() {
+      const layout = new qx.ui.layout.Grid(8);
+      layout.setColumnAlign(0, "right", "middle");
+      layout.setColumnAlign(1, "left", "middle");
+
+      const container = new qx.ui.container.Composite(layout);
+
+      const dateFormatter = date => date.toLocaleString();
+
+      container.add(new qx.ui.basic.Label(this.tr("Creation date")), {
+        column: 0,
+        row: 0
+      });
+      const creation = new qx.ui.basic.Label(dateFormatter(this.__study.getCreationDate()));
+      container.add(creation, {
+        column: 1,
+        row: 0
+      });
+
+      container.add(new qx.ui.basic.Label(this.tr("Last modified")), {
+        column: 0,
+        row: 1
+      });
+      const last = new qx.ui.basic.Label(dateFormatter(this.__study.getCreationDate()));
+      container.add(last, {
+        column: 1,
+        row: 1
+      });
+
+      return container;
+    }
+  }
+});
diff --git a/services/web/client/source/class/qxapp/component/service/NodeStatus.js b/services/web/client/source/class/qxapp/component/service/NodeStatus.js
new file mode 100644
index 00000000000..45ce1484460
--- /dev/null
+++ b/services/web/client/source/class/qxapp/component/service/NodeStatus.js
@@ -0,0 +1,114 @@
+/*
+ * oSPARC - The SIMCORE frontend - https://osparc.io
+ * Copyright: 2019 IT'IS Foundation - https://itis.swiss
+ * License: MIT - https://opensource.org/licenses/MIT
+ * Authors: Ignacio Pascual (ignapas)
+ */
+
+qx.Class.define("qxapp.component.service.NodeStatus", {
+  extend: qx.ui.basic.Atom,
+
+  construct: function(node) {
+    this.base(arguments, this.tr("Idle"), "@FontAwesome5Solid/clock/12");
+
+    this.__node = node;
+    this.__label = this.getChildControl("label");
+    this.__icon = this.getChildControl("icon");
+
+    if (node.isInKey("file-picker")) {
+      this.__setupFilepicker();
+    } else {
+      this.__setupInteractive();
+    }
+  },
+
+  properties: {
+    appearance: {
+      init: "chip",
+      refine: true
+    }
+  },
+
+  members: {
+    __node: null,
+    __label: null,
+    __icon: null,
+
+    __addClass: function(element, className) {
+      if (element) {
+        const currentClass = element.getAttribute("class");
+        if (currentClass && currentClass.includes(className.trim())) {
+          return;
+        }
+        element.setAttribute("class", ((currentClass || "") + " " + className).trim());
+      }
+    },
+
+    __removeClass: function(element, className) {
+      const currentClass = element.getAttribute("class");
+      if (currentClass) {
+        const regex = new RegExp(className.trim(), "g");
+        element.setAttribute("class", currentClass.replace(regex, ""));
+      }
+    },
+
+    __setupInteractive: function() {
+      this.__node.bind("serviceUrl", this.__label, "value", {
+        converter: url => {
+          if (url) {
+            return this.tr("Ready");
+          }
+          return this.tr("Loading...");
+        }
+      });
+
+      this.__node.bind("serviceUrl", this.__icon, "source", {
+        converter: url => {
+          if (url) {
+            return "@FontAwesome5Solid/check/12";
+          }
+          return "@FontAwesome5Solid/circle-notch/12";
+        },
+        onUpdate: (source, target) => {
+          if (source.getServiceUrl()) {
+            this.__removeClass(this.__icon.getContentElement(), "rotate");
+            target.setTextColor("ready-green");
+          } else {
+            this.__addClass(this.__icon.getContentElement(), "rotate");
+            target.resetTextColor();
+          }
+        }
+      });
+    },
+
+    __setupFilepicker: function() {
+      const node = this.__node;
+      this.__node.bind("progress", this.__icon, "source", {
+        converter: progress => {
+          if (progress === 100) {
+            return "@FontAwesome5Solid/check/12";
+          }
+          return "@FontAwesome5Solid/file/12";
+        },
+        onUpdate: (source, target) => {
+          if (source.getProgress() === 100) {
+            target.setTextColor("ready-green");
+          } else {
+            target.resetTextColor();
+          }
+        }
+      });
+
+      this.__node.bind("progress", this.__label, "value", {
+        converter: progress => {
+          if (progress === 100) {
+            const file = node.getOutputValues().outFile.path;
+            const splitFilename = file.split("/");
+            return splitFilename[splitFilename.length-1];
+          }
+          return this.tr("Select a file");
+        }
+      });
+    }
+  }
+});
diff --git a/services/web/client/source/class/qxapp/component/widget/JsonTreeWidget.js b/services/web/client/source/class/qxapp/component/widget/JsonTreeWidget.js
index f896ff43254..c2f5fc84e2c 100644
--- a/services/web/client/source/class/qxapp/component/widget/JsonTreeWidget.js
+++ b/services/web/client/source/class/qxapp/component/widget/JsonTreeWidget.js
@@ -12,6 +12,7 @@
 
    Authors:
      * Odei Maiz (odeimaiz)
+     * Ignacio Pascual (ignapas)
 
 ************************************************************************ */
 
@@ -23,28 +24,22 @@
  * Here is a little example of how to use the widget.
  *
  * <pre class='javascript'>
- *   let jsonTreeWidget = new qxapp.component.widget.JsonTreeWidget(data, "elemId");
+ *   let jsonTreeWidget = new qxapp.component.widget.JsonTreeWidget(data);
  *   this.getRoot().add(jsonTreeWidget);
  * </pre>
  */
 
 qx.Class.define("qxapp.component.widget.JsonTreeWidget", {
-  extend: qx.ui.core.Widget,
+  extend: qx.ui.basic.Label,
 
   /**
-    * @param data {Object} Json object to be displayed by JsonTreeViewer
-    * @param elemId {String} Element id to set it as dom attribute
-  */
-  construct: function(data, elemId) {
-    this.base();
-
-    this.addListenerOnce("appear", () => {
-      let elem = this.getContentElement().getDomElement();
-      qx.bom.element.Attribute.set(elem, "id", elemId);
-      let jsonTreeViewer = qxapp.wrapper.JsonTreeViewer.getInstance();
-      if (jsonTreeViewer.getLibReady()) {
-        jsonTreeViewer.print(data, elem);
-      }
+   * @param data {Object} Json object to be displayed by JsonTreeViewer
+   */
+  construct: function(data) {
+    const prettyJson = JSON.stringify(data, null, "&emsp;").replace(/\n/ig, "<br>");
+    this.base(arguments, prettyJson);
+    this.set({
+      rich: true
     });
   }
 });
diff --git a/services/web/client/source/class/qxapp/component/widget/NewGHIssue.js b/services/web/client/source/class/qxapp/component/widget/NewGHIssue.js
index 1776247b809..93a60970c76 100644
--- a/services/web/client/source/class/qxapp/component/widget/NewGHIssue.js
+++ b/services/web/client/source/class/qxapp/component/widget/NewGHIssue.js
@@ -55,6 +55,8 @@ qx.Class.define("qxapp.component.widget.NewGHIssue", {
 ## Steps to reproduce
 <!-- Please describe steps to reproduce the issue. -->
 
+Note: your environment was attached but will not be displayed
+<!--
 ## Your environment
 `;
     }
diff --git a/services/web/client/source/class/qxapp/component/widget/NodeDataManager.js b/services/web/client/source/class/qxapp/component/widget/NodeDataManager.js
index 87f22f252b2..f2a54c80b87 100644
--- a/services/web/client/source/class/qxapp/component/widget/NodeDataManager.js
+++ b/services/web/client/source/class/qxapp/component/widget/NodeDataManager.js
@@ -54,33 +54,35 @@ qx.Class.define("qxapp.component.widget.NodeDataManager", {
       flex: 1
     });
 
-    let nodeTree = this.__nodeTree = this._createChildControlImpl("nodeTree");
-    nodeTree.setDragMechnism(true);
-    nodeTree.addListener("selectionChanged", () => {
+    let nodeFilesTree = this.__nodeFilesTree = this._createChildControlImpl("nodeTree");
+    nodeFilesTree.setDragMechnism(true);
+    nodeFilesTree.addListener("selectionChanged", () => {
       this.__selectionChanged("node");
     }, this);
-    treesLayout.add(nodeTree, {
+    treesLayout.add(nodeFilesTree, {
       flex: 1
     });
 
-    let userTree = this.__userTree = this._createChildControlImpl("userTree");
-    userTree.setDropMechnism(true);
-    userTree.addListener("selectionChanged", () => {
+    let userFilesTree = this.__userFilesTree = this._createChildControlImpl("userTree");
+    userFilesTree.setDropMechnism(true);
+    userFilesTree.addListener("selectionChanged", () => {
       this.__selectionChanged("user");
     }, this);
-    userTree.addListener("fileCopied", e => {
-      if (e) {
-        this.__reloadUserTree();
+    userFilesTree.addListener("fileCopied", e => {
+      const fileMetadata = e.getData();
+      if (fileMetadata) {
+        this.__userFilesTree.addFileEntry(fileMetadata["fileUuid"]);
       }
     }, this);
-    treesLayout.add(userTree, {
+    treesLayout.add(userFilesTree, {
       flex: 1
     });
 
     let selectedFileLayout = this.__selectedFileLayout = this._createChildControlImpl("selectedFileLayout");
-    selectedFileLayout.addListener("fileDeleted", () => {
+    selectedFileLayout.addListener("fileDeleted", e => {
+      const fileMetadata = e.getData();
       this.__reloadNodeTree();
-      this.__reloadUserTree();
+      this.__reloadUserTree(fileMetadata["locationId"]);
     }, this);
 
     this.__reloadNodeTree();
@@ -94,8 +96,8 @@ qx.Class.define("qxapp.component.widget.NodeDataManager", {
   },
 
   members: {
-    __nodeTree: null,
-    __userTree: null,
+    __nodeFilesTree: null,
+    __userFilesTree: null,
     __selectedFileLayout: null,
 
     _createChildControlImpl: function(id) {
@@ -117,21 +119,21 @@ qx.Class.define("qxapp.component.widget.NodeDataManager", {
     },
 
     __reloadNodeTree: function() {
-      this.__nodeTree.populateTree(this.getNode().getNodeId());
+      this.__nodeFilesTree.populateTree(this.getNode().getNodeId());
     },
 
-    __reloadUserTree: function() {
-      this.__userTree.populateTree();
+    __reloadUserTree: function(locationId = null) {
+      this.__userFilesTree.populateTree(null, locationId);
     },
 
     __selectionChanged: function(selectedTree) {
       let selectionData = null;
       if (selectedTree === "user") {
-        this.__nodeTree.resetSelection();
-        selectionData = this.__userTree.getSelectedFile();
+        this.__nodeFilesTree.resetSelection();
+        selectionData = this.__userFilesTree.getSelectedFile();
       } else {
-        this.__userTree.resetSelection();
-        selectionData = this.__nodeTree.getSelectedFile();
+        this.__userFilesTree.resetSelection();
+        selectionData = this.__nodeFilesTree.getSelectedFile();
       }
       if (selectionData) {
         this.__selectedFileLayout.itemSelected(selectionData["selectedItem"], selectionData["isFile"]);
diff --git a/services/web/client/source/class/qxapp/component/widget/NodePorts.js b/services/web/client/source/class/qxapp/component/widget/NodePorts.js
index 61101057017..3bb0b6e91ac 100644
--- a/services/web/client/source/class/qxapp/component/widget/NodePorts.js
+++ b/services/web/client/source/class/qxapp/component/widget/NodePorts.js
@@ -42,11 +42,7 @@ qx.Class.define("qxapp.component.widget.NodePorts", {
 
     this._setLayout(new qx.ui.layout.Grow());
 
-    const nodeUIPorts = this.__nodeUIPorts = new qx.ui.container.Composite(new qx.ui.layout.VBox()).set({
-      appearance: "node-ports"
-    });
-
-    this.base(arguments, node.getLabel(), nodeUIPorts);
+    this.base(arguments, node.getLabel());
 
     node.bind("label", this, "title");
   },
@@ -65,7 +61,6 @@ qx.Class.define("qxapp.component.widget.NodePorts", {
   },
 
   members: {
-    __nodeUIPorts: null,
 
     getNodeId: function() {
       return this.getNode().getNodeId();
@@ -76,7 +71,6 @@ qx.Class.define("qxapp.component.widget.NodePorts", {
     },
 
     populatePortsData: function() {
-      this.__nodeUIPorts.removeAll();
       const metaData = this.getNode().getMetaData();
       if (this.getIsInputModel()) {
         this.__createUIPorts(false, metaData.outputs);
@@ -93,10 +87,10 @@ qx.Class.define("qxapp.component.widget.NodePorts", {
       if (ports.defaultNeuromanModels) {
         // Maintaining NodeOutputListIcon for Neuroman
         const nodeOutputList = new qxapp.component.widget.inputs.NodeOutputListIcon(this.getNode(), ports.defaultNeuromanModels, "defaultNeuromanModels");
-        this.__nodeUIPorts.add(nodeOutputList.getOutputWidget());
+        this.setContent(nodeOutputList.getOutputWidget());
       } else {
         const portTree = new qxapp.component.widget.inputs.NodeOutputTree(this.getNode(), ports);
-        this.__nodeUIPorts.add(portTree);
+        this.setContent(portTree);
       }
     }
   }
diff --git a/services/web/client/source/class/qxapp/component/widget/NodeView.js b/services/web/client/source/class/qxapp/component/widget/NodeView.js
index f7d77b63327..67715fab3c4 100644
--- a/services/web/client/source/class/qxapp/component/widget/NodeView.js
+++ b/services/web/client/source/class/qxapp/component/widget/NodeView.js
@@ -41,30 +41,45 @@ qx.Class.define("qxapp.component.widget.NodeView", {
   construct: function() {
     this.base(arguments);
 
-    const inputNodesLayout = this.__inputNodesLayout = new qxapp.desktop.SidePanel();
-    const navBarLabelFont = qx.bom.Font.fromConfig(qxapp.theme.Font.fonts["nav-bar-label"]);
-    let inputLabel = new qx.ui.basic.Label(this.tr("Inputs")).set({
-      font: navBarLabelFont,
-      alignX: "center"
-    });
-    inputNodesLayout.add(inputLabel);
-
-    const scroll = this.__scrollContainer = new qx.ui.container.Scroll().set({
+    const inputPanel = this.__inputPanel = new qxapp.desktop.SidePanel().set({
       minWidth: 300
     });
-    scroll.add(inputNodesLayout);
-    this.add(scroll, 0);
-
-    const mainLayout = this.__mainLayout = new qx.ui.container.Composite(new qx.ui.layout.VBox(10)).set({
-      alignX: "center",
-      padding: [0, 40]
+    const titleBar = new qx.ui.toolbar.ToolBar();
+    const titlePart = new qx.ui.toolbar.Part();
+    const buttonPart = new qx.ui.toolbar.Part();
+    titleBar.add(titlePart);
+    titleBar.addSpacer();
+    titleBar.add(buttonPart);
+    this.add(titleBar, 0);
+    titlePart.add(new qx.ui.basic.Atom(this.tr("Inputs")).set({
+      font: "title-18"
+    }));
+    const collapseBtn = this.__collapseBtn = new qx.ui.toolbar.Button(this.tr("Collapse all"), "@FontAwesome5Solid/minus-square/14");
+    buttonPart.add(collapseBtn);
+    inputPanel.add(titleBar);
+
+    const scroll = this.__scrollContainer = new qx.ui.container.Scroll();
+    const inputContainer = this.__inputNodesLayout = new qx.ui.container.Composite(new qx.ui.layout.VBox());
+    scroll.add(inputContainer);
+    inputPanel.add(scroll, {
+      flex: 1
     });
+
+    this.add(inputPanel, 0);
+
+    const mainLayout = this.__mainLayout = new qx.ui.container.Composite(new qx.ui.layout.VBox(10));
     this.add(mainLayout, 1);
 
-    this.__settingsLayout = new qx.ui.container.Composite(new qx.ui.layout.VBox(18));
+    this.__settingsLayout = new qx.ui.groupbox.GroupBox(this.tr("Settings")).set({
+      appearance: "settings-groupbox",
+      maxWidth: 500,
+      alignX: "center"
+    });
+    this.__settingsLayout.setLayout(new qx.ui.layout.VBox());
     this.__mapperLayout = new qx.ui.container.Composite(new qx.ui.layout.VBox(10));
-    this.__iFrameLayout = new qx.ui.container.Composite(new qx.ui.layout.VBox(10));
-    this.__initButtons();
+    this.__iFrameLayout = new qx.ui.container.Composite(new qx.ui.layout.VBox());
+
+    mainLayout.add(this.__initToolbar());
 
     this.__attachEventHandlers();
   },
@@ -76,54 +91,50 @@ qx.Class.define("qxapp.component.widget.NodeView", {
     },
 
     node: {
-      check: "qxapp.data.model.Node"
+      check: "qxapp.data.model.Node",
+      apply: "_applyNode"
     }
   },
 
   members: {
     __mainLayout: null,
     __scrollContainer: null,
+    __inputPanel: null,
     __inputNodesLayout: null,
     __settingsLayout: null,
     __mapperLayout: null,
     __iFrameLayout: null,
-    __buttonsLayout: null,
-    __openFolder: null,
-
-    __initButtons: function() {
-      let box = new qx.ui.layout.HBox();
-      box.set({
-        spacing: 10,
-        alignX: "right"
+    __toolbar: null,
+    __title: null,
+    __buttonContainer: null,
+    __filesButton: null,
+    __collapseBtn: null,
+
+    __initToolbar: function() {
+      const toolbar = this.__toolbar = new qx.ui.toolbar.ToolBar();
+      const titlePart = new qx.ui.toolbar.Part();
+      const infoPart = new qx.ui.toolbar.Part();
+      const buttonsPart = this.__buttonContainer = new qx.ui.toolbar.Part();
+      toolbar.add(titlePart);
+      toolbar.add(infoPart);
+      toolbar.addSpacer();
+
+      const title = this.__title = new qx.ui.basic.Atom().set({
+        font: "title-18"
       });
-      let buttonsLayout = this.__buttonsLayout = new qx.ui.container.Composite(box);
+      titlePart.add(title);
 
-      let openFolder = this.__openFolder = new qx.ui.form.Button().set({
-        icon: "@FontAwesome5Solid/folder-open/32"
-      });
-      openFolder.addListener("execute", function() {
-        let nodeDataManager = new qxapp.component.widget.NodeDataManager(this.getNode());
-
-        let win = new qx.ui.window.Window(this.getNode().getLabel()).set({
-          layout: new qx.ui.layout.Canvas(),
-          contentPadding: 0,
-          showMinimize: false,
-          width: 900,
-          height: 600,
-          appearance: "service-window"
-        });
-        win.add(nodeDataManager, {
-          top: 0,
-          right: 0,
-          bottom: 0,
-          left: 0
-        });
+      const infoBtn = new qx.ui.toolbar.Button(this.tr("Info"), "@FontAwesome5Solid/info-circle/14");
+      infoPart.add(infoBtn);
 
-        win.center();
-        win.open();
-      }, this);
+      const filesBtn = this.__filesButton = new qx.ui.toolbar.Button(this.tr("Files"), "@FontAwesome5Solid/folder-open/14");
+      buttonsPart.add(filesBtn);
+
+      filesBtn.addListener("execute", () => this.__openNodeDataManager(), this);
 
-      buttonsLayout.add(openFolder);
+      infoBtn.addListener("execute", () => this.__openServiceInfo(), this);
+
+      return toolbar;
     },
 
     buildLayout: function() {
@@ -135,7 +146,7 @@ qx.Class.define("qxapp.component.widget.NodeView", {
     },
 
     __addInputPortsUIs: function() {
-      this.__clearInputPortsUIs();
+      this.__inputNodesLayout.removeAll();
 
       // Add the default inputs if any
       if (Object.keys(this.getNode().getInputsDefault()).length > 0) {
@@ -157,13 +168,6 @@ qx.Class.define("qxapp.component.widget.NodeView", {
       }
     },
 
-    __clearInputPortsUIs: function() {
-      // remove all but the title
-      while (this.__inputNodesLayout.getChildren().length > 1) {
-        this.__inputNodesLayout.removeAt(this.__inputNodesLayout.getChildren().length-1);
-      }
-    },
-
     __createInputPortsUI: function(inputNode, isInputModel = true) {
       let nodePorts = null;
       if (isInputModel) {
@@ -172,8 +176,11 @@ qx.Class.define("qxapp.component.widget.NodeView", {
         nodePorts = inputNode.getInputsDefaultWidget();
       }
       if (nodePorts) {
-        this.__inputNodesLayout.add(nodePorts);
+        this.__inputNodesLayout.add(nodePorts, {
+          flex: 1
+        });
       }
+      nodePorts.setCollapsed(false);
       return nodePorts;
     },
 
@@ -181,20 +188,7 @@ qx.Class.define("qxapp.component.widget.NodeView", {
       const propsWidget = this.getNode().getPropsWidget();
       this.__settingsLayout.removeAll();
       if (propsWidget) {
-        let box = new qx.ui.layout.HBox();
-        box.set({
-          spacing: 10,
-          alignX: "center"
-        });
-        let titleBox = new qx.ui.container.Composite(box);
-        let settLabel = new qx.ui.basic.Label(this.tr("Settings")).set({
-          font: "nav-bar-label"
-        });
-        titleBox.add(settLabel);
-
-        this.__settingsLayout.add(titleBox);
         this.__settingsLayout.add(propsWidget);
-
         this.__mainLayout.add(this.__settingsLayout);
       } else if (qx.ui.core.Widget.contains(this.__mainLayout, this.__settingsLayout)) {
         this.__mainLayout.remove(this.__settingsLayout);
@@ -243,7 +237,7 @@ qx.Class.define("qxapp.component.widget.NodeView", {
       this.__inputNodesLayout.setVisibility(othersStatus);
       this.__settingsLayout.setVisibility(othersStatus);
       this.__mapperLayout.setVisibility(othersStatus);
-      this.__buttonsLayout.setVisibility(othersStatus);
+      this.__toolbar.setVisibility(othersStatus);
     },
 
     hasIFrame: function() {
@@ -260,27 +254,50 @@ qx.Class.define("qxapp.component.widget.NodeView", {
     },
 
     __addButtons: function() {
-      this.__buttonsLayout.removeAll();
+      this.__buttonContainer.removeAll();
       let retrieveIFrameButton = this.getNode().getRetrieveIFrameButton();
       if (retrieveIFrameButton) {
-        this.__buttonsLayout.add(retrieveIFrameButton);
+        this.__buttonContainer.add(retrieveIFrameButton);
       }
       let restartIFrameButton = this.getNode().getRestartIFrameButton();
       if (restartIFrameButton) {
-        this.__buttonsLayout.add(restartIFrameButton);
+        this.__buttonContainer.add(restartIFrameButton);
       }
-      this.__buttonsLayout.add(this.__openFolder);
-      this.__mainLayout.add(this.__buttonsLayout);
+      this.__buttonContainer.add(this.__filesButton);
+      this.__toolbar.add(this.__buttonContainer);
+    },
+
+    __openNodeDataManager: function() {
+      const nodeDataManager = new qxapp.component.widget.NodeDataManager(this.getNode());
+
+      const win = new qx.ui.window.Window(this.getNode().getLabel()).set({
+        layout: new qx.ui.layout.Grow(),
+        contentPadding: 0,
+        showMinimize: false,
+        width: 900,
+        height: 600,
+        appearance: "service-window"
+      });
+      win.add(nodeDataManager);
+
+      win.center();
+      win.open();
+    },
+
+    __openServiceInfo: function() {
+      const win = new qxapp.component.metadata.ServiceInfoWindow(this.getNode().getMetaData());
+      win.center();
+      win.open();
     },
 
     __attachEventHandlers: function() {
-      this.__blocker.addListener("tap", this.__inputNodesLayout.toggleCollapsed.bind(this.__inputNodesLayout));
+      this.__blocker.addListener("tap", this.__inputPanel.toggleCollapsed.bind(this.__inputPanel));
 
       const maximizeIframeCb = msg => {
         this.__blocker.setStyles({
           display: msg.getData() ? "none" : "block"
         });
-        this.__scrollContainer.setVisibility(msg.getData() ? "excluded" : "visible");
+        this.__inputPanel.setVisibility(msg.getData() ? "excluded" : "visible");
       };
 
       this.addListener("appear", () => {
@@ -290,6 +307,16 @@ qx.Class.define("qxapp.component.widget.NodeView", {
       this.addListener("disappear", () => {
         qx.event.message.Bus.getInstance().unsubscribe("maximizeIframe", maximizeIframeCb, this);
       }, this);
+
+      this.__collapseBtn.addListener("execute", () => {
+        this.__inputNodesLayout.getChildren().forEach(node => {
+          node.setCollapsed(true);
+        });
+      }, this);
+    },
+
+    _applyNode: function(node) {
+      this.__title.setLabel(node.getLabel());
     }
   }
 });
diff --git a/services/web/client/source/class/qxapp/component/widget/NodesTree.js b/services/web/client/source/class/qxapp/component/widget/NodesTree.js
index 86ebfa7dd64..491d174a902 100644
--- a/services/web/client/source/class/qxapp/component/widget/NodesTree.js
+++ b/services/web/client/source/class/qxapp/component/widget/NodesTree.js
@@ -100,7 +100,7 @@ qx.Class.define("qxapp.component.widget.NodesTree", {
     },
 
     __buildToolbar: function() {
-      const iconSize = 16;
+      const iconSize = 14;
       let toolbar = this.__toolBar = new qx.ui.toolbar.ToolBar();
 
       let newButton = new qx.ui.toolbar.Button("New", "@FontAwesome5Solid/plus/"+iconSize, new qx.ui.command.Command("Ctrl+N"));
diff --git a/services/web/client/source/class/qxapp/component/widget/inputs/NodeOutputTree.js b/services/web/client/source/class/qxapp/component/widget/inputs/NodeOutputTree.js
index 488584b92da..42c7951af69 100644
--- a/services/web/client/source/class/qxapp/component/widget/inputs/NodeOutputTree.js
+++ b/services/web/client/source/class/qxapp/component/widget/inputs/NodeOutputTree.js
@@ -50,7 +50,9 @@ qx.Class.define("qxapp.component.widget.inputs.NodeOutputTree", {
       ports,
       decorator: "service-tree",
       hideRoot: true,
-      contentPadding: 0
+      contentPadding: 0,
+      padding: 0,
+      minHeight: 0
     });
 
     const self = this;
diff --git a/services/web/client/source/class/qxapp/component/workbench/NodeUI.js b/services/web/client/source/class/qxapp/component/workbench/NodeUI.js
index e1aa83f6e34..b5f82d15528 100644
--- a/services/web/client/source/class/qxapp/component/workbench/NodeUI.js
+++ b/services/web/client/source/class/qxapp/component/workbench/NodeUI.js
@@ -31,7 +31,7 @@
  * </pre>
  */
 
-const nodeWidth = 180;
+const nodeWidth = 200;
 const portHeight = 16;
 
 qx.Class.define("qxapp.component.workbench.NodeUI", {
@@ -46,7 +46,6 @@ qx.Class.define("qxapp.component.workbench.NodeUI", {
     this.base();
 
     this.set({
-      appearance: "window-small-cap",
       showMinimize: false,
       showMaximize: false,
       showClose: false,
@@ -75,6 +74,10 @@ qx.Class.define("qxapp.component.workbench.NodeUI", {
       check: "String",
       nullable: true,
       apply: "_applyThumbnail"
+    },
+    appearance: {
+      init: "window-small-cap",
+      refine: true
     }
   },
 
@@ -93,6 +96,8 @@ qx.Class.define("qxapp.component.workbench.NodeUI", {
     __outputPort: null,
     __progressBar: null,
     __thumbnail: null,
+    __status: null,
+
 
     getNodeId: function() {
       return this.getNode().getNodeId();
@@ -130,11 +135,17 @@ qx.Class.define("qxapp.component.workbench.NodeUI", {
         width: "50%"
       });
 
-      this.__progressBar = new qx.ui.indicator.ProgressBar().set({
-        height: 10,
-        margin: 4
-      });
-      this.add(this.__progressBar);
+      this.add(this.__createChipContainer());
+
+      if (this.getNode().isComputational()) {
+        this.__progressBar = new qx.ui.indicator.ProgressBar().set({
+          height: 10,
+          margin: 4
+        });
+        this.add(this.__progressBar);
+      } else if (this.getNode().isDynamic()) {
+        this.add(this.__createStatusContainer());
+      }
     },
 
     populateNodeLayout: function() {
@@ -150,7 +161,9 @@ qx.Class.define("qxapp.component.workbench.NodeUI", {
         this.__createUIPorts(true, metaData.inputs);
         this.__createUIPorts(false, metaData.outputs);
       }
-      node.bind("progress", this.__progressBar, "value");
+      if (node.isComputational()) {
+        node.bind("progress", this.__progressBar, "value");
+      }
     },
 
     getInputPort: function() {
@@ -238,6 +251,30 @@ qx.Class.define("qxapp.component.workbench.NodeUI", {
       return bounds;
     },
 
+    __createChipContainer: function() {
+      const chipContainer = new qx.ui.container.Composite(new qx.ui.layout.Flow(5, 3, "center")).set({
+        margin: [3, 4]
+      });
+      const category = qxapp.statics.NodeStatics.getCategory(this.getNode().getMetaData().category);
+      const type = qxapp.statics.NodeStatics.getType(this.getNode().getMetaData().type);
+      if (type) {
+        chipContainer.add(new qxapp.ui.basic.Chip(type.label, type.icon + "12"));
+      }
+      if (category) {
+        chipContainer.add(new qxapp.ui.basic.Chip(category.label, category.icon + "12"));
+      }
+      return chipContainer;
+    },
+
+    __createStatusContainer: function() {
+      this.__status = new qxapp.component.service.NodeStatus(this.getNode());
+      const container = new qx.ui.container.Composite(new qx.ui.layout.Flow(5, 3, "center")).set({
+        margin: [3, 4]
+      });
+      container.add(this.__status);
+      return container;
+    },
+
     // override qx.ui.window.Window "move" event listener
     _onMovePointerMove: function(e) {
       this.base(arguments, e);
diff --git a/services/web/client/source/class/qxapp/component/workbench/ServiceCatalog.js b/services/web/client/source/class/qxapp/component/workbench/ServiceCatalog.js
index 90ff9d159a4..8a204678291 100644
--- a/services/web/client/source/class/qxapp/component/workbench/ServiceCatalog.js
+++ b/services/web/client/source/class/qxapp/component/workbench/ServiceCatalog.js
@@ -293,25 +293,7 @@ qx.Class.define("qxapp.component.workbench.ServiceCatalog", {
     },
 
     __showServiceInfo: function() {
-      const selectedService = this.__getSelectedService();
-      const jsonTreeWidget = new qxapp.component.widget.JsonTreeWidget(selectedService, "serviceDescriptionCatalogue");
-      const win = new qx.ui.window.Window("Service info").set({
-        showMinimize: false,
-        showMaximize: false,
-        allowMaximize: false,
-        showStatusbar: false,
-        modal: true,
-        width: 550,
-        height: 550,
-        layout: new qx.ui.layout.Canvas(),
-        appearance: "service-window"
-      });
-      win.add(jsonTreeWidget, {
-        top: -30,
-        right: 0,
-        bottom: 0,
-        left: -60
-      });
+      const win = new qxapp.component.metadata.ServiceInfoWindow(this.__getSelectedService());
       win.center();
       win.open();
     },
diff --git a/services/web/client/source/class/qxapp/data/Converters.js b/services/web/client/source/class/qxapp/data/Converters.js
index 2335e510f4b..7b7395c8378 100644
--- a/services/web/client/source/class/qxapp/data/Converters.js
+++ b/services/web/client/source/class/qxapp/data/Converters.js
@@ -53,84 +53,85 @@ qx.Class.define("qxapp.data.Converters", {
       }
     },
 
-    __isLocationValid: function(locID) {
-      if (locID === 0 || locID === "0" ||
-        locID === 1 || locID === "1") {
-        return true;
-      }
-      return false;
-    },
-
     fromDSMToVirtualTreeModel: function(files) {
       let uuidToName = qxapp.utils.UuidToName.getInstance();
       let children = [];
       for (let i=0; i<files.length; i++) {
         const file = files[i];
-        if (this.__isLocationValid(file["location_id"])) {
-          let fileInTree = {
-            label: file["location"],
-            location: file["location_id"],
-            path: "",
-            children: []
-          };
-          if (file["location_id"] === 0 || file["location_id"] === "0") {
-            // simcore files
-            let splitted = file["file_uuid"].split("/");
-            if (splitted.length === 3) {
-              const prjId = splitted[0];
-              const nodeId = splitted[1];
-              const fileId = splitted[2];
-              let prjLabel = file["project_name"] === "" ? uuidToName.convertToName(prjId) : file["project_name"];
-              let nodeLabel = file["node_name"] === "" ? uuidToName.convertToName(nodeId) : file["node_name"];
-              let fileName = file["file_name"] === "" ? fileId : file["file_name"];
-              // node file
-              fileInTree.children.push({
-                label: prjLabel,
-                location: file["location_id"],
-                path: prjId,
-                children: [{
-                  label: nodeLabel,
-                  location: file["location_id"],
-                  path: prjId +"/"+ nodeId,
-                  children: [this.__createFileEntry(
+        let fileInTree = this.createDirEntry(
+          file["location"],
+          file["location_id"],
+          ""
+        );
+        if (file["location_id"] === 0 || file["location_id"] === "0") {
+          // simcore files
+          let splitted = file["file_uuid"].split("/");
+          if (splitted.length === 3) {
+            const prjId = splitted[0];
+            const nodeId = splitted[1];
+            const fileId = splitted[2];
+            let prjLabel = file["project_name"] === "" ? uuidToName.convertToName(prjId) : file["project_name"];
+            let nodeLabel = file["node_name"] === "" ? uuidToName.convertToName(nodeId) : file["node_name"];
+            let fileName = file["file_name"] === "" ? fileId : file["file_name"];
+            // node file
+            fileInTree.children.push(
+              this.createDirEntry(
+                prjLabel,
+                file["location_id"],
+                prjId,
+                [this.createDirEntry(
+                  nodeLabel,
+                  file["location_id"],
+                  prjId +"/"+ nodeId,
+                  [this.createFileEntry(
                     fileName,
                     file["location_id"],
                     file["file_uuid"],
-                    file["size"])
+                    file["last_modified"],
+                    file["file_size"])
                   ]
-                }]
-              });
-              this.__mergeFileTreeChildren(children, fileInTree);
-            }
-          } else if (file["location_id"] === 1 || file["location_id"] === "1") {
-            // datcore files
-            let parent = fileInTree;
-            let splitted = file["file_uuid"].split("/");
-            for (let j=0; j<splitted.length-1; j++) {
-              const newItem = {
-                label: splitted[j],
-                location: file["location_id"],
-                path: parent.path === "" ? splitted[j] : parent.path +"/"+ splitted[j],
-                children: []
-              };
-              parent.children.push(newItem);
-              parent = newItem;
-            }
-            let fileInfo = this.__createFileEntry(
-              splitted[splitted.length-1],
-              file["location_id"],
-              file["file_uuid"],
-              file["size"]);
-            parent.children.push(fileInfo);
+                )]
+              )
+            );
             this.__mergeFileTreeChildren(children, fileInTree);
           }
+        } else if (file["location_id"] === 1 || file["location_id"] === "1") {
+          // datcore files
+          let parent = fileInTree;
+          let splitted = file["file_uuid"].split("/");
+          for (let j=0; j<splitted.length-1; j++) {
+            const newItem = this.createDirEntry(
+              splitted[j],
+              file["location_id"],
+              parent.path === "" ? splitted[j] : parent.path +"/"+ splitted[j]
+            );
+            parent.children.push(newItem);
+            parent = newItem;
+          }
+          let fileInfo = this.createFileEntry(
+            splitted[splitted.length-1],
+            file["location_id"],
+            file["file_uuid"],
+            file["last_modified"],
+            file["file_size"]);
+          parent.children.push(fileInfo);
+          this.__mergeFileTreeChildren(children, fileInTree);
         }
       }
 
       return children;
     },
 
-    __createFileEntry: function(label, location, fileId, size) {
+    createDirEntry: function(label, location, path, children = []) {
+      return {
+        label,
+        location,
+        path,
+        children
+      };
+    },
+
+    createFileEntry: function(label, location, fileId, lastModified, size) {
       if (label === undefined) {
         label = "Unknown label";
       }
@@ -140,14 +141,18 @@ qx.Class.define("qxapp.data.Converters", {
       if (fileId === undefined) {
         fileId = "Unknown fileId";
       }
+      if (lastModified === undefined) {
+        lastModified = (Math.floor(Math.random()*1000000)+1).toString();
+      }
       if (size === undefined) {
         size = (Math.floor(Math.random()*1000000)+1).toString();
       }
       return {
-        label: label,
-        location: location,
-        fileId: fileId,
-        size: size
+        label,
+        location,
+        fileId,
+        lastModified,
+        size
       };
     },
 
@@ -213,22 +218,6 @@ qx.Class.define("qxapp.data.Converters", {
       return children;
     },
 
-    fromAPIListToVirtualTreeModel: function(listItems, showLeavesAsDirs = false) {
-      let children = [];
-      for (let i=0; i<listItems.length; i++) {
-        const listItem = listItems[i];
-        let item = {
-          key: listItem["key"],
-          label: listItem["label"]
-        };
-        if (showLeavesAsDirs) {
-          item["children"] = [];
-        }
-        children.push(item);
-      }
-      return children;
-    },
-
     fromAPIListToVirtualListModel: function(listItems) {
       let list = [];
       for (let i=0; i<listItems.length; i++) {
diff --git a/services/web/client/source/class/qxapp/data/Store.js b/services/web/client/source/class/qxapp/data/Store.js
index 8260f32dee5..cfe2e8736e2 100644
--- a/services/web/client/source/class/qxapp/data/Store.js
+++ b/services/web/client/source/class/qxapp/data/Store.js
@@ -40,13 +40,14 @@ qx.Class.define("qxapp.data.Store", {
   },
 
   events: {
-    "servicesRegistered": "qx.event.type.Event",
-    // "fakeFiles": "qx.event.type.Event",
-    "myDocuments": "qx.event.type.Event",
-    "nodeFiles": "qx.event.type.Event",
-    "presignedLink": "qx.event.type.Event",
-    "fileCopied": "qx.event.type.Event",
-    "deleteFile": "qx.event.type.Event"
+    "servicesRegistered": "qx.event.type.Data",
+    // "fakeFiles": "qx.event.type.Data",
+    "myLocations": "qx.event.type.Data",
+    "myDocuments": "qx.event.type.Data",
+    "nodeFiles": "qx.event.type.Data",
+    "presignedLink": "qx.event.type.Data",
+    "fileCopied": "qx.event.type.Data",
+    "deleteFile": "qx.event.type.Data"
   },
 
   members: {
@@ -1326,66 +1327,76 @@ qx.Class.define("qxapp.data.Store", {
         if (files && files.length>0) {
           this.fireDataEvent("nodeFiles", files);
         }
+        this.fireDataEvent("nodeFiles", []);
       }, this);
 
       reqFiles.addListener("fail", e => {
         const {
           error
         } = e.getTarget().getResponse();
+        this.fireDataEvent("nodeFiles", []);
         console.error("Failed getting Node Files list", error);
       });
 
       reqFiles.send();
     },
 
-    getMyDocuments: function() {
+    getMyLocations: function() {
       // Get available storage locations
       let reqLoc = new qxapp.io.request.ApiRequest("/storage/locations", "GET");
 
       reqLoc.addListener("success", eLoc => {
         const locations = eLoc.getTarget().getResponse()
           .data;
-        for (let i=0; i<locations.length; i++) {
-          const locationId = locations[i]["id"];
-          if (locationId === 1 && !qxapp.data.Permissions.getInstance().canDo("storage.datcore.read")) {
-            continue;
-          }
-          // Get list of file meta data
-          const endPoint = "/storage/locations/" + locationId + "/files/metadata";
-          const reqFiles = new qxapp.io.request.ApiRequest(endPoint, "GET");
+        this.fireDataEvent("myLocations", locations);
+      }, this);
 
-          reqFiles.addListener("success", eFiles => {
-            const files = eFiles.getTarget().getResponse()
-              .data;
-            console.log("My Files", files);
-            if (files && files.length>0) {
-              const data = {
-                location: locationId,
-                files: files
-              };
-              this.fireDataEvent("myDocuments", data);
-            }
-          }, this);
+      reqLoc.addListener("fail", e => {
+        const {
+          error
+        } = e.getTarget().getResponse();
+        this.fireDataEvent("myLocations", []);
+        console.error("Failed getting Storage Locations", error);
+      });
 
-          reqFiles.addListener("fail", e => {
-            const {
-              error
-            } = e.getTarget().getResponse();
-            console.error("Failed getting Files list", error);
-          });
+      reqLoc.send();
+    },
+
+    getFilesByLocation: function(locationId) {
+      if (locationId === 1 && !qxapp.data.Permissions.getInstance().canDo("storage.datcore.read")) {
+        return;
+      }
+      // Get list of file meta data
+      const endPoint = "/storage/locations/" + locationId + "/files/metadata";
+      const reqFiles = new qxapp.io.request.ApiRequest(endPoint, "GET");
 
-          reqFiles.send();
+      reqFiles.addListener("success", eFiles => {
+        const files = eFiles.getTarget().getResponse()
+          .data;
+        console.log("My Files", files);
+        const data = {
+          location: locationId,
+          files: []
+        };
+        if (files && files.length>0) {
+          data.files = files;
         }
+        this.fireDataEvent("myDocuments", data);
       }, this);
 
-      reqLoc.addListener("fail", e => {
+      reqFiles.addListener("fail", e => {
         const {
           error
         } = e.getTarget().getResponse();
-        console.error("Failed getting Storage Locations", error);
+        const data = {
+          location: locationId,
+          files: []
+        };
+        this.fireDataEvent("myDocuments", data);
+        console.error("Failed getting Files list", error);
       });
 
-      reqLoc.send();
+      reqFiles.send();
     },
 
     getPresignedLink: function(download = true, locationId, fileUuid) {
@@ -1445,9 +1456,11 @@ qx.Class.define("qxapp.data.Store", {
       let req = new qxapp.io.request.ApiRequest(endPoint, "PUT");
 
       req.addListener("success", e => {
-        const {
-          data
-        } = e.getTarget().getResponse();
+        const data = {
+          data: e.getTarget().getResponse(),
+          locationId: toLoc,
+          fileUuid: pathId + "/" + fileName
+        };
         this.fireDataEvent("fileCopied", data);
       }, this);
 
@@ -1457,6 +1470,7 @@ qx.Class.define("qxapp.data.Store", {
         } = e.getTarget().getResponse();
         console.error(error);
         console.error("Failed copying file", fileUuid, "to", pathId);
+        qxapp.component.message.FlashMessenger.getInstance().logAs(this.tr("Failed copying file"), "ERROR");
         this.fireDataEvent("fileCopied", null);
       });
 
@@ -1476,9 +1490,11 @@ qx.Class.define("qxapp.data.Store", {
       let req = new qxapp.io.request.ApiRequest(endPoint, "DELETE");
 
       req.addListener("success", e => {
-        const {
-          data
-        } = e.getTarget().getResponse();
+        const data = {
+          data: e.getTarget().getResponse(),
+          locationId: locationId,
+          fileUuid: fileUuid
+        };
         this.fireDataEvent("deleteFile", data);
       }, this);
 
@@ -1487,6 +1503,7 @@ qx.Class.define("qxapp.data.Store", {
           error
         } = e.getTarget().getResponse();
         console.error("Failed deleting file", error);
+        qxapp.component.message.FlashMessenger.getInstance().logAs(this.tr("Failed deleting file"), "ERROR");
         this.fireDataEvent("deleteFile", null);
       });
 
diff --git a/services/web/client/source/class/qxapp/data/model/Node.js b/services/web/client/source/class/qxapp/data/model/Node.js
index c5d43696612..dc2a95fd734 100644
--- a/services/web/client/source/class/qxapp/data/model/Node.js
+++ b/services/web/client/source/class/qxapp/data/model/Node.js
@@ -39,6 +39,7 @@
 
 qx.Class.define("qxapp.data.model.Node", {
   extend: qx.core.Object,
+  include: qx.locale.MTranslation,
 
   /**
     * @param workbench {qxapp.data.model.Workbench} workbench owning the widget the node
@@ -148,7 +149,8 @@ qx.Class.define("qxapp.data.model.Node", {
 
     serviceUrl: {
       check: "String",
-      nullable: true
+      nullable: true,
+      event: "changeServiceUrl"
     },
 
     iFrame: {
@@ -448,7 +450,7 @@ qx.Class.define("qxapp.data.model.Node", {
      * Add settings widget with those inputs that can be represented in a form
      *
      */
-    __addSetttings: function(inputs) {
+    __addSettings: function(inputs) {
       let form = this.__settingsForm = new qxapp.component.form.Auto(inputs, this);
       form.addListener("linkAdded", e => {
         let changedField = e.getData();
@@ -491,7 +493,7 @@ qx.Class.define("qxapp.data.model.Node", {
 
       let filteredInputs = this.__removeNonSettingInputs(inputs);
       filteredInputs = this.__addMapper(filteredInputs);
-      this.__addSetttings(filteredInputs);
+      this.__addSettings(filteredInputs);
     },
 
     __addOutputs: function(outputs) {
@@ -656,18 +658,14 @@ qx.Class.define("qxapp.data.model.Node", {
 
     startInteractiveNode: function() {
       if (this.isDynamic() && this.isRealService()) {
-        let retrieveBtn = new qx.ui.form.Button().set({
-          icon: "@FontAwesome5Solid/spinner/32"
-        });
+        const retrieveBtn = new qx.ui.toolbar.Button(this.tr("Retrieve"), "@FontAwesome5Solid/spinner/14");
         retrieveBtn.addListener("execute", e => {
           this.__retrieveInputs();
         }, this);
         retrieveBtn.setEnabled(false);
         this.setRetrieveIFrameButton(retrieveBtn);
 
-        let restartBtn = new qx.ui.form.Button().set({
-          icon: "@FontAwesome5Solid/redo-alt/32"
-        });
+        const restartBtn = new qx.ui.toolbar.Button(this.tr("Restart"), "@FontAwesome5Solid/redo-alt/14");
         restartBtn.addListener("execute", e => {
           this.restartIFrame();
         }, this);
@@ -690,25 +688,7 @@ qx.Class.define("qxapp.data.model.Node", {
       };
       this.fireDataEvent("showInLogger", msgData);
 
-      const interval = 50;
-      let increment = true;
-      let progressTimer = new qx.event.Timer(interval);
-      progressTimer.addListener("interval", () => {
-        if (this.getServiceUrl() === null) {
-          let newProgress = increment ? this.getProgress()+5 : this.getProgress()-5;
-          newProgress = Math.min(newProgress, 100);
-          newProgress = Math.max(newProgress, 0);
-          this.setProgress(newProgress);
-          if (newProgress === 100) {
-            increment = false;
-          } else if (newProgress === 0) {
-            increment = true;
-          }
-        } else {
-          progressTimer.stop();
-        }
-      }, this);
-      progressTimer.start();
+      this.setProgress(0);
 
       const prjId = this.getWorkbench().getStudy()
         .getUuid();
@@ -733,7 +713,6 @@ qx.Class.define("qxapp.data.model.Node", {
           msg: errorMsg
         };
         this.fireDataEvent("showInLogger", errorMsgData);
-        progressTimer.stop();
       }, this);
       request.addListener("fail", e => {
         const failMsg = "Failed starting " + metaData.key + ":" + metaData.version + ": " + e.getTarget().getResponse()["error"];
@@ -742,7 +721,6 @@ qx.Class.define("qxapp.data.model.Node", {
           msg: failMsg
         };
         this.fireDataEvent("showInLogger", failMsgData);
-        progressTimer.stop();
       }, this);
       request.send();
     },
diff --git a/services/web/client/source/class/qxapp/desktop/ControlsBar.js b/services/web/client/source/class/qxapp/desktop/ControlsBar.js
index 63d760ff828..a40186263bd 100644
--- a/services/web/client/source/class/qxapp/desktop/ControlsBar.js
+++ b/services/web/client/source/class/qxapp/desktop/ControlsBar.js
@@ -73,7 +73,7 @@ qx.Class.define("qxapp.desktop.ControlsBar", {
     },
 
     __createStartButton: function() {
-      let startButton = new qx.ui.toolbar.Button(this.tr("Run"), "@FontAwesome5Solid/play/16");
+      let startButton = new qx.ui.toolbar.Button(this.tr("Run"), "@FontAwesome5Solid/play/14");
 
       startButton.addListener("execute", () => {
         this.fireEvent("startPipeline");
@@ -83,7 +83,7 @@ qx.Class.define("qxapp.desktop.ControlsBar", {
     },
 
     __createStopButton: function() {
-      let stopButton = new qx.ui.toolbar.Button(this.tr("Stop"), "@FontAwesome5Solid/stop-circle/16");
+      let stopButton = new qx.ui.toolbar.Button(this.tr("Stop"), "@FontAwesome5Solid/stop-circle/14");
 
       stopButton.addListener("execute", () => {
         this.fireEvent("stopPipeline");
@@ -92,7 +92,7 @@ qx.Class.define("qxapp.desktop.ControlsBar", {
     },
 
     __createRetrieveButton: function() {
-      let retrieveBtn = new qx.ui.toolbar.Button(this.tr("Retrieve"), "@FontAwesome5Solid/spinner/16");
+      let retrieveBtn = new qx.ui.toolbar.Button(this.tr("Retrieve"), "@FontAwesome5Solid/spinner/14");
 
       retrieveBtn.addListener("execute", () => {
         this.fireEvent("retrieveInputs");
diff --git a/services/web/client/source/class/qxapp/desktop/DataManager.js b/services/web/client/source/class/qxapp/desktop/DataManager.js
index 6d96452b123..8b6e7bab19a 100644
--- a/services/web/client/source/class/qxapp/desktop/DataManager.js
+++ b/services/web/client/source/class/qxapp/desktop/DataManager.js
@@ -18,7 +18,7 @@
 /**
  * Widget that provides access to the data belonging to the active user.
  * - On the left side: myData FilesTree with the FileLabelWithActions
- * - On the right side: a pie chart reflecting the data resources consumed
+ * - On the right side: a pie chart reflecting the data resources consumed (hidden until there is real info)
  *
  * *Example*
  *
@@ -46,12 +46,12 @@ qx.Class.define("qxapp.desktop.DataManager", {
   },
 
   members: {
-    __tree: null,
+    __filesTree: null,
     __selectedFileLayout: null,
     __pieChart: null,
 
-    __initResources: function() {
-      this.__tree.populateTree();
+    __initResources: function(locationId = null) {
+      this.__filesTree.populateTree(null, locationId);
     },
 
     __createDataManagerLayout: function() {
@@ -89,8 +89,11 @@ qx.Class.define("qxapp.desktop.DataManager", {
         flex: 1
       });
 
-      const chartLayout = this.__createChartLayout();
-      dataManagerLayout.add(chartLayout);
+      const showPieChart = false;
+      if (showPieChart) {
+        const chartLayout = this.__createChartLayout();
+        dataManagerLayout.add(chartLayout);
+      }
 
       this._add(dataManagerMainLayout);
     },
@@ -98,7 +101,7 @@ qx.Class.define("qxapp.desktop.DataManager", {
     __createTreeLayout: function() {
       const treeLayout = new qx.ui.container.Composite(new qx.ui.layout.VBox(10));
 
-      const filesTree = this.__tree = new qxapp.file.FilesTree().set({
+      const filesTree = this.__filesTree = new qxapp.file.FilesTree().set({
         dragMechnism: true,
         dropMechnism: true,
         minHeight: 600
@@ -120,13 +123,15 @@ qx.Class.define("qxapp.desktop.DataManager", {
 
       const addBtn = new qxapp.file.FilesAdd();
       addBtn.addListener("fileAdded", e => {
-        this.__initResources();
+        const fileMetadata = e.getData();
+        this.__initResources(fileMetadata["locationId"]);
       }, this);
       treeLayout.add(addBtn);
 
       const selectedFileLayout = this.__selectedFileLayout = new qxapp.file.FileLabelWithActions();
-      selectedFileLayout.addListener("fileDeleted", () => {
-        this.__initResources();
+      selectedFileLayout.addListener("fileDeleted", e => {
+        const fileMetadata = e.getData();
+        this.__initResources(fileMetadata["locationId"]);
       }, this);
       treeLayout.add(selectedFileLayout);
 
@@ -162,8 +167,8 @@ qx.Class.define("qxapp.desktop.DataManager", {
     },
 
     __selectionChanged: function() {
-      this.__tree.resetSelection();
-      const selectionData = this.__tree.getSelectedFile();
+      this.__filesTree.resetSelection();
+      const selectionData = this.__filesTree.getSelectedFile();
       if (selectionData) {
         this.__selectedFileLayout.itemSelected(selectionData["selectedItem"], selectionData["isFile"]);
       }
@@ -183,7 +188,7 @@ qx.Class.define("qxapp.desktop.DataManager", {
 
     __getDataInfo: function(pathId) {
       const context = pathId || "/";
-      const children = this.__tree.getModel().getChildren();
+      const children = this.__filesTree.getModel().getChildren();
 
       let data = {
         "ids": [],
diff --git a/services/web/client/source/class/qxapp/desktop/PanelView.js b/services/web/client/source/class/qxapp/desktop/PanelView.js
index 94340ac1a5a..76cbba6c9a8 100644
--- a/services/web/client/source/class/qxapp/desktop/PanelView.js
+++ b/services/web/client/source/class/qxapp/desktop/PanelView.js
@@ -30,12 +30,15 @@ qx.Class.define("qxapp.desktop.PanelView", {
     this._setLayout(new qx.ui.layout.VBox());
 
     // Title bar
-    this.__titleBar = new qx.ui.container.Composite(new qx.ui.layout.HBox(5))
-      .set({
-        appearance: "panelview-titlebar"
-      });
+    this.__titleBar = new qx.ui.container.Composite(new qx.ui.layout.HBox(5).set({
+      alignY: "middle"
+    })).set({
+      appearance: "panelview-titlebar"
+    });
     this._add(this.__titleBar);
 
+    this.__caret = this.getChildControl("caret");
+
     // Set if coming in the constructor arguments
     if (title) {
       this.setTitle(title);
@@ -44,16 +47,13 @@ qx.Class.define("qxapp.desktop.PanelView", {
       this.setContent(content);
     }
 
-    // Transition effect
-    this.setDecorator("panelview");
-
     // Attach handlers
     this.__attachEventHandlers();
   },
 
   statics: {
-    MORE_CARET: "@MaterialIcons/expand_more/20",
-    LESS_CARET: "@MaterialIcons/expand_less/20"
+    MORE_CARET: "@MaterialIcons/expand_more/",
+    LESS_CARET: "@MaterialIcons/expand_less/"
   },
 
   properties: {
@@ -79,6 +79,18 @@ qx.Class.define("qxapp.desktop.PanelView", {
       init: false,
       check: "Boolean",
       apply: "_applySideCollapsed"
+    },
+
+    appearance: {
+      init: "panelview",
+      refine: true
+    },
+
+    caretSize: {
+      init: 20,
+      nullable: false,
+      check: "Integer",
+      apply: "_applyCaretSize"
     }
   },
 
@@ -89,6 +101,25 @@ qx.Class.define("qxapp.desktop.PanelView", {
     __innerContainer: null,
     __containerHeight: null,
     __layoutFlex: null,
+    __minHeight: null,
+    __contentMinHeight: null,
+
+    _createChildControlImpl: function(id) {
+      let control;
+      switch (id) {
+        case "title":
+          control = new qx.ui.basic.Atom(this.getTitle());
+          this.__titleBar.addAt(control, 0);
+          break;
+        case "caret":
+          control = new qx.ui.basic.Image(this.__getCaretId(this.getCollapsed())).set({
+            visibility: "excluded"
+          });
+          this.__titleBar.addAt(control, 1);
+          break;
+      }
+      return control || this.base(arguments, id);
+    },
 
     toggleCollapsed: function() {
       this.setCollapsed(!this.getCollapsed());
@@ -100,18 +131,30 @@ qx.Class.define("qxapp.desktop.PanelView", {
 
     _applyCollapsed: function(collapsed) {
       if (this.getContent()) {
-        this.__caret.setSource(collapsed ? this.self().MORE_CARET : this.self().LESS_CARET);
+        this.__caret.setSource(this.__getCaretId(collapsed));
         if (collapsed) {
+          this.__minHeight = this.getMinHeight();
+          if (this.getContent()) {
+            this.__contentMinHeight = this.getContent().getMinHeight();
+            this.getContent().setMinHeight(0);
+          }
+          this.setMinHeight(0);
           if (this.getLayoutProperties().flex) {
             this.__layoutFlex = this.getLayoutProperties().flex;
             this.setLayoutProperties({
               flex: 0
             });
           }
-        } else if (this.__layoutFlex) {
-          this.setLayoutProperties({
-            flex: this.__layoutFlex
-          });
+        } else {
+          this.setMinHeight(this.__minHeight);
+          if (this.getContent()) {
+            this.getContent().setMinHeight(this.__contentMinHeight);
+          }
+          if (this.__layoutFlex) {
+            this.setLayoutProperties({
+              flex: this.__layoutFlex
+            });
+          }
         }
         this.__innerContainer.setHeight(collapsed ? 0 : this.__containerHeight);
       }
@@ -140,38 +183,40 @@ qx.Class.define("qxapp.desktop.PanelView", {
       }
 
       this.__innerContainer.removeAll();
-      content.setMinHeight(0);
       this.__innerContainer.add(content);
+      this.__innerContainer.setHeight(this.getCollapsed() ? 0 : this.__containerHeight);
 
-      if (this.__caret === null) {
-        this.__caret = new qx.ui.basic.Image(this.getCollapsed() ? this.self().MORE_CARET : this.self().LESS_CARET).set({
-          marginTop: 2
-        });
-        this.__titleBar.add(this.__caret);
+      if (content) {
+        this.__caret.show();
+      } else {
+        this.__caret.exclude();
       }
     },
 
     _applyTitle: function(title) {
-      if (this.__titleLabel) {
-        this.__titleLabel.setValue(title);
-      } else {
-        this.__titleLabel = new qx.ui.basic.Label(title)
-          .set({
-            appearance: "panelview-titlebar-label",
-            font: "title-14"
-          });
-        this.__titleBar.add(this.__titleLabel);
-      }
+      this.__titleLabel = this.getChildControl("title");
+      this.__titleLabel.setLabel(title);
+    },
+
+    _applySideCollapsed: function(sideCollapse, old) {
+      this.setCollapsed(sideCollapse);
+    },
+
+    _applyCaretSize: function(size) {
+      this.__caret.setSource(this.__getCaretId(this.getCollapsed()));
+    },
+
+    __getCaretId: function(collapsed) {
+      const caretSize = this.getCaretSize();
+      const moreCaret = this.self().MORE_CARET;
+      const lessCaret = this.self().LESS_CARET;
+      return collapsed ? moreCaret + caretSize : lessCaret + caretSize;
     },
 
     __attachEventHandlers: function() {
       this.__titleBar.addListener("tap", () => {
         this.toggleCollapsed();
       }, this);
-    },
-
-    _applySideCollapsed: function(sideCollapse, old) {
-      this.setCollapsed(sideCollapse);
     }
   }
 
diff --git a/services/web/client/source/class/qxapp/desktop/ServiceBrowser.js b/services/web/client/source/class/qxapp/desktop/ServiceBrowser.js
index 3ed1c43e59b..4af6041c200 100644
--- a/services/web/client/source/class/qxapp/desktop/ServiceBrowser.js
+++ b/services/web/client/source/class/qxapp/desktop/ServiceBrowser.js
@@ -42,8 +42,7 @@ qx.Class.define("qxapp.desktop.ServiceBrowser", {
   construct: function() {
     this.base(arguments);
 
-    const prjBrowserLayout = new qx.ui.layout.VBox(10);
-    this._setLayout(prjBrowserLayout);
+    this._setLayout(new qx.ui.layout.HBox(10));
 
     const iframe = qxapp.utils.Utils.createLoadingIFrame(this.tr("Services"));
     this._add(iframe, {
@@ -87,17 +86,13 @@ qx.Class.define("qxapp.desktop.ServiceBrowser", {
     },
 
     __createServicesLayout: function() {
-      const servicesLayout = new qx.ui.container.Composite(new qx.ui.layout.HBox(20));
-
       const servicesList = this.__createServicesList();
-      servicesLayout.add(servicesList);
+      this._add(servicesList);
 
       const serviceDescription = this.__createServiceDescription();
-      servicesLayout.add(serviceDescription, {
+      this._add(serviceDescription, {
         flex: 1
       });
-
-      this._add(servicesLayout);
     },
 
     __createServicesList: function() {
@@ -109,7 +104,6 @@ qx.Class.define("qxapp.desktop.ServiceBrowser", {
       const servicesList = this.__servicesList = new qx.ui.form.List().set({
         orientation: "vertical",
         minWidth: 500,
-        height: 600,
         appearance: "pb-list"
       });
       servicesList.addListener("changeSelection", e => {
@@ -146,7 +140,9 @@ qx.Class.define("qxapp.desktop.ServiceBrowser", {
           ctrl.bindProperty("contact", "contact", null, item, id);
         }
       });
-      servicesLayout.add(servicesList);
+      servicesLayout.add(servicesList, {
+        flex: 1
+      });
 
       // Workaround to the list.changeSelection
       servCtrl.addListener("changeValue", e => {
@@ -234,8 +230,8 @@ qx.Class.define("qxapp.desktop.ServiceBrowser", {
     __updateServiceDescription: function(selectedService) {
       const serviceDescription = this.__serviceDescription;
       if (selectedService && serviceDescription) {
-        let jsonTreeWidget = new qxapp.component.widget.JsonTreeWidget(selectedService, "serviceDescription");
-        serviceDescription.add(jsonTreeWidget);
+        const serviceInfo = new qxapp.component.metadata.ServiceInfo(selectedService);
+        serviceDescription.add(serviceInfo);
       }
     },
 
diff --git a/services/web/client/source/class/qxapp/desktop/StudyBrowser.js b/services/web/client/source/class/qxapp/desktop/StudyBrowser.js
index 4b721e2d5a8..68148910f92 100644
--- a/services/web/client/source/class/qxapp/desktop/StudyBrowser.js
+++ b/services/web/client/source/class/qxapp/desktop/StudyBrowser.js
@@ -389,13 +389,6 @@ qx.Class.define("qxapp.desktop.StudyBrowser", {
       return list;
     },
 
-    __uuidToNumber: function(uuid) {
-      const nThumbnails = 25;
-      const lastCharacters = uuid.substr(uuid.length-10);
-      const aNumber = parseInt(lastCharacters, 16);
-      return aNumber%nThumbnails;
-    },
-
     /**
      * Delegates appearance and binding of each study item
      */
@@ -447,8 +440,7 @@ qx.Class.define("qxapp.desktop.StudyBrowser", {
                 if (data) {
                   return data;
                 }
-                const thumbnailId = that.__uuidToNumber(uuid); // eslint-disable-line no-underscore-dangle
-                return "qxapp/img"+ thumbnailId +".jpg";
+                return qxapp.utils.Utils.getThumbnailFromUuid(uuid);
               }
               return "@FontAwesome5Solid/plus-circle/80";
             }
diff --git a/services/web/client/source/class/qxapp/desktop/StudyEditor.js b/services/web/client/source/class/qxapp/desktop/StudyEditor.js
index d679e3936cf..ca1a140f632 100644
--- a/services/web/client/source/class/qxapp/desktop/StudyEditor.js
+++ b/services/web/client/source/class/qxapp/desktop/StudyEditor.js
@@ -72,7 +72,7 @@ qx.Class.define("qxapp.desktop.StudyEditor", {
     __sidePanel: null,
     __scrollContainer: null,
     __workbenchUI: null,
-    __treeView: null,
+    __nodesTree: null,
     __extraView: null,
     __loggerView: null,
     __nodeView: null,
@@ -89,7 +89,7 @@ qx.Class.define("qxapp.desktop.StudyEditor", {
     initDefault: function() {
       const study = this.getStudy();
 
-      const treeView = this.__treeView = new qxapp.component.widget.NodesTree(study.getName(), study.getWorkbench());
+      const treeView = this.__nodesTree = new qxapp.component.widget.NodesTree(study.getName(), study.getWorkbench());
       treeView.addListener("addNode", () => {
         this.__addNode();
       }, this);
@@ -99,10 +99,8 @@ qx.Class.define("qxapp.desktop.StudyEditor", {
       }, this);
       this.__sidePanel.addOrReplaceAt(new qxapp.desktop.PanelView(this.tr("Service tree"), treeView), 0);
 
-      const extraView = this.__extraView = new qx.ui.container.Composite(new qx.ui.layout.Canvas());
-      this.__sidePanel.addOrReplaceAt(new qxapp.desktop.PanelView(this.tr("Overview"), extraView).set({
-        collapsed: true
-      }), 1);
+      const extraView = this.__extraView = new qxapp.component.metadata.StudyInfo(study);
+      this.__sidePanel.addOrReplaceAt(new qxapp.desktop.PanelView(this.tr("Study information"), extraView), 1);
 
       const loggerView = this.__loggerView = new qxapp.component.widget.logger.LoggerView(study.getWorkbench());
       this.__sidePanel.addOrReplaceAt(new qxapp.desktop.PanelView(this.tr("Logger"), loggerView), 2);
@@ -168,7 +166,7 @@ qx.Class.define("qxapp.desktop.StudyEditor", {
       }, this);
 
       [
-        this.__treeView,
+        this.__nodesTree,
         this.__workbenchUI
       ].forEach(wb => {
         wb.addListener("nodeDoubleClicked", e => {
@@ -178,7 +176,7 @@ qx.Class.define("qxapp.desktop.StudyEditor", {
       });
 
       const workbenchUI = this.__workbenchUI;
-      const treeView = this.__treeView;
+      const treeView = this.__nodesTree;
       treeView.addListener("changeSelectedNode", e => {
         const node = workbenchUI.getNodeUI(e.getData());
         if (node && node.classname.includes("NodeUI")) {
@@ -235,8 +233,6 @@ qx.Class.define("qxapp.desktop.StudyEditor", {
         }
       }
 
-      this.__switchExtraView(nodeId);
-
       this.__treeView.nodeSelected(nodeId, openNodeAndParents);
       this.__loggerView.setCurrentNodeId(nodeId);
     },
@@ -269,38 +265,6 @@ qx.Class.define("qxapp.desktop.StudyEditor", {
       return widget;
     },
 
-    __switchExtraView: function(nodeId) {
-      // Show screenshots in the ExtraView
-      if (nodeId === "root") {
-        this.showScreenshotInExtraView("workbench");
-      } else {
-        const node = this.getStudy().getWorkbench().getNode(nodeId);
-        if (node.isContainer()) {
-          if (node.isInKey("multi-plot")) {
-            this.showScreenshotInExtraView("multi-plot");
-          } else {
-            this.showScreenshotInExtraView("container");
-          }
-        } else if (node.isInKey("file-picker")) {
-          this.showScreenshotInExtraView("file-picker");
-        } else if (node.isInKey("modeler")) {
-          this.showScreenshotInExtraView("modeler");
-        } else if (node.isInKey("3d-viewer")) {
-          this.showScreenshotInExtraView("postpro");
-        } else if (node.isInKey("viewer")) {
-          this.showScreenshotInExtraView("notebook");
-        } else if (node.isInKey("jupyter")) {
-          this.showScreenshotInExtraView("notebook");
-        } else if (node.isInKey("Grid")) {
-          this.showScreenshotInExtraView("grid");
-        } else if (node.isInKey("Voxel")) {
-          this.showScreenshotInExtraView("voxels");
-        } else {
-          this.showScreenshotInExtraView("form");
-        }
-      }
-    },
-
     __addNode: function() {
       if (this.__mainPanel.getMainView() !== this.__workbenchUI) {
         return;
@@ -335,8 +299,8 @@ qx.Class.define("qxapp.desktop.StudyEditor", {
     },
 
     __workbenchChanged: function() {
-      this.__treeView.populateTree();
-      this.__treeView.nodeSelected(this.__currentNodeId);
+      this.__nodesTree.populateTree();
+      this.__nodesTree.nodeSelected(this.__currentNodeId);
     },
 
     showInMainView: function(widget, nodeId) {
@@ -371,27 +335,6 @@ qx.Class.define("qxapp.desktop.StudyEditor", {
       this.fireDataEvent("changeMainViewCaption", nodesPath);
     },
 
-    showInExtraView: function(widget) {
-      this.__sidePanel.addOrReplaceAt(new qxapp.desktop.PanelView(this.tr("Overview"), widget).set({
-        collapsed: true
-      }), 1);
-    },
-
-    showScreenshotInExtraView: function(name) {
-      let imageWidget = new qx.ui.basic.Image("qxapp/screenshot_" + name + ".png").set({
-        scale: true,
-        allowShrinkX: true,
-        allowShrinkY: true
-      });
-      const container = new qx.ui.container.Composite(new qx.ui.layout.Grow()).set({
-        height: 300
-      });
-      container.add(imageWidget);
-      this.__sidePanel.addOrReplaceAt(new qxapp.desktop.PanelView(this.tr("Overview"), container).set({
-        collapsed: true
-      }), 1);
-    },
-
     getLogger: function() {
       return this.__loggerView;
     },
diff --git a/services/web/client/source/class/qxapp/file/FileLabelWithActions.js b/services/web/client/source/class/qxapp/file/FileLabelWithActions.js
index ba113efd8fe..346113cc1ae 100644
--- a/services/web/client/source/class/qxapp/file/FileLabelWithActions.js
+++ b/services/web/client/source/class/qxapp/file/FileLabelWithActions.js
@@ -137,6 +137,10 @@ qx.Class.define("qxapp.file.FileLabelWithActions", {
         console.log("Delete ", selection);
         const fileId = selection.getFileId();
         const locationId = selection.getLocation();
+        if (locationId !== 0 && locationId !== "0") {
+          qxapp.component.message.FlashMessenger.getInstance().logAs(this.tr("Only files in simcore.s3 can be deleted"));
+          return false;
+        }
         let store = qxapp.data.Store.getInstance();
         store.addListenerOnce("deleteFile", e => {
           if (e) {
diff --git a/services/web/client/source/class/qxapp/file/FilePicker.js b/services/web/client/source/class/qxapp/file/FilePicker.js
index 05c6f860a11..a3e8b788ae0 100644
--- a/services/web/client/source/class/qxapp/file/FilePicker.js
+++ b/services/web/client/source/class/qxapp/file/FilePicker.js
@@ -52,10 +52,10 @@ qx.Class.define("qxapp.file.FilePicker", {
     let filePickerLayout = new qx.ui.layout.VBox(10);
     this._setLayout(filePickerLayout);
 
-    let tree = this.__tree = this._createChildControlImpl("filesTree");
-    tree.addListener("selectionChanged", this.__selectionChanged, this);
-    tree.addListener("itemSelected", this.__itemSelected, this);
-    tree.addListener("modelChanged", this.__modelChanged, this);
+    let filesTree = this.__filesTree = this._createChildControlImpl("filesTree");
+    filesTree.addListener("selectionChanged", this.__selectionChanged, this);
+    filesTree.addListener("itemSelected", this.__itemSelected, this);
+    filesTree.addListener("modelChanged", this.__modelChanged, this);
 
     const toolbar = new qx.ui.toolbar.ToolBar();
     const mainButtons = this.__mainButtons = new qx.ui.toolbar.Part();
@@ -66,11 +66,11 @@ qx.Class.define("qxapp.file.FilePicker", {
 
     let addBtn = this._createChildControlImpl("addButton");
     addBtn.addListener("fileAdded", e => {
-      const data = e.getData();
-      if ("location" in data && "path" in data) {
-        this.__setOutputFile(data["location"], data["path"]);
+      const fileMetadata = e.getData();
+      if ("location" in fileMetadata && "path" in fileMetadata) {
+        this.__setOutputFile(fileMetadata["location"], fileMetadata["path"]);
       }
-      this.__initResources();
+      this.__initResources(fileMetadata["location"]);
     }, this);
 
     let selectBtn = this.__selectBtn = this._createChildControlImpl("selectButton");
@@ -98,7 +98,7 @@ qx.Class.define("qxapp.file.FilePicker", {
   },
 
   members: {
-    __tree: null,
+    __filesTree: null,
     __selectBtn: null,
     __mainButtons: null,
 
@@ -127,17 +127,17 @@ qx.Class.define("qxapp.file.FilePicker", {
       return control || this.base(arguments, id);
     },
 
-    __initResources: function() {
-      this.__tree.populateTree();
+    __initResources: function(locationId = null) {
+      this.__filesTree.populateTree(null, locationId);
     },
 
     __selectionChanged: function() {
-      const data = this.__tree.getSelectedFile();
+      const data = this.__filesTree.getSelectedFile();
       this.__selectBtn.setEnabled(data ? data["isFile"] : false);
     },
 
     __itemSelected: function() {
-      const data = this.__tree.getSelectedFile();
+      const data = this.__filesTree.getSelectedFile();
       if (data && data["isFile"]) {
         const selectedItem = data["selectedItem"];
         const outputFile = this.__getOutputFile();
@@ -173,8 +173,8 @@ qx.Class.define("qxapp.file.FilePicker", {
     __checkSelectedFileIsListed: function() {
       const outFile = this.__getOutputFile();
       if (outFile && "value" in outFile && "path" in outFile.value) {
-        this.__tree.setSelectedFile(outFile.value.path);
-        this.__tree.fireEvent("selectionChanged");
+        this.__filesTree.setSelectedFile(outFile.value.path);
+        this.__filesTree.fireEvent("selectionChanged");
       }
     }
   }
diff --git a/services/web/client/source/class/qxapp/file/FileTreeItem.js b/services/web/client/source/class/qxapp/file/FileTreeItem.js
index 5dfdf35ddca..f5a5c7e7afe 100644
--- a/services/web/client/source/class/qxapp/file/FileTreeItem.js
+++ b/services/web/client/source/class/qxapp/file/FileTreeItem.js
@@ -40,37 +40,55 @@
  */
 
 qx.Class.define("qxapp.file.FileTreeItem", {
-  extend : qx.ui.tree.VirtualTreeItem,
+  extend: qx.ui.tree.VirtualTreeItem,
 
-  properties : {
-    fileId : {
-      check : "String",
+  construct: function() {
+    this.base(arguments);
+
+    // create a date format like "Oct. 19, 2018 11:31 AM"
+    this._dateFormat = new qx.util.format.DateFormat(
+      qx.locale.Date.getDateFormat("medium") + " " +
+      qx.locale.Date.getTimeFormat("short")
+    );
+  },
+
+  properties: {
+    fileId: {
+      check: "String",
       event: "changeFileId",
-      nullable : true
+      nullable: true
     },
 
-    path : {
-      check : "String",
+    path: {
+      check: "String",
       event: "changePath",
-      nullable : true
+      nullable: true
     },
 
-    location : {
-      check : "String",
+    location: {
+      check: "String",
       event: "changePath",
-      nullable : true
+      nullable: true
+    },
+
+    lastModified: {
+      check: "String",
+      event: "changeLastModified",
+      nullable: true
     },
 
-    size : {
-      check : "String",
+    size: {
+      check: "String",
       event: "changeSize",
-      nullable : true
+      nullable: true
     }
   },
 
-  members : {
+  members: { // eslint-disable-line qx-rules/no-refs-in-members
+    _dateFormat: null,
+
     // overridden
-    _addWidgets : function() {
+    _addWidgets: function() {
       // Here's our indentation and tree-lines
       this.addSpacer();
       this.addOpenButton();
@@ -86,8 +104,26 @@ qx.Class.define("qxapp.file.FileTreeItem", {
         flex: 1
       });
 
+      // Add lastModified
+      const lastModifiedWidget = new qx.ui.basic.Label().set({
+        width: 120,
+        maxWidth: 120,
+        textAlign: "right"
+      });
+      let that = this;
+      this.bind("lastModified", lastModifiedWidget, "value", {
+        converter: function(value) {
+          if (value === null) {
+            return "";
+          }
+          const date = new Date(value);
+          return that._dateFormat.format(date); // eslint-disable-line no-underscore-dangle
+        }
+      });
+      this.addWidget(lastModifiedWidget);
+
       // Add size
-      var sizeWidget = new qx.ui.basic.Label().set({
+      const sizeWidget = new qx.ui.basic.Label().set({
         width: 70,
         maxWidth: 70,
         textAlign: "right"
@@ -126,5 +162,10 @@ qx.Class.define("qxapp.file.FileTreeItem", {
         this.addWidget(fileIdWidget);
       }
     }
+  },
+
+  destruct: function() {
+    this._dateFormat.dispose();
+    this._dateFormat = null;
   }
 });
diff --git a/services/web/client/source/class/qxapp/file/FilesTree.js b/services/web/client/source/class/qxapp/file/FilesTree.js
index 663ae18f731..5b952ea0f2c 100644
--- a/services/web/client/source/class/qxapp/file/FilesTree.js
+++ b/services/web/client/source/class/qxapp/file/FilesTree.js
@@ -72,7 +72,7 @@ qx.Class.define("qxapp.file.FilesTree", {
   events: {
     "selectionChanged": "qx.event.type.Event",
     "itemSelected": "qx.event.type.Event",
-    "fileCopied": "qx.event.type.Event",
+    "fileCopied": "qx.event.type.Data",
     "modelChanged": "qx.event.type.Event"
   },
 
@@ -97,12 +97,12 @@ qx.Class.define("qxapp.file.FilesTree", {
   },
 
   members: {
-    __tree: null,
-
-    populateTree: function(nodeId = null) {
+    populateTree: function(nodeId = null, locationId = null) {
       let filesTreePopulator = new qxapp.file.FilesTreePopulator(this);
       if (nodeId) {
         filesTreePopulator.populateNodeFiles(nodeId);
+      } else if (locationId) {
+        filesTreePopulator.populateMyLocation(locationId);
       } else {
         filesTreePopulator.populateMyData();
       }
@@ -131,6 +131,36 @@ qx.Class.define("qxapp.file.FilesTree", {
       return null;
     },
 
+    addFileEntry: function(uuid) {
+      const dummyFileEntry = {
+        "bucket_name": "MyFile",
+        "created_at": "2019-07-03T10:01:03.471071Z",
+        "display_file_path": "MyFile/testing/Hallo.csv",
+        "file_id": "N:package:7b5637d5-da2e-49fc-9c54-75b5c6acf166",
+        "file_name": "Hallo.csv",
+        "file_size": 398,
+        "file_uuid": "MyFile/testing/Hallo.csv",
+        "last_modified": "2019-07-03T10:01:04.057912Z",
+        "location": "datcore",
+        "location_id": 1,
+        "node_id": null,
+        "node_name": null,
+        "object_name": "testing/Hallo.csv",
+        "project_id": null,
+        "project_name": null,
+        "raw_file_path": "MyFile/testing/Hallo.csv",
+        "user_id": null,
+        "user_name": null
+      };
+
+      let filesTreePopulator = new qxapp.file.FilesTreePopulator(this);
+      filesTreePopulator.addFileEntryToTree(dummyFileEntry);
+      const item = this.__findUuidInLeaves(dummyFileEntry["file_uuid"]);
+      if (item) {
+        this.openNodeAndParents(item);
+      }
+    },
+
     __getLeafList: function(item, leaves) {
       if (item.getChildren == null) { // eslint-disable-line no-eq-null
         leaves.push(item);
diff --git a/services/web/client/source/class/qxapp/file/FilesTreePopulator.js b/services/web/client/source/class/qxapp/file/FilesTreePopulator.js
index 8380ee98bf0..4d2f1e296c5 100644
--- a/services/web/client/source/class/qxapp/file/FilesTreePopulator.js
+++ b/services/web/client/source/class/qxapp/file/FilesTreePopulator.js
@@ -23,7 +23,7 @@
  * Here is a little example of how to use the widget.
  *
  * <pre class='javascript'>
- *   let filesTreePopulator = new qxapp.file.FilesTreePopulator(tree);
+ *   const filesTreePopulator = new qxapp.file.FilesTreePopulator(tree);
  *   filesTreePopulator.populateNodeFiles(nodeId);
  * </pre>
  */
@@ -35,17 +35,42 @@ qx.Class.define("qxapp.file.FilesTreePopulator", {
     this.__tree = tree;
   },
 
+  statics: {
+    addLoadingChild: function(parent) {
+      const loadingData = {
+        label: "Loading...",
+        location: null,
+        path: null,
+        icon: "qxapp/loading.gif"
+      };
+      const loadingModel = qx.data.marshal.Json.createModel(loadingData, true);
+      parent.getChildren().append(loadingModel);
+    },
+
+    removeLoadingChild: function(parent) {
+      for (let i = parent.getChildren().length - 1; i >= 0; i--) {
+        if (parent.getChildren().toArray()[i].getLabel() === "Loading...") {
+          parent.getChildren().toArray()
+            .splice(i, 1);
+        }
+      }
+    }
+  },
+
   members: {
     __tree: null,
 
     populateNodeFiles: function(nodeId) {
       const treeName = "Node files";
       this.__resetTree(treeName);
+      const rootModel = this.__tree.getModel();
+      qxapp.file.FilesTreePopulator.addLoadingChild(rootModel);
 
-      let store = qxapp.data.Store.getInstance();
+      const store = qxapp.data.Store.getInstance();
       store.addListenerOnce("nodeFiles", e => {
         const files = e.getData();
-        this.__filesToTree(files);
+        const newChildren = qxapp.data.Converters.fromDSMToVirtualTreeModel(files);
+        this.__filesToRoot(newChildren);
       }, this);
       store.getNodeFiles(nodeId);
     },
@@ -53,33 +78,61 @@ qx.Class.define("qxapp.file.FilesTreePopulator", {
     populateMyData: function() {
       const treeName = "My Data";
       this.__resetTree(treeName);
+      const rootModel = this.__tree.getModel();
+      rootModel.getChildren().removeAll();
+      qxapp.file.FilesTreePopulator.addLoadingChild(rootModel);
+
+      const store = qxapp.data.Store.getInstance();
+      store.addListenerOnce("myLocations", e => {
+        const locations = e.getData();
+        this.__locationsToRoot(locations);
+
+        for (let i=0; i<locations.length; i++) {
+          const locationId = locations[i]["id"];
+          this.populateMyLocation(locationId);
+        }
+      }, this);
+      store.getMyLocations();
+    },
 
-      let locationsAdded = [];
-      let store = qxapp.data.Store.getInstance();
-      store.addListener("myDocuments", e => {
+    populateMyLocation: function(locationId = null) {
+      if (locationId) {
+        const locationModel = this.__getLocationModel(locationId);
+        if (locationModel) {
+          locationModel.getChildren().removeAll();
+          qxapp.file.FilesTreePopulator.addLoadingChild(locationModel);
+        }
+      }
+
+      const store = qxapp.data.Store.getInstance();
+      store.addListener("myDocuments", ev => {
         const {
           location,
           files
-        } = e.getData();
-        if (!locationsAdded.includes(location)) {
-          locationsAdded.push(location);
-          this.__filesToTree(files);
-        }
+        } = ev.getData();
+        this.__filesToLocation(files, location);
       }, this);
-      store.getMyDocuments();
+
+      store.getFilesByLocation(locationId);
+    },
+
+    addFileEntryToTree: function(fileEntry) {
+      const filesData = qxapp.data.Converters.fromDSMToVirtualTreeModel([fileEntry]);
+      this.__fileToTree(filesData[0]);
     },
 
     __resetTree: function(treeName) {
       // FIXME: It is not reseting the model
       this.__tree.resetModel();
-      let data = {
+      const rootData = {
         label: treeName,
         location: null,
         path: null,
         children: []
       };
-      let emptyModel = qx.data.marshal.Json.createModel(data, true);
-      this.__tree.setModel(emptyModel);
+      const root = qx.data.marshal.Json.createModel(rootData, true);
+
+      this.__tree.setModel(root);
       this.__tree.setDelegate({
         createItem: () => new qxapp.file.FileTreeItem(),
         bindItem: (c, item, id) => {
@@ -87,22 +140,87 @@ qx.Class.define("qxapp.file.FilesTreePopulator", {
           c.bindProperty("fileId", "fileId", null, item, id);
           c.bindProperty("location", "location", null, item, id);
           c.bindProperty("path", "path", null, item, id);
+          c.bindProperty("lastModified", "lastModified", null, item, id);
           c.bindProperty("size", "size", null, item, id);
+          c.bindProperty("icon", "icon", null, item, id);
         }
       });
     },
 
-    __filesToTree: function(files) {
-      const newChildren = qxapp.data.Converters.fromDSMToVirtualTreeModel(files);
-      this.__addTreeData(newChildren);
+    __getLocationModel: function(locationId) {
+      const rootModel = this.__tree.getModel();
+      const locationModels = rootModel.getChildren();
+      for (let i=0; i<locationModels.length; i++) {
+        const locationModel = locationModels.toArray()[i];
+        if (locationModel.getLocation() === locationId || String(locationModel.getLocation()) === locationId) {
+          return locationModel;
+        }
+      }
+      return null;
+    },
+
+    __locationsToRoot: function(locations) {
+      const rootModel = this.__tree.getModel();
+      rootModel.getChildren().removeAll();
+      for (let i=0; i<locations.length; i++) {
+        const location = locations[i];
+        const locationData = qxapp.data.Converters.createDirEntry(
+          location.name,
+          location.id,
+          ""
+        );
+        const locationModel = qx.data.marshal.Json.createModel(locationData, true);
+        rootModel.getChildren().append(locationModel);
+      }
+    },
+
+    __filesToLocation: function(files, locationId) {
+      const locationModel = this.__getLocationModel(locationId);
+      if (locationModel) {
+        locationModel.getChildren().removeAll();
+        if (files.length>0) {
+          const filesData = qxapp.data.Converters.fromDSMToVirtualTreeModel(files);
+          for (let j=0; j<filesData[0].children.length; j++) {
+            const filesModel = qx.data.marshal.Json.createModel(filesData[0].children[j], true);
+            locationModel.getChildren().append(filesModel);
+          }
+        }
+      }
     },
 
-    __addTreeData: function(data) {
-      let newModelToAdd = qx.data.marshal.Json.createModel(data, true);
-      let currentModel = this.__tree.getModel();
+    __filesToRoot: function(data) {
+      const currentModel = this.__tree.getModel();
+      qxapp.file.FilesTreePopulator.removeLoadingChild(currentModel);
+
+      const newModelToAdd = qx.data.marshal.Json.createModel(data, true);
       currentModel.getChildren().append(newModelToAdd);
       this.__tree.setModel(currentModel);
       this.__tree.fireEvent("modelChanged");
+    },
+
+    __fileToTree: function(data) {
+      if ("location" in data) {
+        const locationModel = this.__getLocationModel(data["location"]);
+        if (locationModel && "children" in data && data["children"].length>0) {
+          this.__addRecursively(locationModel.getChildren(), data["children"][0]);
+        }
+      }
+    },
+
+    __addRecursively: function(one, two) {
+      let newDir = true;
+      const oneArray = one.toArray();
+      for (let i=0; i<oneArray.length; i++) {
+        if ("getPath" in oneArray[i] && oneArray[i].getPath() === two.path) {
+          newDir = false;
+          if ("children" in two) {
+            this.__addRecursively(oneArray[i].getChildren(), two.children[0]);
+          }
+        }
+      }
+      if (oneArray.length === 0 || "fileId" in two || newDir) {
+        one.append(qx.data.marshal.Json.createModel(two, true));
+      }
     }
   }
 });
diff --git a/services/web/client/source/class/qxapp/statics/NodeStatics.js b/services/web/client/source/class/qxapp/statics/NodeStatics.js
new file mode 100644
index 00000000000..9c2bbebcc42
--- /dev/null
+++ b/services/web/client/source/class/qxapp/statics/NodeStatics.js
@@ -0,0 +1,53 @@
+/*
+ * oSPARC - The SIMCORE frontend - https://osparc.io
+ * Copyright: 2019 IT'IS Foundation - https://itis.swiss
+ * License: MIT - https://opensource.org/licenses/MIT
+ * Authors: Ignacio Pascual (ignapas)
+ */
+
+qx.Class.define("qxapp.statics.NodeStatics", {
+  statics: {
+    CATEGORIES: {
+      postpro: {
+        label: "Postpro",
+        icon: "@FontAwesome5Solid/chart-bar/"
+      },
+      notebook: {
+        label: "Notebook",
+        icon: "@FontAwesome5Solid/file-code/"
+      },
+      solver: {
+        label: "Solver",
+        icon: "@FontAwesome5Solid/calculator/"
+      },
+      simulator: {
+        label: "Simulator",
+        icon: "@FontAwesome5Solid/brain/"
+      },
+      modeling: {
+        label: "Modeling",
+        icon: "@FontAwesome5Solid/cube/"
+      },
+      data: {
+        label: "Data",
+        icon: "@FontAwesome5Solid/file/"
+      }
+    },
+    TYPES: {
+      computational: {
+        label: "Computational",
+        icon: "@FontAwesome5Solid/cogs/"
+      },
+      dynamic: {
+        label: "Interactive",
+        icon: "@FontAwesome5Solid/mouse-pointer/"
+      }
+    },
+    getCategory: function(category) {
+      return this.self().CATEGORIES[category.trim().toLowerCase()];
+    },
+    getType: function(type) {
+      return this.self().TYPES[type.trim().toLowerCase()];
+    }
+  }
+});
diff --git a/services/web/client/source/class/qxapp/theme/Appearance.js b/services/web/client/source/class/qxapp/theme/Appearance.js
index 31c09be21d3..e6ffeec541c 100644
--- a/services/web/client/source/class/qxapp/theme/Appearance.js
+++ b/services/web/client/source/class/qxapp/theme/Appearance.js
@@ -142,20 +142,34 @@ qx.Theme.define("qxapp.theme.Appearance", {
         decorator: "workbench-small-cap-captionbar"
       })
     },
+    "info-service-window": {
+      include: "service-window",
+      alias: "service-window",
+      style: state => ({
+        maxHeight: state.maximized ? null : 500
+      })
+    },
     /*
     ---------------------------------------------------------------------------
       PanelView
     ---------------------------------------------------------------------------
     */
-    "panelview-titlebar": {
+    "panelview": {
       style: state => ({
-        height: 24,
-        padding: [0, 5]
+        decorator: "panelview"
       })
     },
-    "panelview-titlebar-label": {
+    "panelview/title": {
       style: state => ({
-        marginTop: 4
+        font: "title-14"
+      })
+    },
+    "panelview-titlebar": {
+      style: state => ({
+        height: 24,
+        padding: [0, 5],
+        alignY: "middle",
+        cursor: "pointer"
       })
     },
     "panelview-content": {
@@ -256,10 +270,9 @@ qx.Theme.define("qxapp.theme.Appearance", {
     "jumbo": {
       include: "material-button",
       alias: "material-button",
-      style: (state, styles) => {
-        styles.padding = [7, 8, 5, 8];
-        return styles;
-      }
+      style: state => ({
+        padding: [7, 8, 5, 8]
+      })
     },
 
     /*
@@ -304,6 +317,71 @@ qx.Theme.define("qxapp.theme.Appearance", {
       style: state => ({
         decorator: "flash-badge"
       })
+    },
+
+    /*
+    ---------------------------------------------------------------------------
+      IFrame
+    ---------------------------------------------------------------------------
+    */
+    "iframe": {},
+
+    /*
+    ---------------------------------------------------------------------------
+      GroupBox
+    ---------------------------------------------------------------------------
+    */
+    "settings-groupbox": {
+      include: "groupbox",
+      alias: "groupbox"
+    },
+    "settings-groupbox/frame": {
+      include: "groupbox/frame",
+      style: state => ({
+        decorator: "no-border"
+      })
+    },
+    "settings-groupbox/legend": {
+      alias: "atom",
+      include: "groupbox/legend",
+      style: state => ({
+        font: "title-16"
+      })
+    },
+
+    /*
+    ---------------------------------------------------------------------------
+      Hints
+    ---------------------------------------------------------------------------
+    */
+    "hint": {
+      style: state => ({
+        backgroundColor: "background-main-lighter+",
+        decorator: "hint",
+        padding: 5
+      })
+    },
+
+    /*
+    ---------------------------------------------------------------------------
+      Chip
+    ---------------------------------------------------------------------------
+    */
+    "chip": {
+      include: "atom",
+      alias: "atom",
+      style: state => ({
+        decorator: "chip",
+        backgroundColor: "background-main-lighter",
+        padding: [3, 5]
+      })
+    },
+
+    "chip/label": {
+      include: "atom/label",
+      style: state => ({
+        font: "text-10"
+      })
     }
   }
 });
diff --git a/services/web/client/source/class/qxapp/theme/Color.js b/services/web/client/source/class/qxapp/theme/Color.js
index 16b8131a80d..07fc741b668 100644
--- a/services/web/client/source/class/qxapp/theme/Color.js
+++ b/services/web/client/source/class/qxapp/theme/Color.js
@@ -32,6 +32,7 @@ qx.Theme.define("qxapp.theme.Color", {
     "text-placeholder": "text-disabled",
     "text-darker": "text-disabled",
     "tabview-pane-background": "background-main",
-    "workbench-start-hint": "#505050"
+    "workbench-start-hint": "#505050",
+    "ready-green": "#33925A"
   }
 });
diff --git a/services/web/client/source/class/qxapp/theme/Decoration.js b/services/web/client/source/class/qxapp/theme/Decoration.js
index a5c228a4ff1..467c93e4c12 100644
--- a/services/web/client/source/class/qxapp/theme/Decoration.js
+++ b/services/web/client/source/class/qxapp/theme/Decoration.js
@@ -135,6 +135,18 @@ qx.Theme.define("qxapp.theme.Decoration", {
       style: {
         width: 0
       }
+    },
+
+    "hint": {
+      style: {
+        radius: 3
+      }
+    },
+
+    "chip": {
+      style: {
+        radius: 9
+      }
     }
   }
 });
diff --git a/services/web/client/source/class/qxapp/theme/Font.js b/services/web/client/source/class/qxapp/theme/Font.js
index dc0bfebc43c..163ec5e660b 100644
--- a/services/web/client/source/class/qxapp/theme/Font.js
+++ b/services/web/client/source/class/qxapp/theme/Font.js
@@ -27,6 +27,13 @@ qx.Theme.define("qxapp.theme.Font", {
       bold: true
     },
 
+    "title-18": {
+      size: 18,
+      family: ["Roboto"],
+      color: "text",
+      bold: true
+    },
+
     "title-16": {
       size: 16,
       family: ["Roboto"],
diff --git a/services/web/client/source/class/qxapp/ui/basic/Chip.js b/services/web/client/source/class/qxapp/ui/basic/Chip.js
new file mode 100644
index 00000000000..138ff5631f3
--- /dev/null
+++ b/services/web/client/source/class/qxapp/ui/basic/Chip.js
@@ -0,0 +1,21 @@
+/*
+ * oSPARC - The SIMCORE frontend - https://osparc.io
+ * Copyright: 2019 IT'IS Foundation - https://itis.swiss
+ * License: MIT - https://opensource.org/licenses/MIT
+ * Authors: Ignacio Pascual (ignapas)
+ */
+
+qx.Class.define("qxapp.ui.basic.Chip", {
+  extend: qx.ui.basic.Atom,
+
+  construct: function(label, icon) {
+    this.base(arguments, label, icon);
+  },
+
+  properties: {
+    appearance: {
+      init: "chip",
+      refine: true
+    }
+  }
+});
diff --git a/services/web/client/source/class/qxapp/ui/hint/Hint.js b/services/web/client/source/class/qxapp/ui/hint/Hint.js
new file mode 100644
index 00000000000..426a109bff4
--- /dev/null
+++ b/services/web/client/source/class/qxapp/ui/hint/Hint.js
@@ -0,0 +1,64 @@
+/*
+ * oSPARC - The SIMCORE frontend - https://osparc.io
+ * Copyright: 2019 IT'IS Foundation - https://itis.swiss
+ * License: MIT - https://opensource.org/licenses/MIT
+ * Authors: Ignacio Pascual (ignapas)
+ */
+
+qx.Class.define("qxapp.ui.hint.Hint", {
+  extend: qx.ui.core.Widget,
+
+  construct: function(element, text) {
+    this.base(arguments);
+    this._setLayout(new qx.ui.layout.VBox());
+    this.set({
+      backgroundColor: "transparent"
+    });
+
+    this.__hintContainer = new qx.ui.container.Composite(new qx.ui.layout.Basic());
+    this.__hintContainer.set({
+      appearance: "hint"
+    });
+
+    this.__caret = new qx.ui.container.Composite().set({
+      height: 5,
+      backgroundColor: "transparent"
+    });
+    this.__caret.getContentElement().addClass("hint");
+    this._add(this.__caret);
+    this.__hintContainer.add(new qx.ui.basic.Label(text).set({
+      rich: true,
+      maxWidth: 250
+    }));
+    this._add(this.__hintContainer, {
+      flex: 1
+    });
+
+    this.positionHint(element);
+  },
+
+  members: {
+    positionHint: function(element) {
+      this.addListener("appear", () => {
+        const {
+          top,
+          left
+        } = qx.bom.element.Location.get(element.getContentElement().getDomElement());
+        const {
+          width,
+          height
+        } = qx.bom.element.Dimension.getSize(element.getContentElement().getDomElement());
+        const selfBounds = this.getBounds();
+        this.setLayoutProperties({
+          top: top + height,
+          left: Math.floor(left + (width - selfBounds.width) / 2)
+        });
+      }, this);
+
+      const root = qx.core.Init.getApplication().getRoot();
+      root.add(this, {
+        top: -10000
+      });
+    }
+  }
+});
diff --git a/services/web/client/source/class/qxapp/utils/Utils.js b/services/web/client/source/class/qxapp/utils/Utils.js
index cca52429464..cceb2fb005b 100644
--- a/services/web/client/source/class/qxapp/utils/Utils.js
+++ b/services/web/client/source/class/qxapp/utils/Utils.js
@@ -313,6 +313,31 @@ qx.Class.define("qxapp.utils.Utils", {
         }
       }
       return parsedFragment;
+    },
+
+    getThumbnailFromUuid: uuid => {
+      const lastCharacters = uuid.substr(uuid.length-10);
+      const aNumber = parseInt(lastCharacters, 16);
+      const thumbnailId = aNumber%25;
+      return "qxapp/img"+ thumbnailId +".jpg";
+    },
+
+    getThumbnailFromString: str => "qxapp/img" + Math.abs(this.self().stringHash(str)%25) + ".jpg",
+
+    stringHash: str => {
+      // Based on https://stackoverflow.com/questions/7616461/generate-a-hash-from-string-in-javascript
+      let hash = 0;
+      let i;
+      let chr;
+      if (str.length === 0) {
+        return hash;
+      }
+      for (i=0; i<str.length; i++) {
+        chr = str.charCodeAt(i);
+        hash = ((hash << 5) - hash) + chr;
+        hash |= 0; // Convert to 32bit integer
+      }
+      return hash;
     }
   }
 });
diff --git a/services/web/client/source/resource/common/common.css b/services/web/client/source/resource/common/common.css
new file mode 100644
index 00000000000..b2b1b78e412
--- /dev/null
+++ b/services/web/client/source/resource/common/common.css
@@ -0,0 +1,12 @@
+@keyframes rotation {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(359deg);
+  }
+}
+
+.rotate {
+  animation: rotation 1.5s infinite linear;
+}
diff --git a/services/web/client/source/resource/hint/hint.css b/services/web/client/source/resource/hint/hint.css
new file mode 100644
index 00000000000..97aa4b738c8
--- /dev/null
+++ b/services/web/client/source/resource/hint/hint.css
@@ -0,0 +1,21 @@
+.hint-button {
+    display: none !important;
+}
+
+.hint-input:hover > .hint-button, .hint-button:hover {
+    display: block !important;
+}
+
+.hint:after {
+    bottom: 0;
+    left: 50%;
+    border: solid transparent;
+    content: " ";
+    height: 0;
+    width: 0;
+    position: absolute;
+    pointer-events: none;
+    border-bottom-color: #373737;
+    border-width: 5px;
+    margin-left: -5px;
+}
\ No newline at end of file
diff --git a/services/web/client/source/resource/qxapp/loading.gif b/services/web/client/source/resource/qxapp/loading.gif
new file mode 100644
index 00000000000..094d93502c1
Binary files /dev/null and b/services/web/client/source/resource/qxapp/loading.gif differ
diff --git a/services/web/server/requirements/ci.txt b/services/web/server/requirements/ci.txt
index 027f7edfd58..e8ae35af937 100644
--- a/services/web/server/requirements/ci.txt
+++ b/services/web/server/requirements/ci.txt
@@ -11,6 +11,7 @@
 
 # installs this repo's packages
 ../../../packages/s3wrapper/
+../../../packages/postgres-database/
 ../../../packages/simcore-sdk/
 ../../../packages/service-library/
 ../../../packages/director-sdk/python
diff --git a/services/web/server/requirements/dev.txt b/services/web/server/requirements/dev.txt
index a4af76b6666..5c8b3eeb176 100644
--- a/services/web/server/requirements/dev.txt
+++ b/services/web/server/requirements/dev.txt
@@ -11,6 +11,7 @@
 
 # installs this repo's packages
 -e ../../../packages/s3wrapper/
+-e ../../../packages/postgres-database/
 -e ../../../packages/simcore-sdk/
 -e ../../../packages/service-library/
 -e ../../../packages/director-sdk/python
diff --git a/services/web/server/requirements/prod.txt b/services/web/server/requirements/prod.txt
index 29783b91424..9c41c661e39 100644
--- a/services/web/server/requirements/prod.txt
+++ b/services/web/server/requirements/prod.txt
@@ -12,6 +12,7 @@
 
 # installs this repo's packages
 ../../../packages/s3wrapper/
+../../../packages/postgres-database/
 ../../../packages/simcore-sdk/
 ../../../packages/service-library/
 ../../../packages/director-sdk/python
diff --git a/services/web/server/scripts/codegen.sh b/services/web/server/scripts/codegen.sh
deleted file mode 100755
index f4c9af388d7..00000000000
--- a/services/web/server/scripts/codegen.sh
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/bin/bash
-
-# TODO: PC i really do not like this. we should combine cookiecutter with parts in simcore-lib
-#
-# define the input specification file and the output directory
-# typical structure:
-# /src/package-name/.openapi/v1/package_api.yaml   -- this is the input file
-# /src/package-name/rest/generated_code            -- this is the output directory
-
-REPO_ROOT=../../../..
-SOURCE_DIR=../src/simcore_service_webserver
-INPUT_SPEC=${REPO_ROOT}/api/specs/webserver/v0/openapi.yaml
-OUTPUT_DIR=${SOURCE_DIR}/rest
-OUTPUT_DIR_GEN=${SOURCE_DIR}/rest/generated_code
-INIT_FILE_PATH=${OUTPUT_DIR}/__init__.py
-HANDLERS_FILE_PATH=${OUTPUT_DIR}/handlers.py
-ROUTING_FILE_PATH=${OUTPUT_DIR_GEN}/routing.py
-
-# create the folder for the output
-mkdir -p $OUTPUT_DIR
-mkdir -p $OUTPUT_DIR_GEN
-
-# generate the python server models code
-ABSOLUTE_INPUT_PATH=$(realpath "${INPUT_SPEC}")
-ABSOLUTE_OUTPUT_DIR=$(realpath "${OUTPUT_DIR}")
-ABSOLUTE_OUTPUT_DIR_GEN=$(realpath "${OUTPUT_DIR_GEN}")
-$REPO_ROOT/scripts/openapi/openapi_python_server_codegen.sh -i ${ABSOLUTE_INPUT_PATH} -o ${ABSOLUTE_OUTPUT_DIR_GEN}
-
-# replace import entries in python code
-find ${OUTPUT_DIR_GEN} -type f -exec sed -i 's/openapi_server.models././g' {} \;
-find ${OUTPUT_DIR_GEN} -type f -exec sed -i 's/openapi_server/../g' {} \;
-
-# create __init__.py if always
-cat > "${INIT_FILE_PATH}" << EOF
-"""GENERATED CODE from codegen.sh
-It is advisable to not modify this code if possible.
-This will be overriden next time the code generator is called.
-"""
-from .generated_code import (
-    models,
-    util,
-    routing
-)
-EOF
-
-# only generate stub if necessary
-if [ ! -e "${HANDLERS_FILE_PATH}" ]; then
-    cat > "${HANDLERS_FILE_PATH}" << EOF
-"""This is a generated stub of handlers to be connected to the paths defined in the API
-
-"""
-import logging
-
-from aiohttp import web_exceptions
-
-log = logging.getLogger(__name__)
-
-# This module shall contain the handlers of the API (implementation side of the openapi server side).
-# Each operation is typically defined as
-# async def root_get(request):
-#   return "hello API world"
-
-# The API shall define a path where the entry operationId:
-# operationId: root_get
-EOF
-fi
-
-# always generate routing
-cat > "${ROUTING_FILE_PATH}" << EOF
-"""GENERATED CODE from codegen.sh
-It is advisable to not modify this code if possible.
-This will be overriden next time the code generator is called.
-
-use create_web_app to initialise the web application using the specification file.
-The base folder is the root of the package.
-"""
-
-
-import logging
-from pathlib import Path
-
-from aiohttp import hdrs, web
-from aiohttp_apiset import SwaggerRouter
-from aiohttp_apiset.middlewares import Jsonify, jsonify
-from aiohttp_apiset.swagger.loader import ExtendedSchemaFile
-from aiohttp_apiset.swagger.operations import OperationIdMapping
-
-from .. import handlers
-from .models.base_model_ import Model
-from .models.error import Error
-
-log = logging.getLogger(__name__)
-
-@web.middleware
-async def __handle_errors(request, handler):
-    try:
-        response = await handler(request)
-        return response
-    except web.HTTPError as ex:
-        error = Error(status=ex.status, message=ex.reason)
-        error_dict = error.to_dict()
-        return web.json_response(error_dict, status=ex.status)
-
-def create_web_app(base_folder, spec_file, additional_middlewares = None):
-    # create the default mapping of the operationId to the implementation code in handlers
-    opmap = __create_default_operation_mapping(Path(base_folder / spec_file))
-
-    # generate a version 3 of the API documentation
-    router = SwaggerRouter(
-        swagger_ui='/apidoc/',
-        version_ui=3, # forces the use of version 3 by default
-        search_dirs=[base_folder],
-        default_validate=True,
-    )
-
-    # add automatic jsonification of the models located in generated code
-    jsonify.singleton = Jsonify(indent=3, ensure_ascii=False)
-    jsonify.singleton.add_converter(Model, lambda o: o.to_dict(), score=0)
-
-    middlewares = [jsonify, __handle_errors]
-    if additional_middlewares:
-        middlewares.extend(additional_middlewares)
-    # create the web application using the API
-    app = web.Application(
-        router=router,
-        middlewares=middlewares,
-    )
-    router.set_cors(app, domains='*', headers=(
-        (hdrs.ACCESS_CONTROL_EXPOSE_HEADERS, hdrs.AUTHORIZATION),
-    ))
-
-    # Include our specifications in a router,
-    # is now available in the swagger-ui to the address http://localhost:8080/swagger/?spec=v1
-    router.include(
-        spec=Path(base_folder / spec_file),
-        operationId_mapping=opmap,
-        name='v1',  # name to access in swagger-ui,
-        basePath="/v1" # BUG: in apiset with openapi 3.0.0 [Github bug entry](https://github.com/aamalev/aiohttp_apiset/issues/45)
-    )
-
-    return app
-
-def __create_default_operation_mapping(specs_file):
-    operation_mapping = {}
-    yaml_specs = ExtendedSchemaFile(specs_file)
-    paths = yaml_specs['paths']
-    for path in paths.items():
-        for method in path[1].items(): # can be get, post, patch, put, delete...
-            op_str = "operationId"
-            if op_str not in method[1]:
-                raise Exception("The API %s does not contain the operationId tag for route %s %s" % (specs_file, path[0], method[0]))
-            operation_id = method[1][op_str]
-            operation_mapping[operation_id] = getattr(handlers, operation_id)
-    return OperationIdMapping(**operation_mapping)
-EOF
diff --git a/services/web/server/setup.py b/services/web/server/setup.py
index 0f3ef5436b2..dd18fd292e8 100644
--- a/services/web/server/setup.py
+++ b/services/web/server/setup.py
@@ -15,6 +15,7 @@ def read_reqs( reqs_path: Path):
 
 install_requirements = read_reqs( here / "requirements" / "_base.txt" ) + [
     "s3wrapper==0.1.0",
+    "simcore-postgres-database==0.1.0",
     "simcore-sdk==0.1.0",
     "simcore-service-library==0.1.0",
     "simcore-director-sdk==1.0.0"  # FIXME: notice that this is version 1 while the others are 0!
diff --git a/services/web/server/src/simcore_service_webserver/computation_handlers.py b/services/web/server/src/simcore_service_webserver/computation_handlers.py
index 6d8a8af3acc..f333843873c 100644
--- a/services/web/server/src/simcore_service_webserver/computation_handlers.py
+++ b/services/web/server/src/simcore_service_webserver/computation_handlers.py
@@ -11,16 +11,15 @@
 
 import sqlalchemy as sa
 from aiohttp import web, web_exceptions
-from aiopg.sa import Engine
-from celery import Celery
 from sqlalchemy import and_
 
+from aiopg.sa import Engine
+from celery import Celery
 from servicelib.application_keys import APP_CONFIG_KEY, APP_DB_ENGINE_KEY
 from servicelib.request_keys import RQT_USERID_KEY
 from simcore_director_sdk.rest import ApiException
+from simcore_postgres_database.webserver_models import comp_pipeline, comp_tasks
 from simcore_sdk.config.rabbit import Config as rabbit_config
-from simcore_sdk.models.pipeline_models import (ComputationalPipeline,
-                                                ComputationalTask)
 
 from .computation_config import CONFIG_SECTION_NAME as CONFIG_RABBIT_SECTION
 from .director import director_sdk
@@ -159,14 +158,15 @@ async def _parse_pipeline(pipeline_data:dict, app: web.Application): # pylint: d
 
 async def _set_adjacency_in_pipeline_db(db_engine: Engine, project_id: str, dag_adjacency_list: Dict):
     async with db_engine.acquire() as conn:
-        query = sa.select([ComputationalPipeline]).\
-                    where(ComputationalPipeline.__table__.c.project_id==project_id)
+        query = sa.select([comp_pipeline]).\
+                    where(comp_pipeline.c.project_id==project_id)
         result = await conn.execute(query)
         pipeline = await result.first()
 
         if pipeline is None:
+            # pylint: disable=no-value-for-parameter
             # let's create one then
-            query = ComputationalPipeline.__table__.insert().\
+            query = comp_pipeline.insert().\
                     values(project_id=project_id,
                             dag_adjacency_list=dag_adjacency_list,
                             state=0)
@@ -175,36 +175,40 @@ async def _set_adjacency_in_pipeline_db(db_engine: Engine, project_id: str, dag_
         else:
             # let's modify it
             log.debug("Pipeline object found")
-            query = ComputationalPipeline.__table__.update().\
-                        where(ComputationalPipeline.__table__.c.project_id == project_id).\
+            #pylint: disable=no-value-for-parameter
+            query = comp_pipeline.update().\
+                        where(comp_pipeline.c.project_id == project_id).\
                         values(state=0,
                                 dag_adjacency_list=dag_adjacency_list)
         await conn.execute(query)
 
 async def _set_tasks_in_tasks_db(db_engine: Engine, project_id: str, tasks: Dict):
     async with db_engine.acquire() as conn:
-        query = sa.select([ComputationalTask]).\
-                where(ComputationalTask.__table__.c.project_id == project_id)
+        query = sa.select([comp_tasks]).\
+                where(comp_tasks.c.project_id == project_id)
         result = await conn.execute(query)
         tasks_db = await result.fetchall()
         # delete tasks that were deleted from the db
         for task_db in tasks_db:
             if not task_db.node_id in tasks:
-                query = ComputationalTask.__table__.delete().\
-                        where(and_(ComputationalTask.__table__.c.project_id == project_id,
-                                    ComputationalTask.__table__.c.node_id == task_db.node_id))
+                #pylint: disable=no-value-for-parameter
+                query = comp_tasks.delete().\
+                        where(and_(comp_tasks.c.project_id == project_id,
+                                    comp_tasks.c.node_id == task_db.node_id))
                 await conn.execute(query)
         internal_id = 1
         for node_id in tasks:
             task = tasks[node_id]
-            query = sa.select([ComputationalTask]).\
-                    where(and_(ComputationalTask.__table__.c.project_id == project_id,
-                                ComputationalTask.__table__.c.node_id == node_id))
+            #pylint: disable=no-value-for-parameter
+            query = sa.select([comp_tasks]).\
+                    where(and_(comp_tasks.c.project_id == project_id,
+                                comp_tasks.c.node_id == node_id))
             result = await conn.execute(query)
             comp_task = await result.fetchone()
             if comp_task is None:
                 # add a new one
-                query = ComputationalTask.__table__.insert().\
+                #pylint: disable=no-value-for-parameter
+                query = comp_tasks.insert().\
                         values(project_id=project_id,
                                 node_id=node_id,
                                 internal_id=internal_id,
@@ -215,9 +219,10 @@ async def _set_tasks_in_tasks_db(db_engine: Engine, project_id: str, tasks: Dict
                                 submit = datetime.datetime.utcnow())
                 internal_id = internal_id+1
             else:
-                query = ComputationalTask.__table__.update().\
-                        where(and_(ComputationalTask.__table__.c.project_id==project_id,
-                                ComputationalTask.__table__.c.node_id==node_id)).\
+                #pylint: disable=no-value-for-parameter
+                query = comp_tasks.update().\
+                        where(and_(comp_tasks.c.project_id==project_id,
+                                comp_tasks.c.node_id==node_id)).\
                         values(job_id = None,
                                 state = 0,
                                 image = task["image"],
diff --git a/services/web/server/src/simcore_service_webserver/config/host-dev-config.yaml b/services/web/server/src/simcore_service_webserver/config/host-dev-config.yaml
deleted file mode 100644
index ed141695912..00000000000
--- a/services/web/server/src/simcore_service_webserver/config/host-dev-config.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-version: '1.0'
-main:
-  client_outdir: ${OSPARC_SIMCORE_REPO_ROOTDIR}/services/web/client/source-output
-  host: 127.0.0.1
-  log_level: INFO
-  port: 8080
-  testing: True
-  studies_access_enabled: True
-db:
-  enabled: True
-  init_tables: True
-  postgres:
-    database: simcoredb
-    endpoint: postgres:5432
-    host: localhost
-    maxsize: 5
-    minsize: 1
-    password: simcore
-    port: 5432
-    user: simcore
-director:
-  host: director
-  port: 8001
-rabbit:
-  enabled: True
-  channels:
-    log: comp.backend.channels.log
-    progress: comp.backend.channels.progress
-  password: simcore
-  user: simcore
-login:
-  enabled: True
-  registration_invitation_required: False
-  registration_confirmation_required: False
-smtp:
-  sender: 'OSPARC support <support@osparc.io>'
-  host: mail.foo.com
-  port: 25
-  tls: False
-  username: Null
-  password: Null
-# s3:
-#   access_key: 'Q3AM3UQ867SPQQA43P2F'
-#   bucket_name: simcore
-#   endpoint: play.minio.io:9000
-#   secret_key: 'zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG'
-rest:
-  version: v0
-  location: ${OSPARC_SIMCORE_REPO_ROOTDIR}/api/specs/webserver/v0/openapi.yaml
-  #location: http://localhost:8043/api/specs/webserver/v0/openapi.yaml
-  extra_urls:
-    - http://localhost:8080
-projects:
-  location: ${OSPARC_SIMCORE_REPO_ROOTDIR}/api/specs/webserver/v0/components/schemas/project-v0.0.1.json
-storage:
-  host: storage
-  port: 11111
-session:
-  secret_key: ${WEBSERVER_SESSION_SECRET_KEY}
-...
diff --git a/services/web/server/src/simcore_service_webserver/config/server-docker-prod.yaml b/services/web/server/src/simcore_service_webserver/config/server-docker-prod.yaml
index cdf9d81644c..7242d5282b6 100644
--- a/services/web/server/src/simcore_service_webserver/config/server-docker-prod.yaml
+++ b/services/web/server/src/simcore_service_webserver/config/server-docker-prod.yaml
@@ -34,7 +34,7 @@ rabbit:
 #   bucket_name: ${S3_BUCKET_NAME}
 login:
   enabled: True
-  registration_invitation_required: True
+  registration_invitation_required: ${WEBSERVER_LOGIN_REGISTRATION_INVITATION_REQUIRED}
   registration_confirmation_required: True
 smtp:
   sender: 'OSPARC support <support@osparc.io>'
diff --git a/services/web/server/src/simcore_service_webserver/config/server-template.yaml b/services/web/server/src/simcore_service_webserver/config/server-template.yaml
deleted file mode 100644
index 9434ecd7993..00000000000
--- a/services/web/server/src/simcore_service_webserver/config/server-template.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-version: "1.0"
-main:
-  host: 127.0.0.1
-  port: 8080
-  client_outdir: ${SIMCORE_WEB_OUTDIR}
-  log_level: DEBUG
-  testing: True
-  studies_access_enabled: False
-director:
-  host: ${DIRECTOR_HOST}
-  port: ${DIRECTOR_PORT}
-  version: v0
-db:
-  postgres:
-    database: ${POSTGRES_DB}
-    user: ${POSTGRES_USER}
-    password: ${POSTGRES_PASSWORD}
-    host: ${POSTGRES_HOST}
-    port: ${POSTGRES_PORT}
-    minsize: 1
-    maxsize: 5
-    endpoint: ${POSTGRES_ENDPOINT}
-rabbit:
-  user: ${RABBITMQ_USER}
-  password: ${RABBITMQ_PASSWORD}
-  channels:
-    progress: ${RABBITMQ_PROGRESS_CHANNEL}
-    log: ${RABBITMQ_LOG_CHANNEL}
-# s3:
-#   endpoint: ${S3_ENDPOINT}
-#   access_key: ${S3_ACCESS_KEY}
-#   secret_key: ${S3_SECRET_KEY}
-#   bucket_name: ${S3_BUCKET_NAME}
-login:
-  enabled: True
-  registration_invitation_required: False
-  registration_confirmation_required: True
-smtp:
-  sender: 'OSPARC support <support@osparc.io>'
-  host: ${SMTP_HOST}
-  port: ${SMTP_PORT}
-  tls: False
-  username: Null
-  password: Null
-storage:
-  host: ${STORAGE_HOST}
-  port: ${STORAGE_PORT}
-  version: v0
-rest:
-  version: v0
-  location: http://${APIHUB_HOST}:${APIHUB_PORT}/api/specs/webserver/v0/openapi.yaml
-projects:
-  location: http://${APIHUB_HOST}:${APIHUB_PORT}/api/specs/webserver/v0/components/schemas/project-v0.0.1.json
-session:
-  secret_key: ${WEBSERVER_SESSION_SECRET_KEY}
-...
diff --git a/services/web/server/src/simcore_service_webserver/db.py b/services/web/server/src/simcore_service_webserver/db.py
index 00cf17909d7..c7720403bb0 100644
--- a/services/web/server/src/simcore_service_webserver/db.py
+++ b/services/web/server/src/simcore_service_webserver/db.py
@@ -14,7 +14,6 @@
 from servicelib.aiopg_utils import DBAPIError
 from servicelib.application_keys import APP_CONFIG_KEY, APP_DB_ENGINE_KEY
 
-# from .computation_api import init_database as _init_db
 from .db_config import CONFIG_SECTION_NAME
 from .db_models import metadata
 
@@ -50,7 +49,7 @@ async def pg_engine(app: web.Application):
         if cfg.get("init_tables"):
             # TODO: get keys from __name__ (see notes in servicelib.application_keys)
             await __create_tables(**params)
-        
+
         engine = await create_engine(**params)
 
     except DBAPIError:
diff --git a/services/web/server/src/simcore_service_webserver/db_models.py b/services/web/server/src/simcore_service_webserver/db_models.py
index 1ab8071ae6b..8aa30ab8d04 100644
--- a/services/web/server/src/simcore_service_webserver/db_models.py
+++ b/services/web/server/src/simcore_service_webserver/db_models.py
@@ -1,98 +1,16 @@
 """
-    Object Relational Models
+   Facade to keep API LEGACY
 """
-# pylint: disable=E1101
-
-import enum
-from datetime import datetime
-
-import sqlalchemy as sa
-
-from simcore_sdk.models import metadata
-
-from .security_roles import UserRole
-
-# ENUM TYPES ----------------------------------------------------------------
-
-class UserStatus(enum.Enum):
-    """
-        pending: user registered but not confirmed
-        active: user is confirmed and can use the platform
-        banned: user is not authorized
-    """
-    CONFIRMATION_PENDING = "PENDING"
-    ACTIVE = "ACTIVE"
-    BANNED = "BANNED"
-
-
-class ConfirmationAction(enum.Enum):
-    REGISTRATION = "REGISTRATION"
-    RESET_PASSWORD = "RESET_PASSWORD"
-    CHANGE_EMAIL = "CHANGE_EMAIL"
-    INVITATION = "INVITATION"
-
-
-
-# TABLES ----------------------------------------------------------------
-#
-#  We use a classical Mapping w/o using a Declarative system.
-#
-# See https://docs.sqlalchemy.org/en/latest/orm/mapping_styles.html#classical-mappings
-
-users = sa.Table("users", metadata,
-    sa.Column("id", sa.BigInteger, nullable=False),
-    sa.Column("name", sa.String, nullable=False),
-    sa.Column("email", sa.String, nullable=False),
-    sa.Column("password_hash", sa.String, nullable=False),
-    sa.Column("status",
-        sa.Enum(UserStatus),
-        nullable=False,
-        default=UserStatus.CONFIRMATION_PENDING),
-    sa.Column("role",
-        sa.Enum(UserRole),
-        nullable=False,
-        default=UserRole.USER),
-    sa.Column("created_at", sa.DateTime(), nullable=False, default=datetime.utcnow),
-    sa.Column("created_ip", sa.String(), nullable=True),
-
-    #
-    sa.PrimaryKeyConstraint("id", name="user_pkey"),
-    sa.UniqueConstraint("email", name="user_login_key"),
-)
-
-
-confirmations = sa.Table("confirmations", metadata,
-    sa.Column("code", sa.Text),
-    sa.Column("user_id", sa.BigInteger),
-    sa.Column("action",
-        sa.Enum(ConfirmationAction),
-        nullable=False,
-        default=ConfirmationAction.REGISTRATION
-    ),
-    sa.Column("data", sa.Text), # TODO: json?
-    sa.Column("created_at", sa.DateTime, nullable=False),
-
-    #
-    sa.PrimaryKeyConstraint("code", name="confirmation_code"),
-    sa.ForeignKeyConstraint(["user_id"], [users.c.id],
-                            name="user_confirmation_fkey",
-                            ondelete="CASCADE"),
- )
-
-
-# NOTE: this is another way of of defining keys ...
-tokens = sa.Table("tokens", metadata,
-    sa.Column("token_id", sa.BigInteger, nullable=False, primary_key=True),
-    sa.Column("user_id", sa.BigInteger, sa.ForeignKey(users.c.id), nullable=False),
-    sa.Column("token_service", sa.String, nullable=False),
-    sa.Column("token_data", sa.JSON, nullable=False),
-
-)
-
+from simcore_postgres_database.models.base import metadata
+from simcore_postgres_database.webserver_models import (ConfirmationAction,
+                                                      UserRole, UserStatus,
+                                                      confirmations, tokens,
+                                                      users)
 
 # TODO: roles table that maps every role with allowed tasks e.g. read/write,...??
 
 __all__ = (
     "UserStatus", "UserRole", "ConfirmationAction",
-    "users", "confirmations", "tokens"
+    "users", "confirmations", "tokens",
+    "metadata"
 )
diff --git a/services/web/server/src/simcore_service_webserver/login/registration.py b/services/web/server/src/simcore_service_webserver/login/registration.py
index d3bdc1b1ea7..d280b267d33 100644
--- a/services/web/server/src/simcore_service_webserver/login/registration.py
+++ b/services/web/server/src/simcore_service_webserver/login/registration.py
@@ -77,7 +77,7 @@ async def create_invitation(host:Dict, guest:str, db:AsyncpgStorage):
     )
     return confirmation
 
-async def check_invitation(invitation:str, db):
+async def check_invitation(invitation:str, db:AsyncpgStorage):
     confirmation = None
     if invitation:
         confirmation = await validate_confirmation_code(invitation, db)
diff --git a/services/web/server/src/simcore_service_webserver/projects/projects_db.py b/services/web/server/src/simcore_service_webserver/projects/projects_db.py
index 947e2a0c15c..ae3518ea8b1 100644
--- a/services/web/server/src/simcore_service_webserver/projects/projects_db.py
+++ b/services/web/server/src/simcore_service_webserver/projects/projects_db.py
@@ -30,7 +30,7 @@
 log = logging.getLogger(__name__)
 
 APP_PROJECT_DBAPI  = __name__ + '.ProjectDBAPI'
-
+DB_EXCLUSIVE_COLUMNS = ["type", "id", "published"]
 
 # TODO: check here how schema to model db works!?
 def _convert_to_db_names(project_data: Dict) -> Dict:
@@ -42,7 +42,7 @@ def _convert_to_db_names(project_data: Dict) -> Dict:
 def _convert_to_schema_names(project_db_data: Mapping) -> Dict:
     converted_args = {}
     for key, value in project_db_data.items():
-        if key in ["type", "id"]:
+        if key in DB_EXCLUSIVE_COLUMNS:
             continue
         converted_value = value
         if isinstance(value, datetime):
@@ -55,6 +55,7 @@ def _convert_to_schema_names(project_db_data: Mapping) -> Dict:
 # TODO: is user_id str or int?
 # TODO: systemaic user_id, project
 # TODO: rename add_projects by create_projects
+# FIXME: not clear when data is schema-compliant and db-compliant
 
 class ProjectDBAPI:
     def __init__(self, app: web.Application):
@@ -191,15 +192,19 @@ async def load_user_projects(self, user_id: str) -> List[Dict]:
                 projects_list.append(_convert_to_schema_names(result_dict))
         return projects_list
 
-    async def load_template_projects(self) -> List[Dict]:
+    async def load_template_projects(self, *, only_published=False) -> List[Dict]:
         log.info("Loading template projects")
+        # TODO:
         # TODO: eliminate this and use mock to replace get_user_project instead
         projects_list = [prj.data for prj in Fake.projects.values() if prj.template]
 
         async with self.engine.acquire() as conn:
-            query = select([projects]).\
-                where(projects.c.type == ProjectType.TEMPLATE)
+            if only_published:
+                expression = and_( projects.c.type == ProjectType.TEMPLATE, projects.c.published == True)
+            else:
+                expression = projects.c.type == ProjectType.TEMPLATE
 
+            query = select([projects]).where(expression)
             async for row in conn.execute(query):
                 result_dict = {key:value for key,value in row.items()}
                 log.debug("found project: %s", result_dict)
@@ -236,7 +241,7 @@ async def get_user_project(self, user_id: str, project_uuid: str) -> Dict:
                 raise ProjectNotFoundError(project_uuid)
             return _convert_to_schema_names(row)
 
-    async def get_template_project(self, project_uuid: str) -> Dict:
+    async def get_template_project(self, project_uuid: str, *, only_published=False) -> Dict:
         # TODO: eliminate this and use mock to replace get_user_project instead
         prj = Fake.projects.get(project_uuid)
         if prj and prj.template:
@@ -244,10 +249,18 @@ async def get_template_project(self, project_uuid: str) -> Dict:
 
         template_prj = None
         async with self.engine.acquire() as conn:
-            query = select([projects]).where(
-                and_(projects.c.type == ProjectType.TEMPLATE,
-                     projects.c.uuid == project_uuid)
-            )
+            if only_published:
+                condition = and_(
+                    projects.c.type == ProjectType.TEMPLATE,
+                    projects.c.uuid == project_uuid,
+                    projects.c.published==True)
+            else:
+                condition = and_(
+                    projects.c.type == ProjectType.TEMPLATE,
+                    projects.c.uuid == project_uuid)
+
+            query = select([projects]).where(condition)
+
             result = await conn.execute(query)
             row = await result.first()
             if row:
diff --git a/services/web/server/src/simcore_service_webserver/projects/projects_handlers.py b/services/web/server/src/simcore_service_webserver/projects/projects_handlers.py
index 119c3dfddf6..018c47edaf8 100644
--- a/services/web/server/src/simcore_service_webserver/projects/projects_handlers.py
+++ b/services/web/server/src/simcore_service_webserver/projects/projects_handlers.py
@@ -49,6 +49,7 @@ async def create_projects(request: web.Request):
                 raise web.HTTPNotFound(reason="Invalid template uuid {}".format(template_uuid))
 
             project = clone_project_data(template_prj)
+            #FIXME: parameterized inputs should get defaults provided by service
 
         # overrides with body
         if request.has_body:
diff --git a/services/web/server/src/simcore_service_webserver/projects/projects_models.py b/services/web/server/src/simcore_service_webserver/projects/projects_models.py
index 2429e75aed4..7513b4fd5af 100644
--- a/services/web/server/src/simcore_service_webserver/projects/projects_models.py
+++ b/services/web/server/src/simcore_service_webserver/projects/projects_models.py
@@ -1,52 +1,11 @@
 """
-    Object Relational Models and access to DB
+    Facade
 """
 
-import enum
-import logging
-from datetime import datetime
+from simcore_postgres_database.webserver_models import (ProjectType, projects,
+                                                      user_to_projects)
 
-import sqlalchemy as sa
-
-from simcore_sdk.models import metadata
-
-from ..db_models import users
-
-log = logging.getLogger(__name__)
-
-# ENUM TYPES ----------------------------------------------------------------
-
-class ProjectType(enum.Enum):
-    """
-        template: template project
-        standard: standard project
-    """
-    TEMPLATE = "template"
-    STANDARD = "standard"
-
-
-# TABLES ----------------------------------------------------------------
-#
-#  We use a classical Mapping w/o using a Declarative system.
-#
-# See https://docs.sqlalchemy.org/en/latest/orm/mapping_styles.html#classical-mappings
-
-projects = sa.Table("projects", metadata,
-    sa.Column("id", sa.BigInteger, nullable=False, primary_key=True),
-    sa.Column("type", sa.Enum(ProjectType), nullable=False, default=ProjectType.STANDARD),
-
-    sa.Column("uuid", sa.String, nullable=False, unique=True),
-    sa.Column("name", sa.String, nullable=False),
-    sa.Column("description", sa.String, nullable=False),
-    sa.Column("thumbnail", sa.String, nullable=False),
-    sa.Column("prj_owner", sa.String, nullable=False),
-    sa.Column("creation_date", sa.DateTime(), nullable=False, default=datetime.utcnow),
-    sa.Column("last_change_date", sa.DateTime(), nullable=False, default=datetime.utcnow),
-    sa.Column("workbench", sa.JSON, nullable=False)
-)
-
-user_to_projects = sa.Table("user_to_projects", metadata,
-    sa.Column("id", sa.BigInteger, nullable=False, primary_key=True),
-    sa.Column("user_id", sa.BigInteger, sa.ForeignKey(users.c.id), nullable=False),
-    sa.Column("project_id", sa.BigInteger, sa.ForeignKey(projects.c.id), nullable=False)
-)
+__all__ = [
+    "projects", "ProjectType",
+    "user_to_projects",
+]
diff --git a/services/web/server/src/simcore_service_webserver/projects/projects_utils.py b/services/web/server/src/simcore_service_webserver/projects/projects_utils.py
index 8079529acfe..c486f965a06 100644
--- a/services/web/server/src/simcore_service_webserver/projects/projects_utils.py
+++ b/services/web/server/src/simcore_service_webserver/projects/projects_utils.py
@@ -1,7 +1,14 @@
+import logging
+import re
 import uuid as uuidlib
 from copy import deepcopy
 from typing import Dict
 
+from servicelib.decorators import safe_return
+
+log = logging.getLogger(__name__)
+variable_pattern = re.compile(r"^{{\W*(\w+)\W*}}$")
+
 def clone_project_data(project: Dict) -> Dict:
     project_copy = deepcopy(project)
 
@@ -35,3 +42,43 @@ def _replace_uuids(node):
 
     project_copy['workbench'] = _replace_uuids(project_copy.get('workbench', {}))
     return project_copy
+
+
+@safe_return(if_fails_return=False, logger=log)
+def substitute_parameterized_inputs(parameterized_project: Dict, parameters: Dict) -> Dict:
+    """ Substitutes parameterized r/w inputs
+
+        NOTE: project is is changed
+    """
+    project = deepcopy(parameterized_project)
+
+    # TODO: optimize value normalization
+    def _num(s):
+        try:
+            return int(s)
+        except ValueError:
+            return float(s)
+
+    def _normalize_value(s):
+        try:
+            return _num(s)
+        except ValueError:
+            return s
+
+    for node in project['workbench'].values():
+        inputs = node.get('inputs', {})
+        access = node.get('inputAccess', {})
+        new_inputs = {}
+        for name, value in inputs.items():
+            if isinstance(value, str) and access.get(name, "ReadAndWrite") == "ReadAndWrite":
+                # TODO: use jinja2 to interpolate expressions?
+                m = variable_pattern.match(value)
+                if m:
+                    value = m.group(1)
+                    if value in parameters:
+                        new_inputs[name] = _normalize_value(parameters[value])
+                    else:
+                        log.warning("Could not resolve parameter %s. No value provided in %s", value, parameters)
+        inputs.update(new_inputs)
+
+    return project
diff --git a/services/web/server/src/simcore_service_webserver/reverse_proxy/routing.py b/services/web/server/src/simcore_service_webserver/reverse_proxy/routing.py
index f82c7984611..92eb7abf9c9 100644
--- a/services/web/server/src/simcore_service_webserver/reverse_proxy/routing.py
+++ b/services/web/server/src/simcore_service_webserver/reverse_proxy/routing.py
@@ -15,7 +15,7 @@
 from aiohttp import web
 
 from .abc import ServiceResolutionPolicy
-from .handlers.generic import handler as default_handler
+from .handlers.jupyter import handler as default_handler #TODO: jupyter shall be the generic one
 from .settings import PROXY_PATH_KEY, SERVICE_ID_KEY
 
 logger = logging.getLogger(__name__)
diff --git a/services/web/server/src/simcore_service_webserver/security_roles.py b/services/web/server/src/simcore_service_webserver/security_roles.py
index f41541d20dc..88e53c9fd23 100644
--- a/services/web/server/src/simcore_service_webserver/security_roles.py
+++ b/services/web/server/src/simcore_service_webserver/security_roles.py
@@ -3,37 +3,10 @@
     This definition is consumed by the security_access_model to build an access model for the framework
     The access model is created upon setting up of the security subsystem
 """
-import itertools
-from enum import Enum
 
-class UserRole(Enum):
-    """ SORTED enumeration of user roles
+from simcore_postgres_database.models.users import UserRole
 
-    A role defines a set of privileges the user can perform
-    Roles are sorted from lower to highest privileges
-    USER is the role assigned by default A user with a higher/lower role is denoted super/infra user
 
-    ANONYMOUS : The user is not logged in
-    GUEST     : Temporary user with very limited access. Main used for demos and for a limited amount of time
-    USER      : Registered user. Basic permissions to use the platform [default]
-    TESTER    : Upgraded user. First level of super-user with privileges to test the framework.
-                Can use everything but does not have an effect in other users or actual data
-
-    See security_access.py
-    """
-    ANONYMOUS = "ANONYMOUS"
-    GUEST = "GUEST"
-    USER = "USER"
-    TESTER = "TESTER"
-
-    @classmethod
-    def super_users(cls):
-        return list(itertools.takewhile(lambda e: e!=cls.USER, cls))
-
-    # TODO: add comparison https://portingguide.readthedocs.io/en/latest/comparisons.html
-
-
-#
 # A role defines a set of operations that the user *can* perform
 #    - Every operation is named as a resource and an action
 #    - Resource is named hierarchically
diff --git a/services/web/server/src/simcore_service_webserver/studies_access.py b/services/web/server/src/simcore_service_webserver/studies_access.py
index 15a6691c5aa..36a80bd1f1d 100644
--- a/services/web/server/src/simcore_service_webserver/studies_access.py
+++ b/services/web/server/src/simcore_service_webserver/studies_access.py
@@ -1,4 +1,4 @@
-""" handles access to studies
+""" handles access to *public* studies
 
     Handles a request to share a given sharable study via '/study/{id}'
 
@@ -8,20 +8,17 @@
     - access to security
     - access to login
 
-FIXME: reduce modules coupling! See all TODO: .``from ...`` comments
-TODO: THIS IS A PROTOTYPE!!!
-
+FIXME: Refactor to reduce modules coupling! See all TODO: .``from ...`` comments
 """
-import json
 import logging
 import uuid
+from functools import lru_cache
 from typing import Dict
 
 from aiohttp import web
-
 from servicelib.application_keys import APP_CONFIG_KEY
 
-from .resources import resources
+from .login.decorators import login_required
 from .security_api import is_anonymous, remember
 from .statics import INDEX_RESOURCE_NAME
 
@@ -29,29 +26,27 @@
 
 BASE_UUID = uuid.UUID("71e0eb5e-0797-4469-89ba-00a0df4d338a")
 
+@lru_cache()
+def compose_uuid(template_uuid, user_id, query="") -> str:
+    """ Creates a new uuid composing a project's and user ids such that
+        any template pre-assigned to a user
 
-def load_isan_template_uuids():
-    with resources.stream('data/fake-template-projects.isan.json') as fp:
-        data = json.load(fp)
-    return [prj['uuid'] for prj in data]
+        Enforces a constraint: a user CANNOT have multiple copies of the same template
+    """
+    new_uuid = str( uuid.uuid5(BASE_UUID, str(template_uuid) + str(user_id) + str(query)) )
+    return new_uuid
 
-SHARABLE_TEMPLATE_STUDY_IDS = load_isan_template_uuids()
 
-# TODO: from .projects import get_template_project
-async def get_template_project(app: web.Application, project_uuid: str):
-    # TODO: remove projects_ prefix from name
+# TODO: from .projects import get_public_project
+async def get_public_project(app: web.Application, project_uuid: str):
+    """
+        Returns project if project_uuid is a template and is marked as published, otherwise None
+    """
     from .projects.projects_db import APP_PROJECT_DBAPI
 
     db = app[APP_PROJECT_DBAPI]
-
-    # TODO: user search queries in DB instead
-    # BUG: ensure items in project_list have unique UUIDs
-    projects_list = await db.load_template_projects()
-
-    for prj in projects_list:
-        if prj.get('uuid') == project_uuid:
-            return prj
-    return None
+    prj = await db.get_template_project(project_uuid, only_published=True)
+    return prj
 
 # TODO: from .users import create_temporary_user
 async def create_temporary_user(request: web.Request):
@@ -95,74 +90,60 @@ async def get_authorized_user(request: web.Request) -> Dict:
     user = await db.get_user({'id': userid})
     return user
 
-# Creation of projects from templates ---
-def compose_uuid(template_uuid, user_id) -> str:
-    """ Creates a new uuid composing a project's and user ids such that
-        any template pre-assigned to a user
-
-        Enforces a constraint: a user CANNOT have multiple copies of the same template
-        TODO: cache results
-    """
-    new_uuid = str( uuid.uuid5(BASE_UUID, str(template_uuid) + str(user_id)) )
-    return new_uuid
-
-
 # TODO: from .projects import ...?
 async def copy_study_to_account(request: web.Request, template_project: Dict, user: Dict):
     """
         Creates a copy of the study to a given project in user's account
 
-        Contrains of this method:
-            - Avoids multiple copies of the same template on each account
+        - Replaces template parameters by values passed in query
+        - Avoids multiple copies of the same template on each account
     """
-
     from .projects.projects_db import APP_PROJECT_DBAPI
     from .projects.projects_exceptions import ProjectNotFoundError
-    from .projects.projects_utils import clone_project_data
+    from .projects.projects_utils import clone_project_data, substitute_parameterized_inputs
 
     # FIXME: ONLY projects should have access to db since it avoids access layer
     # TODO: move to project_api and add access layer
     db = request.config_dict[APP_PROJECT_DBAPI]
+    template_parameters = dict(request.query)
 
     # assign id to copy
-    project_uuid = compose_uuid(template_project["uuid"], user["id"])
+    project_uuid = compose_uuid(template_project["uuid"], user["id"], str(template_parameters))
 
     try:
         # Avoids multiple copies of the same template on each account
         await db.get_user_project(user["id"], project_uuid)
 
+        # FIXME: if template is parametrized and user has already a copy, then delete it and create a new one??
+
     except ProjectNotFoundError:
         # new project from template
         project = clone_project_data(template_project)
 
+        # check project inputs and substitute template_parameters
+        if template_parameters:
+            log.info("Substituting parameters '%s' in template", template_parameters)
+            project = substitute_parameterized_inputs(project, template_parameters) or project
+
         project["uuid"] = project_uuid
         await db.add_project(project, user["id"], force_project_uuid=True)
 
     return project_uuid
 
 
-# -----------------------------------------------
-
+# HANDLERS --------------------------------------------------------
 async def access_study(request: web.Request) -> web.Response:
     """
-        Handles requests to access a study in a given user's account
+        Handles requests to get and open a public study
 
-        - study must be a template
-        - if user is not registered, it creates a temporary account (has an expiration date)
-        -
+        - public studies are templates that are marked as published in the database
+        - if user is not registered, it creates a temporary guest account with limited resources and expiration
     """
     study_id = request.match_info["id"]
 
-    log.debug("Requested a copy of study '%s' ...", study_id)
-
-    # FIXME: if identified user, then he can access not only to template but also his own projects!
-    if study_id not in SHARABLE_TEMPLATE_STUDY_IDS:
-        raise web.HTTPNotFound(reason="This study was not shared [{}]".format(study_id))
-
-    # TODO: should copy **any** type of project is sharable -> get_sharable_project
-    template_project = await get_template_project(request.app, study_id)
+    template_project = await get_public_project(request.app, study_id)
     if not template_project:
-        raise web.HTTPNotFound(reason="Invalid study [{}]".format(study_id))
+        raise web.HTTPNotFound(reason="Invalid public study [{}]".format(study_id))
 
     user = None
     is_anonymous_user = await is_anonymous(request)
@@ -175,20 +156,18 @@ async def access_study(request: web.Request) -> web.Response:
     if not user:
         raise RuntimeError("Unable to start user session")
 
-    msg_tail = "study {} to {} account ...".format(template_project.get('name'), user.get("email"))
-    log.debug("Copying %s ...", msg_tail)
+    log.debug("Granted access to study '%d' for user %s. Copying study over ...", template_project.get('name'), user.get('email'))
 
     copied_project_id = await copy_study_to_account(request, template_project, user)
 
-    log.debug("Copied %s as %s", msg_tail, copied_project_id)
-
+    log.debug("Study %s copied", copied_project_id)
 
     try:
-        loc = request.app.router[INDEX_RESOURCE_NAME].url_for().with_fragment("/study/{}".format(copied_project_id))
+        redirect_url = request.app.router[INDEX_RESOURCE_NAME].url_for().with_fragment("/study/{}".format(copied_project_id))
     except KeyError:
         raise RuntimeError("Unable to serve front-end. Study has been anyway copied over to user.")
 
-    response = web.HTTPFound(location=loc)
+    response = web.HTTPFound(location=redirect_url)
     if is_anonymous_user:
         log.debug("Auto login for anonymous user %s", user["name"])
         identity = user['email']
@@ -196,22 +175,22 @@ async def access_study(request: web.Request) -> web.Response:
 
     raise response
 
-
 def setup(app: web.Application):
 
     cfg = app[APP_CONFIG_KEY]["main"]
+    # TODO: temporarily used to toggle to logged users
+    study_handler = access_study
     if not cfg["studies_access_enabled"]:
-        log.warning("'%s' setup explicitly disabled in config", __name__)
-        return False
+        study_handler = login_required(access_study)
+        log.warning("'%s' config explicitly disables anonymous users from this feature", __name__)
 
     # TODO: make sure that these routes are filtered properly in active middlewares
     app.router.add_routes([
-        web.get(r"/study/{id}", access_study, name="study"),
+        web.get(r"/study/{id}", study_handler, name="study"),
     ])
 
     return True
 
-
 # alias
 setup_studies_access = setup
 
diff --git a/services/web/server/tests/helpers/utils_projects.py b/services/web/server/tests/helpers/utils_projects.py
index 5c2d7d28ae2..0c3f810d986 100644
--- a/services/web/server/tests/helpers/utils_projects.py
+++ b/services/web/server/tests/helpers/utils_projects.py
@@ -12,7 +12,7 @@
 
 from aiohttp import web
 
-from simcore_service_webserver.projects.projects_db import APP_PROJECT_DBAPI
+from simcore_service_webserver.projects.projects_db import APP_PROJECT_DBAPI, DB_EXCLUSIVE_COLUMNS
 from simcore_service_webserver.resources import resources
 
 fake_template_resources = ['data/'+name for name in resources.listdir('data')
@@ -44,9 +44,12 @@ async def create_project(app: web.Application, params: Dict=None, user_id=None,
 
     db = app[APP_PROJECT_DBAPI]
 
-
     project_uuid = await db.add_project(project_data, user_id, force_project_uuid=force_uuid)
     assert project_uuid == project_data["uuid"]
+
+    for key in DB_EXCLUSIVE_COLUMNS:
+        project_data.pop(key, None)
+
     return project_data
 
 
diff --git a/services/web/server/tests/integration-proxy/Makefile b/services/web/server/tests/integration-proxy/Makefile
index ea3a36775be..1fa4c121d61 100644
--- a/services/web/server/tests/integration-proxy/Makefile
+++ b/services/web/server/tests/integration-proxy/Makefile
@@ -4,7 +4,7 @@
 .PHONY: up
 up:
 	docker swarm init
-	docker-compose -f docker-compose.yml -f docker-compose.tools.yml config > docker-compose.ignore.yml
+	docker-compose -f docker-compose.yml -f docker-compose-tools.yml config > docker-compose.ignore.yml
 	docker stack deploy -c docker-compose.ignore.yml services
 
 .PHONY: down
diff --git a/services/web/server/tests/integration-proxy/conftest.py b/services/web/server/tests/integration-proxy/conftest.py
index 9e8a133f864..119768a9ff5 100644
--- a/services/web/server/tests/integration-proxy/conftest.py
+++ b/services/web/server/tests/integration-proxy/conftest.py
@@ -79,7 +79,7 @@ def services_docker_compose(osparc_simcore_root_dir) -> Dict[str, str]:
 
 @pytest.fixture("session")
 def tools_docker_compose(osparc_simcore_root_dir) -> Dict[str, str]:
-    docker_compose_path = osparc_simcore_root_dir / "services" / "docker-compose.tools.yml"
+    docker_compose_path = osparc_simcore_root_dir / "services" / "docker-compose-tools.yml"
     return _load_docker_compose(docker_compose_path)
 
 
diff --git a/services/web/server/tests/integration/computation/test_computation.py b/services/web/server/tests/integration/computation/test_computation.py
index e8cf2508102..31392cdc06d 100644
--- a/services/web/server/tests/integration/computation/test_computation.py
+++ b/services/web/server/tests/integration/computation/test_computation.py
@@ -21,7 +21,7 @@
 from servicelib.application_keys import APP_CONFIG_KEY
 from servicelib.rest_responses import unwrap_envelope
 from simcore_sdk.models.pipeline_models import (
-    SUCCESS, ComputationalPipeline, ComputationalTask)
+    SUCCESS, ComputationalPipeline, ComputationalTask) # uses legacy TODO: upgrade test
 from simcore_service_webserver.computation import setup_computation
 from simcore_service_webserver.db import setup_db
 from simcore_service_webserver.login import setup_login
diff --git a/services/web/server/tests/integration/fixtures/docker_compose.py b/services/web/server/tests/integration/fixtures/docker_compose.py
index 30f06a8a028..af8c50ca94c 100644
--- a/services/web/server/tests/integration/fixtures/docker_compose.py
+++ b/services/web/server/tests/integration/fixtures/docker_compose.py
@@ -26,7 +26,7 @@ def services_docker_compose(osparc_simcore_root_dir) -> Dict[str, str]:
 
 @pytest.fixture("session")
 def tools_docker_compose(osparc_simcore_root_dir) -> Dict[str, str]:
-    docker_compose_path = osparc_simcore_root_dir / "services" / "docker-compose.tools.yml"
+    docker_compose_path = osparc_simcore_root_dir / "services" / "docker-compose-tools.yml"
     assert docker_compose_path.exists()
 
     content = {}
@@ -82,8 +82,7 @@ def tools_docker_compose_file(request, temp_folder, tools_docker_compose, devel_
 
     """
     tool_services = getattr(request.module, 'tool_services', [])
-    docker_compose_path = temp_folder / 'docker-compose.tools.yml'
-    # docker_compose_path = tmp_path / 'docker-compose.tools.yml'
+    docker_compose_path = temp_folder / 'docker-compose-tools.yml'
     _recreate_compose_file(tool_services, tools_docker_compose, docker_compose_path, devel_environ)
 
     yield Path(docker_compose_path)
diff --git a/services/web/server/tests/integration/fixtures/postgres_service.py b/services/web/server/tests/integration/fixtures/postgres_service.py
index 09feadc84b4..9a4ade5d8cb 100644
--- a/services/web/server/tests/integration/fixtures/postgres_service.py
+++ b/services/web/server/tests/integration/fixtures/postgres_service.py
@@ -9,7 +9,7 @@
 import tenacity
 from sqlalchemy.orm import sessionmaker
 
-from simcore_sdk.models import metadata
+from simcore_postgres_database.models.base import metadata
 from simcore_service_webserver.db import DSN
 
 
diff --git a/services/web/server/tests/unit/mock/parametrized_project.json b/services/web/server/tests/unit/mock/parametrized_project.json
new file mode 100644
index 00000000000..06cb7dbf7ef
--- /dev/null
+++ b/services/web/server/tests/unit/mock/parametrized_project.json
@@ -0,0 +1,91 @@
+{
+  "uuid": "6e6bd905-e380-490d-999d-28ed26721fb0",
+  "name": "ISAN: UCDavis use case: 0D",
+  "description": "Colleen Clancy Single Cell solver with a file picker and PostPro viewer",
+  "thumbnail": "https://placeimg.com/171/96/tech/grayscale/?18.jpg",
+  "prjOwner": "Colleen Clancy",
+  "creationDate": "2018-10-22T09:13:13.360Z",
+  "lastChangeDate": "2018-10-22T09:33:41.858Z",
+  "workbench": {
+    "template-uuid-4674-b758-946151cae351": {
+      "key": "simcore/services/frontend/file-picker",
+      "version": "1.0.0",
+      "label": "File Picker 0D",
+      "inputs": {},
+      "inputNodes": [],
+      "outputNode": false,
+      "outputs": {
+        "outFile": {
+          "store": 1,
+          "path": "Shared Data/initial_WStates"
+        }
+      },
+      "progress": 100,
+      "parent": null,
+      "position": {
+        "x": 50,
+        "y": 150
+      }
+    },
+    "template-uuid-409d-998c-c1f04de67f8b": {
+      "key": "simcore/services/comp/ucdavis-singlecell-cardiac-model",
+      "version": "1.0.0",
+      "label": "DBP-Clancy-Rabbit-Single-Cell solver",
+      "inputAccess": {
+        "Na": "ReadAndWrite",
+        "Kr": "ReadOnly",
+        "BCL": "ReadAndWrite",
+        "NBeats": "ReadOnly",
+        "Ligand": "Invisible",
+        "cAMKII": "Invisible"
+      },
+      "inputs": {
+        "Na": "{{my_Na}}",
+        "Kr": 0,
+        "BCL": "{{my_BCL}}",
+        "NBeats": 5,
+        "Ligand": 0,
+        "cAMKII": "WT",
+        "initfile": {
+          "nodeUuid": "template-uuid-4674-b758-946151cae351",
+          "output": "outFile"
+        }
+      },
+      "inputNodes": [
+        "template-uuid-4674-b758-946151cae351"
+      ],
+      "outputNode": false,
+      "outputs": {},
+      "parent": null,
+      "position": {
+        "x": 300,
+        "y": 150
+      }
+    },
+    "template-uuid-43e7-9fda-cf9625e59986": {
+      "key": "simcore/services/dynamic/cc-0d-viewer",
+      "version": "2.8.0",
+      "label": "cc-0d-viewer",
+      "inputs": {
+        "vm_1Hz": {
+          "nodeUuid": "template-uuid-409d-998c-c1f04de67f8b",
+          "output": "out_4"
+        },
+        "all_results_1Hz": {
+          "nodeUuid": "template-uuid-409d-998c-c1f04de67f8b",
+          "output": "out_1"
+        }
+      },
+      "inputNodes": [
+        "template-uuid-409d-998c-c1f04de67f8b"
+      ],
+      "outputNode": false,
+      "outputs": {},
+      "parent": null,
+      "position": {
+        "x": 550,
+        "y": 150
+      }
+    }
+  }
+}
diff --git a/services/web/server/tests/unit/test_template_projects.py b/services/web/server/tests/unit/test_template_projects.py
index 360c0f6efdc..fd4a23924ca 100644
--- a/services/web/server/tests/unit/test_template_projects.py
+++ b/services/web/server/tests/unit/test_template_projects.py
@@ -4,15 +4,18 @@
 # pylint:disable=unused-argument
 # pylint:disable=redefined-outer-name
 
+import json
 from pathlib import Path
 from typing import Dict
 
 import pytest
 from jsonschema import SchemaError, ValidationError
-
 from servicelib.jsonschema_specs import create_jsonschema_specs
 from servicelib.jsonschema_validation import validate_instance
 from simcore_service_webserver.projects.projects_fakes import Fake
+from simcore_service_webserver.projects.projects_utils import  substitute_parameterized_inputs, variable_pattern
+from simcore_service_webserver.resources import resources
+from yarl import URL
 
 
 @pytest.fixture
@@ -32,9 +35,34 @@ def fake_db():
     yield Fake
     Fake.reset()
 
+
+@pytest.fixture
+def mock_parametrized_project(mock_dir):
+    path = mock_dir/"parametrized_project.json"
+    with path.open() as fh:
+        prj = json.load(fh)
+
+    # check parameterized
+    inputs = prj['workbench']['template-uuid-409d-998c-c1f04de67f8b']['inputs']
+    assert variable_pattern.match(inputs['Na'])
+    assert variable_pattern.match(inputs['BCL'])
+    return prj
+
+
 async def test_validate_templates(loop, project_specs: Dict, fake_db):
     for pid, project in fake_db.projects.items():
         try:
             validate_instance(project.data, project_specs)
         except ValidationError:
             pytest.fail("validation of project {} failed".format(pid))
+
+
+def test_substitutions(mock_parametrized_project):
+
+    template_id = mock_parametrized_project['uuid']
+    url = URL(f"https://myplatform/study/{template_id}").with_query(my_Na='33', my_BCL="54.0")
+
+    prj = substitute_parameterized_inputs(mock_parametrized_project, dict(url.query))
+    assert prj
+    assert prj['workbench']['template-uuid-409d-998c-c1f04de67f8b']['inputs']['Na'] == 33
+    assert prj['workbench']['template-uuid-409d-998c-c1f04de67f8b']['inputs']['BCL'] == 54.0
diff --git a/services/web/server/tests/unit/with_postgres/test_access_to_studies.py b/services/web/server/tests/unit/with_postgres/test_access_to_studies.py
index 74c292c37c1..df4aa9d6bde 100644
--- a/services/web/server/tests/unit/with_postgres/test_access_to_studies.py
+++ b/services/web/server/tests/unit/with_postgres/test_access_to_studies.py
@@ -31,9 +31,10 @@
 from utils_assert import assert_status
 from utils_login import LoggedUser, UserRole
 from utils_projects import NewProject, delete_all_projects
+from copy import deepcopy
 
-SHARED_STUDY_UUID = "e2e38eee-c569-4e55-b104-70d159e49c87"
 
+SHARED_STUDY_UUID = "e2e38eee-c569-4e55-b104-70d159e49c87"
 
 @pytest.fixture
 def qx_client_outdir(tmpdir, mocker):
@@ -82,9 +83,6 @@ def client(loop, aiohttp_client, aiohttp_unused_port, app_cfg, postgres_service,
     assert setup_projects(app), "Shall not skip this setup"
     assert setup_studies_access(app), "Shall not skip this setup"
 
-    assert studies_access.SHARABLE_TEMPLATE_STUDY_IDS, "Did u change the name again?"
-    monkeypatch.setattr(studies_access, 'SHARABLE_TEMPLATE_STUDY_IDS', [SHARED_STUDY_UUID, ])
-
     # server and client
     yield loop.run_until_complete(aiohttp_client(app, server_kwargs={
         'port': port,
@@ -108,6 +106,36 @@ async def logged_user(client): #, role: UserRole):
         yield user
         await delete_all_projects(client.app)
 
+@pytest.fixture
+async def published_project(client, fake_project):
+    project_data = deepcopy(fake_project)
+    project_data["name"] = "Published project"
+    project_data["uuid"] = SHARED_STUDY_UUID
+    project_data["published"] = True
+
+    async with NewProject(
+        project_data,
+        client.app,
+        user_id=None,
+        clear_all=True
+    ) as template_project:
+        yield template_project
+
+@pytest.fixture
+async def unpublished_project(client, fake_project):
+    project_data = deepcopy(fake_project)
+    project_data["name"] = "Tempalte Unpublished project"
+    project_data["uuid"] = "'b134a337-a74f-40ff-a127-b36a1ccbede6"
+    project_data["published"] = False
+
+    async with NewProject(
+        project_data,
+        client.app,
+        user_id=None,
+        clear_all=True
+    ) as template_project:
+        yield template_project
+
 
 async def _get_user_projects(client):
     url = client.app.router["list_projects"].url_for()
@@ -130,91 +158,87 @@ def _assert_same_projects(got: Dict, expected: Dict):
 
 
 # TESTS --------------------------------------
-async def test_access_to_invalid_study(client):
+async def test_access_to_invalid_study(client, published_project):
     resp = await client.get("/study/SOME_INVALID_UUID")
     content = await resp.text()
 
     assert resp.status == web.HTTPNotFound.status_code, str(content)
 
 
-async def test_access_to_forbidden_study(client):
+async def test_access_to_forbidden_study(client, unpublished_project):
     app = client.app
 
-    async with NewProject({}, app) as template_project:
-        valid_but_not_sharable = template_project["uuid"]
+    valid_but_not_sharable = unpublished_project["uuid"]
 
-        resp = await client.get("/study/%s" % valid_but_not_sharable)
-        content = await resp.text()
+    resp = await client.get("/study/%s" % valid_but_not_sharable)
+    content = await resp.text()
 
-        assert resp.status == web.HTTPNotFound.status_code, \
-            "STANDARD studies are NOT sharable: %s" % content
+    assert resp.status == web.HTTPNotFound.status_code, \
+        "STANDARD studies are NOT sharable: %s" % content
 
 
-async def test_access_study_anonymously(client, qx_client_outdir):
+async def test_access_study_anonymously(client, qx_client_outdir, published_project):
     params = {
         "uuid":SHARED_STUDY_UUID,
         "name":"some-template"
     }
 
-    async with NewProject(params, client.app, force_uuid=True) as template_project:
-        url_path = "/study/%s" % SHARED_STUDY_UUID
-        resp = await client.get(url_path)
-        content = await resp.text()
+    url_path = "/study/%s" % SHARED_STUDY_UUID
+    resp = await client.get(url_path)
+    content = await resp.text()
 
-        # index
-        assert resp.status == web.HTTPOk.status_code, "Got %s" % str(content)
-        assert str(resp.url.path) == "/"
-        assert "OSPARC-SIMCORE" in content, \
-            "Expected front-end rendering workbench's study, got %s" % str(content)
+    # index
+    assert resp.status == web.HTTPOk.status_code, "Got %s" % str(content)
+    assert str(resp.url.path) == "/"
+    assert "OSPARC-SIMCORE" in content, \
+        "Expected front-end rendering workbench's study, got %s" % str(content)
 
-        real_url = str(resp.real_url)
+    real_url = str(resp.real_url)
 
-        # has auto logged in as guest?
-        resp = await client.get("/v0/me")
-        data, _ = await assert_status(resp, web.HTTPOk)
-        assert data['login'].endswith("guest-at-osparc.io")
-        assert data['gravatar_id']
-        assert data['role'].upper() == UserRole.GUEST.name
+    # has auto logged in as guest?
+    resp = await client.get("/v0/me")
+    data, _ = await assert_status(resp, web.HTTPOk)
+    assert data['login'].endswith("guest-at-osparc.io")
+    assert data['gravatar_id']
+    assert data['role'].upper() == UserRole.GUEST.name
 
-        # guest user only a copy of the template project
-        projects = await _get_user_projects(client)
-        assert len(projects) == 1
-        guest_project = projects[0]
+    # guest user only a copy of the template project
+    projects = await _get_user_projects(client)
+    assert len(projects) == 1
+    guest_project = projects[0]
 
-        assert real_url.endswith("#/study/%s" % guest_project["uuid"])
-        _assert_same_projects(guest_project, template_project)
+    assert real_url.endswith("#/study/%s" % guest_project["uuid"])
+    _assert_same_projects(guest_project, published_project)
 
-        assert guest_project['prjOwner'] == data['login']
+    assert guest_project['prjOwner'] == data['login']
 
 
-async def test_access_study_by_logged_user(client, logged_user, qx_client_outdir):
+async def test_access_study_by_logged_user(client, logged_user, qx_client_outdir, published_project):
     params = {
         "uuid":SHARED_STUDY_UUID,
         "name":"some-template"
     }
 
-    async with NewProject(params, client.app, clear_all=True, force_uuid=True) as template_project:
-
-        url_path = "/study/%s" % SHARED_STUDY_UUID
-        resp = await client.get(url_path)
-        content = await resp.text()
+    url_path = "/study/%s" % SHARED_STUDY_UUID
+    resp = await client.get(url_path)
+    content = await resp.text()
 
-        # returns index
-        assert resp.status == web.HTTPOk.status_code, "Got %s" % str(content)
-        assert str(resp.url.path) == "/"
-        real_url = str(resp.real_url)
+    # returns index
+    assert resp.status == web.HTTPOk.status_code, "Got %s" % str(content)
+    assert str(resp.url.path) == "/"
+    real_url = str(resp.real_url)
 
-        assert "OSPARC-SIMCORE" in content, \
-            "Expected front-end rendering workbench's study, got %s" % str(content)
+    assert "OSPARC-SIMCORE" in content, \
+        "Expected front-end rendering workbench's study, got %s" % str(content)
 
-        # user has a copy of the template project
-        projects = await _get_user_projects(client)
-        assert len(projects) == 1
-        user_project = projects[0]
+    # user has a copy of the template project
+    projects = await _get_user_projects(client)
+    assert len(projects) == 1
+    user_project = projects[0]
 
-        # TODO: check redirects to /#/study/{uuid}
-        assert real_url.endswith("#/study/%s" % user_project["uuid"])
+    # TODO: check redirects to /#/study/{uuid}
+    assert real_url.endswith("#/study/%s" % user_project["uuid"])
 
-        _assert_same_projects(user_project, template_project)
+    _assert_same_projects(user_project, published_project)
 
-        assert user_project['prjOwner'] == logged_user['email']
+    assert user_project['prjOwner'] == logged_user['email']
diff --git a/services/web/server/tests/unit/with_postgres/test_guests_management.py b/services/web/server/tests/unit/with_postgres/test_guests_management.py
new file mode 100644
index 00000000000..cb97c82620f
--- /dev/null
+++ b/services/web/server/tests/unit/with_postgres/test_guests_management.py
@@ -0,0 +1,60 @@
+# pylint:disable=wildcard-import
+# pylint:disable=unused-import
+# pylint:disable=unused-variable
+# pylint:disable=unused-argument
+# pylint:disable=redefined-outer-name
+
+import pytest
+from aiohttp import web
+
+from simcore_service_webserver import application
+from utils_projects import create_project
+
+
+@pytest.fixture
+def client(loop, aiohttp_client, aiohttp_unused_port, app_cfg, postgres_service):
+    app = web.Application()
+
+    # config app
+    port = app_cfg["main"]["port"] = aiohttp_unused_port()
+    app_cfg["db"]["init_tables"] = True # inits tables of postgres_service upon startup
+    app_cfg["projects"]["enabled"] = True
+
+    app = application.create_application(app_cfg)
+
+    # server and client
+    return loop.run_until_complete(aiohttp_client(app, server_kwargs={
+        'port': port,
+        'host': 'localhost'
+    }))
+
+
+@pytest.mark.skip(reason="Under dev")
+def test_users_projects_db(client):
+    # given schema, an easy way to produce projects?
+    # a language to emulate UI??
+    # See https://github.com/cwacek/python-jsonschema-objects
+    #
+    # api/specs/webserver/v0/components/schemas/project-v0.0.1.json
+    # create_project(client.app, )
+    pass
+
+
+
+@pytest.mark.skip(reason="Under dev")
+def test_cleanup_expired_guest_users(client):
+    pass
+    # Guests users expire
+
+    # Shall delete all guest users and non-shared owned projects
+    # that expired.
+
+    # Shall remove all resources (data and running services) of expired users
+
+
+@pytest.mark.skip(reason="Under dev -> resource management ")
+def test_limit_guest_users(client):
+    # a guest user has limited access to resources
+    # also limited time and amount
+    #
+    pass